It's been too long since I committed

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

diff --git a/Modules/Makefile.tpl b/Modules/Makefile.tpl
index b20a731..60824e8 100644 (file)
--- 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 $@