X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Modules%2FMakefile.tpl;h=60824e84757a75c1743d8ba26ba438f5f7a1d531;hb=dea6bcf35a3f52396724d74e47f71cb3afade37c;hp=7d20cd3dfed3406101ff1e789caf601997de43a7;hpb=77ed20ce9d7e25654215980d0f89e63b8dd366f0;p=tpg%2Facess2.git

diff --git a/Modules/Makefile.tpl b/Modules/Makefile.tpl
index 7d20cd3d..60824e84 100644
--- a/Modules/Makefile.tpl
+++ b/Modules/Makefile.tpl
@@ -2,33 +2,63 @@
 # 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)
 
-OBJ := $(addsuffix .$(ARCH),$(OBJ))
-BIN = ../$(NAME).kmd.$(ARCH)
-KOBJ = ../$(NAME).xo.$(ARCH)
+CPPFLAGS := -I$(ACESSDIR)/Kernel/include -I$(ACESSDIR)/Kernel/arch/$(ARCHDIR)/include -DARCH=$(ARCH) $(_CPPFLAGS)
+CFLAGS := -Wall -Werror -fno-stack-protector $(CPPFLAGS) -O3 -fno-builtin
 
-DEPFILES  = $(filter %.o.$(ARCH),$(OBJ))
-DEPFILES := $(DEPFILES:%.o.$(ARCH)=%.d.$(ARCH))
+ifeq ($(BUILDTYPE),dynamic)
+	_SUFFIX := dyn_$(ARCH)
+	ifneq ($(CATEGORY),)
+		BIN := ../$(CATEGORY)_$(NAME).kmd.$(ARCH)
+	else
+		BIN := ../$(NAME).kmd.$(ARCH)
+	endif
+	CFLAGS += $(DYNMOD_CFLAGS) -fPIC
+else
+	_SUFFIX := st_$(ARCH)
+	CFLAGS += $(KERNEL_CFLAGS)
+	BIN := ../$(NAME).xo.$(ARCH)
+endif
+
+OBJ := $(addsuffix .$(_SUFFIX),$(OBJ))
+
+DEPFILES := $(filter %.o.$(_SUFFIX),$(OBJ))
+DEPFILES := $(DEPFILES:%.o.$(_SUFFIX)=%.d.$(ARCH))
 
 .PHONY: all clean
 
 all: $(BIN)
 
 clean:
-	$(RM) $(BIN) $(KOBJ) $(OBJ) $(DEPFILES)
+	$(RM) $(BIN) $(BIN).dsm $(KOBJ) $(OBJ) $(DEPFILES)
 
-$(BIN): $(OBJ)
+install: $(BIN)
+ifeq ($(BUILDTYPE),dynamic)
+	$(xCP) $(BIN) $(DISTROOT)/Modules/$(NAME).kmd.$(ARCH)
+else
+endif
+
+ifeq ($(BUILDTYPE),dynamic)
+$(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)
+	@$(DISASM) $(BIN) > $(BIN).dsm
+else
+$(BIN): %.xo.$(ARCH): $(OBJ)
 	@echo --- $(LD) -o $@
-	@$(LD) -T ../link.ld -shared -nostdlib -o $@ $(OBJ)
-#	@$(LD) -shared -nostdlib -o $@ $(OBJ)
-	@echo --- $(LD) -o $(KOBJ)
-	@$(CC) -Wl,-r -nostdlib -o $(KOBJ) $(OBJ)
+	@$(LD) -r -o $@ $(OBJ)
+endif
 
-%.o.$(ARCH): %.c Makefile ../Makefile.tpl ../../Makefile.cfg 
+%.o.$(_SUFFIX): %.c Makefile ../Makefile.tpl $(CFGFILES)
 	@echo --- $(CC) -o $@
 	@$(CC) $(CFLAGS) -o $@ -c $<
 	@$(CC) -M $(CPPFLAGS) -MT $@ -o $*.d.$(ARCH) $<