Multiple fixes

[tpg/acess2.git] / Modules / Makefile.tpl

diff --git a/Modules/Makefile.tpl b/Modules/Makefile.tpl
index 8a09edb..4341bda 100644 (file)
--- a/Modules/Makefile.tpl
+++ b/Modules/Makefile.tpl
@@ -4,13 +4,22 @@
 
 _CPPFLAGS := $(CPPFLAGS)
 
--include ../../Makefile.cfg
+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../../Kernel/include -I../../Kernel/arch/$(ARCHDIR)/include -DARCH=$(ARCH) $(_CPPFLAGS)
-CFLAGS = -Wall -Werror -fno-stack-protector $(CPPFLAGS)
+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)
+ifeq ($(CATEGORY),)
+       BIN := ../$(CATEGORY)_$(NAME).kmd.$(ARCH)
+else
+       BIN := ../$(NAME).kmd.$(ARCH)
+endif
 KOBJ = ../$(NAME).xo.$(ARCH)
 
 DEPFILES  = $(filter %.o.$(ARCH),$(OBJ))
@@ -23,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
-       $(xCP) $@ $(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) $<