X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2Fmoof%2Frules.mk;h=a970bc434920bdea0edd682dc355462890170378;hp=63fed3708f3ab89f979d0445c6ef449f2ba13f16;hb=44b3014bce798789e795242d1556cb7449e6386a;hpb=7ac3aee9efa7f9ce1a966df030b1f76f2b82ef2d

diff --git a/src/moof/rules.mk b/src/moof/rules.mk
index 63fed37..a970bc4 100644
--- a/src/moof/rules.mk
+++ b/src/moof/rules.mk
@@ -1,32 +1,24 @@
 
-#########################
-sp             := $(sp).x
-dirstack_$(sp) := $(d)
-d              := $(dir)
-#########################
-
 #
 # Define rules and targets for libmoof.
 #
 
-OBJECTS_$(d) := $(patsubst %.c,%.o,$(wildcard $(d)/*.c)) \
-                $(patsubst %.cc,%.o,$(wildcard $(d)/*.cc))
-D_FILES_$(d) := $(OBJECTS_$(d):%=%.d)
-
-LIBRARY_$(d) := $(d)/libmoof.a
-
-CLEAN        := $(CLEAN) $(OBJECTS_$(d)) $(D_FILES_$(d)) $(LIBRARY_$(d))
-
-$(OBJECTS_$(d)): CF_TGT := -I$(d) -I$(d)/..
-$(OBJECTS_$(d)): $(d)/rules.mk
+objects	= $(patsubst %.c,$(builddir)/%.o,$(patsubst %.cc,$(builddir)/%.o,$(wildcard $d/*.c $d/*.cc)))
+$(objects): TGT_CFLAGS := -I$b -I$b/.. -I$d -I$d/..
+$(objects): config.h | $b
 
-$(LIBRARY_$(d)): $(OBJECTS_$(d))
-	$(DO_AR)
+library	= $b/libmoof.a
+$(library): $(objects)
+	$(Q)$(ar)
 
+ifeq (true,$(pch))
+pchfile	:= $b/precompile.hh
+exec	+= $(pchfile) $(pchfile).gch
+$(pchfile).gch: TGT_CFLAGS := -I$b -I$b/.. -I$d -I$d/..
+$(pchfile).gch: $(pchfile)
+$(pchfile): config.mk | $b
+$(objects): $(pchfile).gch
+endif
 
-########################
--include $(D_FILES_$(d))
-d  := $(dirstack_$(sp))
-sp := $(basename $(sp))
-########################
+exec	+= $(objects) $(library)