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

diff --git a/src/moof/rules.mk b/src/moof/rules.mk
index aa2c749..a970bc4 100644
--- a/src/moof/rules.mk
+++ b/src/moof/rules.mk
@@ -1,54 +1,24 @@
 
-#########################
-sp             := $(sp).x
-dirstack_$(sp) := $(d)
-d              := $(dir)
-#########################
-
 #
 # Define rules and targets for libmoof.
 #
 
-OBJS_$(d) := \
-             $(d)/ConvertUTF.o \
-             $(d)/aabb.o \
-             $(d)/backend.o \
-             $(d)/camera.o \
-             $(d)/dispatcher.o \
-             $(d)/fastevents.o \
-             $(d)/frustum.o \
-             $(d)/hash.o \
-             $(d)/image.o \
-             $(d)/log.o \
-             $(d)/packet.o \
-             $(d)/plane.o \
-             $(d)/resource.o \
-             $(d)/service.o \
-             $(d)/settings.o \
-             $(d)/sound.o \
-             $(d)/string.o \
-             $(d)/texture.o \
-             $(d)/timer.o \
-             $(d)/video.o \
-             $(d)/view.o \
-			 $(_END_)
-
-TGTS_$(d) := $(d)/libmoof.a
-DEPS_$(d) := $(OBJS_$(d):%=%.d)
-
-CLEAN     := $(CLEAN) $(OBJS_$(d)) $(DEPS_$(d)) $(TGTS_$(d))
-
-
-$(OBJS_$(d)): CF_TGT := -I$(d) -I$(d)/..
-$(OBJS_$(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
 
-$(TGTS_$(d)): $(OBJS_$(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 $(DEPS_$(d))
-d  := $(dirstack_$(sp))
-sp := $(basename $(sp))
-#######################
+exec	+= $(objects) $(library)