git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reworked the IPStack tInterface structure
[tpg/acess2.git]
/
Modules
/
Makefile.tpl
diff --git
a/Modules/Makefile.tpl
b/Modules/Makefile.tpl
index
60824e8
..
750f2dc
100644
(file)
--- a/
Modules/Makefile.tpl
+++ b/
Modules/Makefile.tpl
@@
-12,15
+12,19
@@
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)
-include $(CFGFILES)
CPPFLAGS := -I$(ACESSDIR)/Kernel/include -I$(ACESSDIR)/Kernel/arch/$(ARCHDIR)/include -DARCH=$(ARCH) $(_CPPFLAGS)
-CFLAGS := -Wall -Werror -fno-stack-protector
$(CPPFLAGS)
-O3 -fno-builtin
+CFLAGS := -Wall -Werror -fno-stack-protector
-g
-O3 -fno-builtin
-ifeq ($(BUILDTYPE),dynamic)
+ifneq ($(CATEGORY),)
+ FULLNAME := $(CATEGORY)_$(NAME)
+else
+ FULLNAME := $(NAME)
+endif
+
+CPPFLAGS += -D_MODULE_NAME_=\"$(FULLNAME)\"
+
+ifneq ($(BUILDTYPE),static)
_SUFFIX := dyn_$(ARCH)
_SUFFIX := dyn_$(ARCH)
- ifneq ($(CATEGORY),)
- BIN := ../$(CATEGORY)_$(NAME).kmd.$(ARCH)
- else
- BIN := ../$(NAME).kmd.$(ARCH)
- endif
+ BIN := ../$(FULLNAME).kmd.$(ARCH)
CFLAGS += $(DYNMOD_CFLAGS) -fPIC
else
_SUFFIX := st_$(ARCH)
CFLAGS += $(DYNMOD_CFLAGS) -fPIC
else
_SUFFIX := st_$(ARCH)
@@
-38,19
+42,19
@@
DEPFILES := $(DEPFILES:%.o.$(_SUFFIX)=%.d.$(ARCH))
all: $(BIN)
clean:
all: $(BIN)
clean:
- $(RM) $(BIN) $(BIN).dsm $(KOBJ) $(OBJ) $(DEPFILES)
+ $(RM) $(BIN) $(BIN).dsm $(KOBJ) $(OBJ) $(DEPFILES)
$(EXTRA)
install: $(BIN)
install: $(BIN)
-if
eq ($(BUILDTYPE),dynam
ic)
+if
neq ($(BUILDTYPE),stat
ic)
$(xCP) $(BIN) $(DISTROOT)/Modules/$(NAME).kmd.$(ARCH)
else
endif
$(xCP) $(BIN) $(DISTROOT)/Modules/$(NAME).kmd.$(ARCH)
else
endif
-if
eq ($(BUILDTYPE),dynam
ic)
+if
neq ($(BUILDTYPE),stat
ic)
$(BIN): %.kmd.$(ARCH): $(OBJ)
@echo --- $(LD) -o $@
$(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)
+#
@
$(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)
@$(DISASM) $(BIN) > $(BIN).dsm
else
$(BIN): %.xo.$(ARCH): $(OBJ)
@@
-60,7
+64,7
@@
endif
%.o.$(_SUFFIX): %.c Makefile ../Makefile.tpl $(CFGFILES)
@echo --- $(CC) -o $@
%.o.$(_SUFFIX): %.c Makefile ../Makefile.tpl $(CFGFILES)
@echo --- $(CC) -o $@
- @$(CC) $(CFLAGS) -o $@ -c $<
+ @$(CC) $(CFLAGS)
$(CPPFLAGS)
-o $@ -c $<
@$(CC) -M $(CPPFLAGS) -MT $@ -o $*.d.$(ARCH) $<
-include $(DEPFILES)
@$(CC) -M $(CPPFLAGS) -MT $@ -o $*.d.$(ARCH) $<
-include $(DEPFILES)
UCC
git Repository :: git.ucc.asn.au