build system enhancements

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

diff --git a/src/stlplus/rules.mk b/src/stlplus/rules.mk
index 380609daceffbabf350b6b181d26aa1afd029815..e6d807b76451637f54ca97c531caa80c7f8826f1 100644 (file)
--- a/src/stlplus/rules.mk
+++ b/src/stlplus/rules.mk
@@ -1,31 +1,15 @@
 
-#########################
-sp             := $(sp).x
-dirstack_$(sp) := $(d)
-d              := $(dir)
-#########################
-
 #
 # Define rules and targets for libstlplus.
 #
 
-OBJECTS_$(d) := $(patsubst %.cpp,%.o,$(shell find $(d) -name "*.cpp"))
-D_FILES_$(d) := $(OBJECTS_$(d):%=%.d)
-
-LIBRARY_$(d) := $(d)/libstlplus.a
-
-CLEAN        := $(CLEAN) $(OBJECTS_$(d)) $(D_FILES_$(d)) $(LIBRARY_$(d))
-
-$(OBJECTS_$(d)): CF_TGT := -I$(d) -I$(d)/containers -I$(d)/portability
-$(OBJECTS_$(d)): $(d)/rules.mk
-
-$(LIBRARY_$(d)): $(OBJECTS_$(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 $(this) | $b/containers $b/portability $b/strings
 
+library        = $b/libstlplus.a
+$(library): $(objects)
+       $(Q)$(ar)
 
-########################
--include $(D_FILES_$(d))
-d  := $(dirstack_$(sp))
-sp := $(basename $(sp))
-########################
+exec   += $(objects) $(library)