pch support

[chaz/yoink] / src / stlplus / rules.mk

diff --git a/src/stlplus/rules.mk b/src/stlplus/rules.mk
index 74f1c374571a15b097f2b9ddc1e71075597413b6..3e4f41de05edd2aeea7b9c3ddc463be498f55df7 100644 (file)
--- a/src/stlplus/rules.mk
+++ b/src/stlplus/rules.mk
@@ -1,79 +1,15 @@
 
-#########################
-sp             := $(sp).x
-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)
-
-CLEAN     := $(CLEAN) $(OBJS_$(d)) $(DEPS_$(d)) $(TGTS_$(d))
-
-
-$(OBJS_$(d)): CF_TGT := -I$(d) -I$(d)/containers -I$(d)/portability
-$(OBJS_$(d)): $(d)/rules.mk
-
-$(TGTS_$(d)): $(OBJS_$(d))
-       $(DO_AR)
+objects        = $(patsubst %.cpp,$(builddir)/%.o,$(shell find $d -name "*.cpp"))
+$(objects): TGT_CFLAGS := -I$d -I$d/containers -I$d/portability
+$(objects): config.mk | $b/containers $b/portability
 
+library        = $b/libstlplus.a
+$(library): $(objects)
+       $(Q)$(ar)
 
-#######################
--include $(DEPS_$(d))
-d  := $(dirstack_$(sp))
-sp := $(basename $(sp))
-#######################
+exec   += $(objects) $(library)