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

diff --git a/Modules/Makefile.tpl b/Modules/Makefile.tpl
index a1775ddf..6fce4152 100644
--- a/Modules/Makefile.tpl
+++ b/Modules/Makefile.tpl
@@ -12,18 +12,21 @@ 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 := $(KERNEL_CFLAGS) -Wall -Werror -fno-stack-protector $(CPPFLAGS) -O3 -fno-builtin
+CFLAGS := -Wall -Werror -fno-stack-protector $(CPPFLAGS) -O3 -fno-builtin
 
-ifeq ($(BUILDTYPE),dynamic)
+ifneq ($(CATEGORY),)
+	FULLNAME := $(CATEGORY)_$(NAME)
+else
+	FULLNAME := $(NAME)
+endif
+
+ifneq ($(BUILDTYPE),static)
 	_SUFFIX := dyn_$(ARCH)
-	ifneq ($(CATEGORY),)
-		BIN := ../$(CATEGORY)_$(NAME).kmd.$(ARCH)
-	else
-		BIN := ../$(NAME).kmd.$(ARCH)
-	endif
-	CFLAGS += -fPIC
+	BIN := ../$(FULLNAME).kmd.$(ARCH)
+	CFLAGS += $(DYNMOD_CFLAGS) -fPIC
 else
 	_SUFFIX := st_$(ARCH)
+	CFLAGS += $(KERNEL_CFLAGS)
 	BIN := ../$(NAME).xo.$(ARCH)
 endif
 
@@ -37,17 +40,20 @@ DEPFILES := $(DEPFILES:%.o.$(_SUFFIX)=%.d.$(ARCH))
 all: $(BIN)
 
 clean:
-	$(RM) $(BIN) $(BIN).dsm $(KOBJ) $(OBJ) $(DEPFILES)
+	$(RM) $(BIN) $(BIN).dsm $(KOBJ) $(OBJ) $(DEPFILES) $(EXTRA)
 
 install: $(BIN)
-	$(xCP) $(BIN) $(DISTROOT)/Modules/$(NAME).kmd
+ifneq ($(BUILDTYPE),static)
+	$(xCP) $(BIN) $(DISTROOT)/Modules/$(NAME).kmd.$(ARCH)
+else
+endif
 
-ifeq ($(BUILDTYPE),dynamic)
+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)
-	@$(OBJDUMP) -d $(BIN) > $(BIN).dsm
+#	@$(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 $@