X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=Modules%2FMakefile.tpl;h=60824e84757a75c1743d8ba26ba438f5f7a1d531;hb=dea6bcf35a3f52396724d74e47f71cb3afade37c;hp=b20a731e68646972e079b6d248db0bced9008db6;hpb=43f12a083f112a410859597c5f45e78b1de2e7c8;p=tpg%2Facess2.git

diff --git a/Modules/Makefile.tpl b/Modules/Makefile.tpl
index b20a731e..60824e84 100644
--- a/Modules/Makefile.tpl
+++ b/Modules/Makefile.tpl
@@ -12,7 +12,7 @@ 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)
 	_SUFFIX := dyn_$(ARCH)
@@ -21,9 +21,10 @@ ifeq ($(BUILDTYPE),dynamic)
 	else
 		BIN := ../$(NAME).kmd.$(ARCH)
 	endif
-	CFLAGS += -fPIC
+	CFLAGS += $(DYNMOD_CFLAGS) -fPIC
 else
 	_SUFFIX := st_$(ARCH)
+	CFLAGS += $(KERNEL_CFLAGS)
 	BIN := ../$(NAME).xo.$(ARCH)
 endif
 
@@ -40,14 +41,17 @@ clean:
 	$(RM) $(BIN) $(BIN).dsm $(KOBJ) $(OBJ) $(DEPFILES)
 
 install: $(BIN)
-	$(xCP) $(BIN) $(DISTROOT)/Modules/$(NAME).kmd
+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)
-	@$(OBJDUMP) -d $(BIN) > $(BIN).dsm
+	@$(DISASM) $(BIN) > $(BIN).dsm
 else
 $(BIN): %.xo.$(ARCH): $(OBJ)
 	@echo --- $(LD) -o $@