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

diff --git a/src/stlplus/rules.mk b/src/stlplus/rules.mk
index 380609d..3e4f41d 100644
--- 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 | $b/containers $b/portability
 
+library	= $b/libstlplus.a
+$(library): $(objects)
+	$(Q)$(ar)
 
-########################
--include $(D_FILES_$(d))
-d  := $(dirstack_$(sp))
-sp := $(basename $(sp))
-########################
+exec	+= $(objects) $(library)