X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Modules%2FMakefile.tpl;h=de3b36ab59577ddc6ed6ce0c5cac1e5879eab74e;hb=ad2ec62655e1d6eb8f2b4a4684eb5d7952aea0fb;hp=6fce41520cf0b2c75c47420b7338d53c256a4af1;hpb=ccd6cf2af99fdc050888c70eb4d59f078a15a2da;p=tpg%2Facess2.git

diff --git a/Modules/Makefile.tpl b/Modules/Makefile.tpl
index 6fce4152..de3b36ab 100644
--- a/Modules/Makefile.tpl
+++ b/Modules/Makefile.tpl
@@ -4,15 +4,10 @@
 
 _CPPFLAGS := $(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)
+-include $(dir $(lastword $(MAKEFILE_LIST)))../Makefile.cfg
 
 CPPFLAGS := -I$(ACESSDIR)/Kernel/include -I$(ACESSDIR)/Kernel/arch/$(ARCHDIR)/include -DARCH=$(ARCH) $(_CPPFLAGS)
-CFLAGS := -Wall -Werror -fno-stack-protector $(CPPFLAGS) -O3 -fno-builtin
+CFLAGS := -Wall -Werror -fno-stack-protector -g -O3 -fno-builtin
 
 ifneq ($(CATEGORY),)
 	FULLNAME := $(CATEGORY)_$(NAME)
@@ -20,6 +15,8 @@ else
 	FULLNAME := $(NAME)
 endif
 
+CPPFLAGS += -D_MODULE_NAME_=\"$(FULLNAME)\"
+
 ifneq ($(BUILDTYPE),static)
 	_SUFFIX := dyn_$(ARCH)
 	BIN := ../$(FULLNAME).kmd.$(ARCH)
@@ -44,7 +41,8 @@ clean:
 
 install: $(BIN)
 ifneq ($(BUILDTYPE),static)
-	$(xCP) $(BIN) $(DISTROOT)/Modules/$(NAME).kmd.$(ARCH)
+	@$(xMKDIR) $(DISTROOT)/Modules/$(ARCH); true
+	$(xCP) $(BIN) $(DISTROOT)/Modules/$(ARCH)/$(NAME).kmd
 else
 endif
 
@@ -60,9 +58,9 @@ $(BIN): %.xo.$(ARCH): $(OBJ)
 	@$(LD) -r -o $@ $(OBJ)
 endif
 
-%.o.$(_SUFFIX): %.c Makefile ../Makefile.tpl $(CFGFILES)
+%.o.$(_SUFFIX): %.c Makefile $(CFGFILES)
 	@echo --- $(CC) -o $@
-	@$(CC) $(CFLAGS) -o $@ -c $<
+	@$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
 	@$(CC) -M $(CPPFLAGS) -MT $@ -o $*.d.$(ARCH) $<
 
 -include $(DEPFILES)