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
Makefile - Trace mtest build
[tpg/acess2.git]
/
Usermode
/
Applications
/
Makefile.tpl
diff --git
a/Usermode/Applications/Makefile.tpl
b/Usermode/Applications/Makefile.tpl
index
1339765
..
d1dcfcf
100644
(file)
--- a/
Usermode/Applications/Makefile.tpl
+++ b/
Usermode/Applications/Makefile.tpl
@@
-3,17
+3,37
@@
# - Application Template Makefile
#
# - Application Template Makefile
#
-CFLAGS += -Wall -Werror -fno-builtin -fno-stack-protector -g
-LDFLAGS +=
+CFLAGS += -g
+CXXFLAGS += -g
+LDFLAGS += -g
_BIN := $(OUTPUTDIR)$(DIR)/$(BIN)
_OBJPREFIX := obj-$(ARCH)/
_BIN := $(OUTPUTDIR)$(DIR)/$(BIN)
_OBJPREFIX := obj-$(ARCH)/
-_LIBS := $(filter -l%,$(LDFLAGS))
+LDFLAGS += -Map $(_OBJPREFIX)Map.txt
+
+comma=,
+LDFLAGS := $(subst -rpath-link ,-Wl$(comma)-rpath-link$(comma),$(LDFLAGS))
+LDFLAGS := $(subst -Map ,-Wl$(comma)-Map$(comma),$(LDFLAGS))
+
+_LIBS := $(filter -l%,$(LIBS))
_LIBS := $(patsubst -l%,$(OUTPUTDIR)Libs/lib%.so,$(_LIBS))
_LIBS := $(patsubst -l%,$(OUTPUTDIR)Libs/lib%.so,$(_LIBS))
+ifeq ($(ARCHDIR),native)
+ LDFLAGS := -L$(OUTPUTDIR)Libs/ $(patsubst -lc++,-lc++_acess,$(LDFLAGS))
+ LIBS := $(patsubst -lc++,-lc++_acess,$(LIBS))
+endif
+ifeq ($(VERBOSE),)
+V := @
+else
+V :=
+endif
+
OBJ := $(addprefix $(_OBJPREFIX),$(OBJ))
OBJ := $(addprefix $(_OBJPREFIX),$(OBJ))
+#LINK_OBJS := $(CRTI) $(CRTBEGIN) $(CRT0) $(OBJ) $(LIBGCC_PATH) $(CRTEND) $(CRTN)
+LINK_OBJS := $(OBJ)
+
DEPFILES := $(OBJ:%.o=%.dep)
.PHONY : all clean install
DEPFILES := $(OBJ:%.o=%.dep)
.PHONY : all clean install
@@
-31,23
+51,29
@@
install: $(_BIN)
@$(xCP) $(_BIN)_ $(DISTROOT)/$(DIR)/$(BIN)
@$(RM) $(_BIN)_
@$(xCP) $(_BIN)_ $(DISTROOT)/$(DIR)/$(BIN)
@$(RM) $(_BIN)_
-$(_BIN): $(
OUTPUTDIR)Libs/acess.ld $(OUTPUTDIR)Libs/crt0.o $(_LIBS) $(OBJ
)
+$(_BIN): $(
_LIBS) $(LINK_OBJS) $(CRT0) $(CRTI) $(CRTN
)
@mkdir -p $(dir $(_BIN))
@echo [LD] -o $@
@mkdir -p $(dir $(_BIN))
@echo [LD] -o $@
-ifneq ($(
_DBGMAKEFILE
),)
- $
(LD) -g $(LDFLAGS) -o $@ $(OBJ) -Map $(_OBJPREFIX)Map.txt
+ifneq ($(
USE_CXX_LINK
),)
+ $
V$(CXX) -g $(LDFLAGS) -o $(_BIN) $(LINK_OBJS) $(LIBS)
else
else
- @$(LD) -g $(LDFLAGS) -o $@ $(OBJ) -Map $(_OBJPREFIX)Map.txt
+ $V$(CC) -g $(LDFLAGS) -o $(_BIN) $(LINK_OBJS) $(LIBS)
endif
endif
-
@
$(DISASM) $(_BIN) > $(_OBJPREFIX)$(BIN).dsm
+
$V
$(DISASM) $(_BIN) > $(_OBJPREFIX)$(BIN).dsm
-$(
OBJ): $(
_OBJPREFIX)%.o: %.c
+$(_OBJPREFIX)%.o: %.c
@echo [CC] -o $@
ifneq ($(_OBJPREFIX),)
@echo [CC] -o $@
ifneq ($(_OBJPREFIX),)
- @mkdir -p $(
_OBJPREFIX
)
+ @mkdir -p $(
dir $@
)
endif
endif
- @$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
- @$(CC) -M -MT $@ $(CPPFLAGS) $< -o $(_OBJPREFIX)$*.dep
+ $V$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ -MQ $@ -MP -MD -MF $(_OBJPREFIX)$*.dep
+
+$(_OBJPREFIX)%.o: %.cpp
+ @echo [CXX] -o $@
+ifneq ($(_OBJPREFIX),)
+ @mkdir -p $(dir $@)
+endif
+ $V$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< -o $@ -MQ $@ -MP -MD -MF $(_OBJPREFIX)$*.dep
$(OUTPUTDIR)Libs/libld-acess.so:
@make -C $(ACESSDIR)/Usermode/Libraries/ld-acess.so_src/
$(OUTPUTDIR)Libs/libld-acess.so:
@make -C $(ACESSDIR)/Usermode/Libraries/ld-acess.so_src/
@@
-55,3
+81,5
@@
$(OUTPUTDIR)Libs/%:
@make -C $(ACESSDIR)/Usermode/Libraries/$*_src/
-include $(DEPFILES)
@make -C $(ACESSDIR)/Usermode/Libraries/$*_src/
-include $(DEPFILES)
+
+# vim: ft=make
UCC
git Repository :: git.ucc.asn.au