X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2Fstlplus%2Frules.mk;h=380609daceffbabf350b6b181d26aa1afd029815;hp=74f1c374571a15b097f2b9ddc1e71075597413b6;hb=7ac3aee9efa7f9ce1a966df030b1f76f2b82ef2d;hpb=6b0a0d0efafe34d48ab344fca3b479553bd4e62c

diff --git a/src/stlplus/rules.mk b/src/stlplus/rules.mk
index 74f1c37..380609d 100644
--- a/src/stlplus/rules.mk
+++ b/src/stlplus/rules.mk
@@ -5,75 +5,27 @@ dirstack_$(sp) := $(d)
 d              := $(dir)
 #########################
 
-
 #
 # Define rules and targets for libstlplus.
 #
 
-OBJS_$(d) := \
-             $(d)/persistence/persistent_bool.o \
-             $(d)/persistence/persistent_contexts.o \
-             $(d)/persistence/persistent_cstring.o \
-             $(d)/persistence/persistent_exceptions.o \
-             $(d)/persistence/persistent_float.o \
-             $(d)/persistence/persistent_inf.o \
-             $(d)/persistence/persistent_int.o \
-             $(d)/persistence/persistent_string.o \
-             $(d)/persistence/persistent_vector.o \
-             $(d)/portability/build.o \
-             $(d)/portability/debug.o \
-             $(d)/portability/dprintf.o \
-             $(d)/portability/dynaload.o \
-             $(d)/portability/file_system.o \
-             $(d)/portability/inf.o \
-             $(d)/portability/ip_sockets.o \
-             $(d)/portability/portability_fixes.o \
-             $(d)/portability/subprocesses.o \
-             $(d)/portability/tcp_sockets.o \
-             $(d)/portability/time.o \
-             $(d)/portability/udp_sockets.o \
-             $(d)/portability/version.o \
-             $(d)/portability/wildcard.o \
-             $(d)/strings/print_address.o \
-             $(d)/strings/print_bool.o \
-             $(d)/strings/print_cstring.o \
-             $(d)/strings/print_float.o \
-             $(d)/strings/print_inf.o \
-             $(d)/strings/print_int.o \
-             $(d)/strings/print_string.o \
-             $(d)/strings/print_vector.o \
-             $(d)/strings/string_address.o \
-             $(d)/strings/string_bool.o \
-             $(d)/strings/string_cstring.o \
-             $(d)/strings/string_float.o \
-             $(d)/strings/string_inf.o \
-             $(d)/strings/string_int.o \
-             $(d)/strings/string_string.o \
-             $(d)/strings/string_utilities.o \
-             $(d)/strings/string_vector.o \
-             $(d)/subsystems/cli_parser.o \
-             $(d)/subsystems/ini_manager.o \
-             $(d)/subsystems/library_manager.o \
-             $(d)/subsystems/message_handler.o \
-             $(d)/subsystems/timer.o \
-			 $(_END_)
-
-TGTS_$(d) := $(d)/libstlplus.a
-DEPS_$(d) := $(OBJS_$(d):%=%.d)
+OBJECTS_$(d) := $(patsubst %.cpp,%.o,$(shell find $(d) -name "*.cpp"))
+D_FILES_$(d) := $(OBJECTS_$(d):%=%.d)
 
-CLEAN     := $(CLEAN) $(OBJS_$(d)) $(DEPS_$(d)) $(TGTS_$(d))
+LIBRARY_$(d) := $(d)/libstlplus.a
 
+CLEAN        := $(CLEAN) $(OBJECTS_$(d)) $(D_FILES_$(d)) $(LIBRARY_$(d))
 
-$(OBJS_$(d)): CF_TGT := -I$(d) -I$(d)/containers -I$(d)/portability
-$(OBJS_$(d)): $(d)/rules.mk
+$(OBJECTS_$(d)): CF_TGT := -I$(d) -I$(d)/containers -I$(d)/portability
+$(OBJECTS_$(d)): $(d)/rules.mk
 
-$(TGTS_$(d)): $(OBJS_$(d))
+$(LIBRARY_$(d)): $(OBJECTS_$(d))
 	$(DO_AR)
 
 
-#######################
--include $(DEPS_$(d))
+########################
+-include $(D_FILES_$(d))
 d  := $(dirstack_$(sp))
 sp := $(basename $(sp))
-#######################
+########################