X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Modules%2FMakefile.tpl;h=dda0f6b98113eb120a6e98d4089d56e6a0b5c9f9;hb=2622ded2495e40b728cf0f16e46d80596dcc6d02;hp=dc5d6f94a766bd0b77f64979d6558c5e6a95d019;hpb=4b59aea79be4992af2b1c38ea43f6dacf939d782;p=tpg%2Facess2.git

diff --git a/Modules/Makefile.tpl b/Modules/Makefile.tpl
index dc5d6f94..dda0f6b9 100644
--- a/Modules/Makefile.tpl
+++ b/Modules/Makefile.tpl
@@ -27,10 +27,11 @@ else
 	BIN := ../$(NAME).xo.$(ARCH)
 endif
 
-OBJ := $(addsuffix .$(_SUFFIX),$(OBJ))
+OBJ := $(addprefix obj-$(_SUFFIX)/,$(OBJ))
+#OBJ := $(addsuffix .$(_SUFFIX),$(OBJ))
 
-DEPFILES := $(filter %.o.$(_SUFFIX),$(OBJ))
-DEPFILES := $(DEPFILES:%.o.$(_SUFFIX)=%.d.$(ARCH))
+DEPFILES := $(filter %.o,$(OBJ))
+DEPFILES := $(DEPFILES:%.o=%.d)
 
 .PHONY: all clean
 
@@ -38,18 +39,19 @@ all: $(BIN)
 
 clean:
 	$(RM) $(BIN) $(BIN).dsm $(KOBJ) $(OBJ) $(DEPFILES) $(EXTRA)
+	$(RM) -r obj-$(_SUFFIX)
 
 install: $(BIN)
 ifneq ($(BUILDTYPE),static)
-	$(xMKDIR) $(DISTROOT)/Modules/$(ARCH)
+	@$(xMKDIR) $(DISTROOT)/Modules/$(ARCH); true
 	$(xCP) $(BIN) $(DISTROOT)/Modules/$(ARCH)/$(NAME).kmd
 else
 endif
 
+
 ifneq ($(BUILDTYPE),static)
 $(BIN): %.kmd.$(ARCH): $(OBJ)
 	@echo --- $(LD) -o $@
-#	@$(LD) -T $(ACESSDIR)/Modules/link.ld --allow-shlib-undefined -shared -nostdlib -o $@ $(OBJ)
 	@$(LD) --allow-shlib-undefined -shared -nostdlib -o $@ $(OBJ) -defsym=DriverInfo=_DriverInfo_$(FULLNAME)
 	@$(DISASM) $(BIN) > $(BIN).dsm
 else
@@ -58,9 +60,10 @@ $(BIN): %.xo.$(ARCH): $(OBJ)
 	@$(LD) -r -o $@ $(OBJ)
 endif
 
-%.o.$(_SUFFIX): %.c Makefile ../Makefile.tpl $(CFGFILES)
+obj-$(_SUFFIX)/%.o: %.c Makefile $(CFGFILES)
 	@echo --- $(CC) -o $@
+	@mkdir -p $(dir $@)
 	@$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
-	@$(CC) -M $(CPPFLAGS) -MT $@ -o $*.d.$(ARCH) $<
+	@$(CC) -M $(CPPFLAGS) -MT $@ -o obj-$(_SUFFIX)/$*.d $<
 
 -include $(DEPFILES)