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

diff --git a/Modules/Makefile.tpl b/Modules/Makefile.tpl
index 9a1b6e82..0c66fddc 100644
--- a/Modules/Makefile.tpl
+++ b/Modules/Makefile.tpl
@@ -4,26 +4,36 @@
 
 _CPPFLAGS := $(CPPFLAGS)
 
-CFGFILES = 
+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
+CPPFLAGS := -I$(ACESSDIR)/Kernel/include -I$(ACESSDIR)/Kernel/arch/$(ARCHDIR)/include -DARCH=$(ARCH) $(_CPPFLAGS)
+CFLAGS := -Wall -Werror -fno-stack-protector $(CPPFLAGS) -O3 -fno-builtin
 
-OBJ := $(addsuffix .$(ARCH),$(OBJ))
 ifneq ($(CATEGORY),)
-	BIN := ../$(CATEGORY)_$(NAME).kmd.$(ARCH)
+	FULLNAME := $(CATEGORY)_$(NAME)
 else
-	BIN := ../$(NAME).kmd.$(ARCH)
+	FULLNAME := $(NAME)
 endif
-KOBJ = ../$(NAME).xo.$(ARCH)
 
-DEPFILES  = $(filter %.o.$(ARCH),$(OBJ))
-DEPFILES := $(DEPFILES:%.o.$(ARCH)=%.d.$(ARCH))
+ifneq ($(BUILDTYPE),static)
+	_SUFFIX := dyn_$(ARCH)
+	BIN := ../$(FULLNAME).kmd.$(ARCH)
+	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
 
@@ -33,16 +43,24 @@ clean:
 	$(RM) $(BIN) $(BIN).dsm $(KOBJ) $(OBJ) $(DEPFILES)
 
 install: $(BIN)
-	$(xCP) $(BIN) $(DISTROOT)/Modules/$(NAME).kmd
+ifneq ($(BUILDTYPE),static)
+	$(xCP) $(BIN) $(DISTROOT)/Modules/$(NAME).kmd.$(ARCH)
+else
+endif
 
-$(BIN): $(OBJ)
+ifneq ($(BUILDTYPE),static)
+$(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) -defsym=DriverInfo=_DriverInfo_$(FULLNAME)
+	@$(DISASM) $(BIN) > $(BIN).dsm
+else
+$(BIN): %.xo.$(ARCH): $(OBJ)
 	@echo --- $(LD) -o $@
-	@$(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)
+	@$(LD) -r -o $@ $(OBJ)
+endif
 
-%.o.$(ARCH): %.c Makefile ../Makefile.tpl $(CFGFILES)
+%.o.$(_SUFFIX): %.c Makefile ../Makefile.tpl $(CFGFILES)
 	@echo --- $(CC) -o $@
 	@$(CC) $(CFLAGS) -o $@ -c $<
 	@$(CC) -M $(CPPFLAGS) -MT $@ -o $*.d.$(ARCH) $<