X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=Usermode%2FLibraries%2FMakefile.tpl;h=27de5f67314a178b672eaf8cd6a64f2dad009731;hb=9b09b24a5cc3dfb0cee51e0d1876c9253894666a;hp=0f6253c3502aab2e9d4a638adc58b4d7e1434c8b;hpb=b732b8e8da2bea4916286333efb34a9a5e1bf01e;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/Makefile.tpl b/Usermode/Libraries/Makefile.tpl
index 0f6253c3..27de5f67 100644
--- a/Usermode/Libraries/Makefile.tpl
+++ b/Usermode/Libraries/Makefile.tpl
@@ -10,7 +10,8 @@ ifeq ($(ARCH),native)
  LDFLAGS := $(LDFLAGS:-lc=-lc_acess)
 endif
 
-ifneq ($(lastword $(subst -, ,$(basename $(LD)))),ld)
+_LD_CMD := $(lastword $(subst -, ,$(firstword $(LD))))
+ifneq ($(_LD_CMD),ld)
   LDFLAGS := $(subst -soname ,-Wl$(comma)-soname$(comma),$(LDFLAGS))
   LDFLAGS := $(subst -Map ,-Wl$(comma)-Map$(comma),$(LDFLAGS))
   LDFLAGS := $(LDFLAGS:-x=-Wl,-x)
@@ -41,8 +42,9 @@ all: _libs $(_BIN) $(_XBIN)
 
 .PHONY: _libs
 
+.PRECIOUS: .no
 
-HEADERS := $(patsubst include_exp/%,../../include/%,$(shell find include_exp/ -name \*.h))
+HEADERS := $(patsubst include_exp/%,../../include/%,$(shell find include_exp/ -name \*.h 2>/dev/null))
 _libs: $(HEADERS)
 
 ../../include/%: include_exp/%
@@ -57,12 +59,14 @@ generate_exp: $(UTESTS:%=EXP_%.txt)
 	@echo > /dev/null
 
 utest-build: $(UTESTS:%=TEST_%)
+	@echo > /dev/null
 
 utest-run: $(UTESTS:%=runtest-%)
 	@echo > /dev/null
 
-$(UTESTS:%=runtest-%): runtest-%: TEST_%
-	./TEST_$* | diff EXP_$*.txt -
+$(UTESTS:%=runtest-%): runtest-%: TEST_% EXP_%.txt
+	@echo --- [TEST] $*
+	@./TEST_$* | diff EXP_$*.txt -
 
 clean:
 	$(RM) $(_BIN) $(_XBIN) $(OBJ) $(_BIN).dsm $(DEPFILES) $(EXTRACLEAN)
@@ -80,7 +84,7 @@ endif
 #	for f in $(INCFILES); do ln -s $f $(ACESSDIR)/include/$f; done
 #endif
 
-$(_BIN): $(OBJ) $(_LIBS)
+$(_BIN): $(OBJ)
 	@mkdir -p $(dir $(_BIN))
 	@echo [LD] -o $(BIN) $(OBJ)
 	$V$(LD) $(LDFLAGS) -o $(_BIN) $(OBJ) $(shell $(CC) -print-libgcc-file-name)
@@ -91,6 +95,16 @@ $(_OBJPREFIX)%.o: %.c
 	@mkdir -p $(dir $@)
 	$V$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $< -MMD -MP -MT $@ -MF $@.dep
 
+$(_OBJPREFIX)%.o: %.cc
+	@echo [CXX] -o $@
+	@mkdir -p $(dir $@)
+	$V$(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $< -MMD -MP -MT $@ -MF $@.dep
+
+$(_OBJPREFIX)%.o: %.cpp
+	@echo [CXX] -o $@
+	@mkdir -p $(dir $@)
+	$V$(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $< -MMD -MP -MT $@ -MF $@.dep
+
 $(_OBJPREFIX)%.ao: %.$(ASSUFFIX)
 	@echo [AS] -o $@
 	@mkdir -p $(dir $@)
@@ -109,10 +123,14 @@ $(OUTPUTDIR)Libs/%:
 
 obj-native/%.no: %.c
 	@mkdir -p $(dir $@)
-	$(NCC) -c $< -o $@ -Wall -std=gnu99 -MD -MP -MF $@.dep
+	@echo [CC Native] -o $@
+	@$(NCC) -g -c $< -o $@ -Wall -std=gnu99 -MD -MP -MF $@.dep '-D_SysDebug(f,v...)=fprintf(stderr,"DEBUG "f"\n",##v)' -include stdio.h
 
 TEST_%: obj-native/TEST_%.no obj-native/%.no
-	$(NCC) -o $@ $^
+	@echo [CC Native] -o $@
+	@$(NCC) -g -o $@ $^
+
+.PRECIOUS: $(UTESTS:%=obj-native/%.no) $(UTESTS:%=obj-native/TEST_%.no)
 
 -include $(UTESTS:%=obj-native/TEST_%.no.dep)
 -include $(UTESTS:%=obj-native/%.no.dep)