X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2FMakefile.tpl;h=d72ac6a24cfc32889454b33f6a9933f5c6e68321;hb=HEAD;hp=9d479314eac8cccf71c9920d1b4fe028aaa650b6;hpb=8a8a744341df513d00d2e60adf5e88636856e65b;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/Makefile.tpl b/Usermode/Applications/Makefile.tpl
index 9d479314..d72ac6a2 100644
--- a/Usermode/Applications/Makefile.tpl
+++ b/Usermode/Applications/Makefile.tpl
@@ -3,14 +3,37 @@
 # - 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)/
 
+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))
+
+ifeq ($(ARCHDIR),native)
+ LDFLAGS := $(patsubst -lc++,-lc++_acess,$(LDFLAGS))
+ LIBS := $(patsubst -lc++,-lc++_acess,$(LIBS))
+endif
+ifeq ($(VERBOSE),)
+V := @
+else
+V :=
+endif
+
 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
@@ -18,28 +41,45 @@ DEPFILES := $(OBJ:%.o=%.dep)
 all: $(_BIN)
 
 clean:
-	@$(RM) $(OBJ) $(DEPFILES) $(_BIN) $(BIN).dsm Map.txt
+	@$(RM) $(OBJ) $(DEPFILES) $(_BIN) $(BIN).dsm
+	@$(RM) -r $(_OBJPREFIX)
 
 install: $(_BIN)
+	@echo [xCP] $(DISTROOT)/$(DIR)/$(BIN)
 	@$(xMKDIR) $(DISTROOT)/$(DIR); true
-	$(xCP) $(_BIN) $(DISTROOT)/$(DIR)/
+	@$(STRIP) $(_BIN) -o $(_BIN)_
+	@$(xCP) $(_BIN)_ $(DISTROOT)/$(DIR)/$(BIN)
+	@$(RM) $(_BIN)_
 
-$(_BIN): $(OBJ)
+$(_BIN): $(_LIBS) $(LINK_OBJS) $(CRT0) $(CRTI) $(CRTN)
 	@mkdir -p $(dir $(_BIN))
-	@echo --- $(LD) -o $@
-ifneq ($(_DBGMAKEFILE),)
-	$(LD) -g $(LDFLAGS) -o $@ $(OBJ) -Map Map.txt
+	@echo [LD] -o $@
+ifneq ($(USE_CXX_LINK),)
+	$V$(CXX) -g $(LDFLAGS) -o $(_BIN) $(LINK_OBJS) $(LIBS)
 else
-	@$(LD) -g $(LDFLAGS) -o $@ $(OBJ) -Map Map.txt
+	$V$(CC)  -g $(LDFLAGS) -o $(_BIN) $(LINK_OBJS) $(LIBS)
+endif
+	$V$(DISASM) $(_BIN) > $(_OBJPREFIX)$(BIN).dsm
+
+$(_OBJPREFIX)%.o: %.c
+	@echo [CC] -o $@
+ifneq ($(_OBJPREFIX),)
+	@mkdir -p $(dir $@)
 endif
-	@$(DISASM) $(_BIN) > $(BIN).dsm
+	$V$(CC)  $(CFLAGS)   $(CPPFLAGS) -c $< -o $@ -MQ $@ -MP -MD -MF $(_OBJPREFIX)$*.dep
 
-$(OBJ): $(_OBJPREFIX)%.o: %.c
-	@echo --- GCC -o $@
+$(_OBJPREFIX)%.o: %.cpp
+	@echo [CXX] -o $@
 ifneq ($(_OBJPREFIX),)
-	@mkdir -p $(_OBJPREFIX)
+	@mkdir -p $(dir $@)
 endif
-	@$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
-	@$(CC) -M -MT $@ $(CPPFLAGS) $< -o $(_OBJPREFIX)$*.dep
+	$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/%:
+	@make -C $(ACESSDIR)/Usermode/Libraries/$*_src/
 
 -include $(DEPFILES)
+
+# vim: ft=make