X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Modules%2FMakefile.tpl;h=9a1b6e82ec7987b5f927a772ba371555fb181f62;hb=049de1f2533477716a12a708c097b199eaa8fb6c;hp=2484610ddfede42217a9dd4edfe92ffe23346f51;hpb=f035491c949cb86d92a93fc3d9d033538704256b;p=tpg%2Facess2.git

diff --git a/Modules/Makefile.tpl b/Modules/Makefile.tpl
index 2484610d..9a1b6e82 100644
--- a/Modules/Makefile.tpl
+++ b/Modules/Makefile.tpl
@@ -2,13 +2,24 @@
 # 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 -fno-stack-protector $(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) -O3
 
 OBJ := $(addsuffix .$(ARCH),$(OBJ))
-BIN = ../$(NAME).kmd.$(ARCH)
+ifneq ($(CATEGORY),)
+	BIN := ../$(CATEGORY)_$(NAME).kmd.$(ARCH)
+else
+	BIN := ../$(NAME).kmd.$(ARCH)
+endif
 KOBJ = ../$(NAME).xo.$(ARCH)
 
 DEPFILES  = $(filter %.o.$(ARCH),$(OBJ))
@@ -21,16 +32,17 @@ all: $(BIN)
 clean:
 	$(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)
+	@$(LD) -T $(ACESSDIR)/Modules/link.ld -shared -nostdlib -o $@ $(OBJ)
 	@$(OBJDUMP) -d $(BIN) > $(BIN).dsm
-	cp $@ $(DISTROOT)/Modules/$(NAME).kmd
 	@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) $<