X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Modules%2FMakefile.tpl;h=964f5cecf717e45642b869163b6d0671a158fc32;hb=6bc21db109c4d8d3219ad58fc5cc76ec76e6c6b7;hp=a9a6d8db8e7ef87f700572d9f2079d5e93615c1d;hpb=47e9dfd89189fc6b150bd6b20229cb047c7e0858;p=tpg%2Facess2.git

diff --git a/Modules/Makefile.tpl b/Modules/Makefile.tpl
index a9a6d8db..964f5cec 100644
--- a/Modules/Makefile.tpl
+++ b/Modules/Makefile.tpl
@@ -2,10 +2,17 @@
 # Acess2 Module/Driver Templater Makefile
 # Makefile.tpl
 
--include ../../Makefile.cfg
+_CPPFLAGS := $(CPPFLAGS)
 
-CPPFLAGS = -I../../Kernel/include -I../../Kernel/arch/$(ARCHDIR)/include -DARCH=$(ARCH)
-CFLAGS = -Wall -Werror $(CPPFLAGS)
+CFGFILES = 
+CFGFILES += $(shell test -f ../../../Makefile.cfg && echo ../../../Makefile.cfg)
+CFGFILES += $(shell test -f ../../Makefile.cfg && echo ../../Makefile.cfg)
+CFGFILES += $(shell test -f ../Makefile.cfg && echo ../Makefile.cfg)
+CFGFILES += $(shell test -f Makefile.cfg && echo Makefile.cfg)
+-include $(CFGFILES)
+
+CPPFLAGS = -I$(ACESSDIR)/Kernel/include -I$(ACESSDIR)/Kernel/arch/$(ARCHDIR)/include -DARCH=$(ARCH) $(_CPPFLAGS)
+CFLAGS = -Wall -Werror -fno-stack-protector $(CPPFLAGS)
 
 OBJ := $(addsuffix .$(ARCH),$(OBJ))
 BIN = ../$(NAME).kmd.$(ARCH)
@@ -19,17 +26,19 @@ DEPFILES := $(DEPFILES:%.o.$(ARCH)=%.d.$(ARCH))
 all: $(BIN)
 
 clean:
-	$(RM) $(BIN) $(KOBJ) $(OBJ) $(DEPFILES)
+	$(RM) $(BIN) $(BIN).dsm $(KOBJ) $(OBJ) $(DEPFILES)
+
+install: $(BIN)
+	$(xCP) $(BIN) $(DISTROOT)/Modules/$(NAME).kmd
 
 $(BIN): $(OBJ)
 	@echo --- $(LD) -o $@
-	@$(LD) -T ../link.ld -shared -nostdlib -o $@ $(OBJ)
-#	@$(LD) -shared -nostdlib -o $@ $(OBJ)
-	cp $@ $(DISTROOT)/Modules/$(NAME).kmd
+	@$(LD) -T $(ACESSDIR)/Modules/link.ld -shared -nostdlib -o $@ $(OBJ)
+	@$(OBJDUMP) -d $(BIN) > $(BIN).dsm
 	@echo --- $(LD) -o $(KOBJ)
 	@$(CC) -Wl,-r -nostdlib -o $(KOBJ) $(OBJ)
 
-%.o.$(ARCH): %.c Makefile ../Makefile.tpl ../../Makefile.cfg 
+%.o.$(ARCH): %.c Makefile ../Makefile.tpl $(CFGFILES)
 	@echo --- $(CC) -o $@
 	@$(CC) $(CFLAGS) -o $@ -c $<
 	@$(CC) -M $(CPPFLAGS) -MT $@ -o $*.d.$(ARCH) $<