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
Nearly completed physical init
[tpg/acess2.git]
/
Modules
/
Makefile.tpl
diff --git
a/Modules/Makefile.tpl
b/Modules/Makefile.tpl
index
8a09edb
..
103e8d8
100644
(file)
--- a/
Modules/Makefile.tpl
+++ b/
Modules/Makefile.tpl
@@
-4,17
+4,33
@@
_CPPFLAGS := $(CPPFLAGS)
_CPPFLAGS := $(CPPFLAGS)
--include ../../Makefile.cfg
+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../../Kernel/include -I../..
/Kernel/arch/$(ARCHDIR)/include -DARCH=$(ARCH) $(_CPPFLAGS)
-CFLAGS
= -Wall -Werror -fno-stack-protector $(CPPFLAGS)
+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
-OBJ := $(addsuffix .$(ARCH),$(OBJ))
-BIN = ../$(NAME).kmd.$(ARCH)
-KOBJ = ../$(NAME).xo.$(ARCH)
+ifeq ($(BUILDTYPE),dynamic)
+ _SUFFIX := dyn_$(ARCH)
+ ifneq ($(CATEGORY),)
+ BIN := ../$(CATEGORY)_$(NAME).kmd.$(ARCH)
+ else
+ BIN := ../$(NAME).kmd.$(ARCH)
+ endif
+ CFLAGS += -fPIC
+else
+ _SUFFIX := st_$(ARCH)
+ BIN := ../$(NAME).xo.$(ARCH)
+endif
-DEPFILES = $(filter %.o.$(ARCH),$(OBJ))
-DEPFILES := $(DEPFILES:%.o.$(ARCH)=%.d.$(ARCH))
+OBJ := $(addsuffix .$(_SUFFIX),$(OBJ))
+
+DEPFILES := $(filter %.o.$(_SUFFIX),$(OBJ))
+DEPFILES := $(DEPFILES:%.o.$(_SUFFIX)=%.d.$(ARCH))
.PHONY: all clean
.PHONY: all clean
@@
-23,16
+39,25
@@
all: $(BIN)
clean:
$(RM) $(BIN) $(BIN).dsm $(KOBJ) $(OBJ) $(DEPFILES)
clean:
$(RM) $(BIN) $(BIN).dsm $(KOBJ) $(OBJ) $(DEPFILES)
-$(BIN): $(OBJ)
+install: $(BIN)
+ifeq ($(BUILDTYPE),dynamic)
+ $(xCP) $(BIN) $(DISTROOT)/Modules/$(NAME).kmd.$(ARCH)
+else
+endif
+
+ifeq ($(BUILDTYPE),dynamic)
+$(BIN): %.kmd.$(ARCH): $(OBJ)
@echo --- $(LD) -o $@
@echo --- $(LD) -o $@
-
@$(LD) -T ../link.l
d -shared -nostdlib -o $@ $(OBJ)
-
# @$(LD)
-shared -nostdlib -o $@ $(OBJ)
+
# $(LD) -T $(ACESSDIR)/Modules/link.ld --allow-shlib-undefine
d -shared -nostdlib -o $@ $(OBJ)
+
@$(LD) --allow-shlib-undefined
-shared -nostdlib -o $@ $(OBJ)
@$(OBJDUMP) -d $(BIN) > $(BIN).dsm
@$(OBJDUMP) -d $(BIN) > $(BIN).dsm
- $(xCP) $@ $(DISTROOT)/Modules/$(NAME).kmd
- @echo --- $(LD) -o $(KOBJ)
- @$(CC) -Wl,-r -nostdlib -o $(KOBJ) $(OBJ)
+else
+$(BIN): %.xo.$(ARCH): $(OBJ)
+ @echo --- $(LD) -o $@
+ @$(LD) -r -o $@ $(OBJ)
+endif
-%.o.$(
ARCH): %.c Makefile ../Makefile.tpl ../../Makefile.cfg
+%.o.$(
_SUFFIX): %.c Makefile ../Makefile.tpl $(CFGFILES)
@echo --- $(CC) -o $@
@$(CC) $(CFLAGS) -o $@ -c $<
@$(CC) -M $(CPPFLAGS) -MT $@ -o $*.d.$(ARCH) $<
@echo --- $(CC) -o $@
@$(CC) $(CFLAGS) -o $@ -c $<
@$(CC) -M $(CPPFLAGS) -MT $@ -o $*.d.$(ARCH) $<
UCC
git Repository :: git.ucc.asn.au