X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2FMakefile.tpl;h=8706a0a8963c486e59a55797f48b6cda1dda0fdb;hb=db55040ba8814edf681d4ccc12ad8955d8aa404a;hp=5e241f23376d484f6fa54c42410913ad020b350f;hpb=94b8d7686d1da4e5338288f60910e6d8f68b5787;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/Makefile.tpl b/Usermode/Libraries/Makefile.tpl
index 5e241f23..8706a0a8 100644
--- a/Usermode/Libraries/Makefile.tpl
+++ b/Usermode/Libraries/Makefile.tpl
@@ -43,7 +43,7 @@ else
 V := @
 endif
 
-.PHONY: all clean install postbuild
+.PHONY: all clean install postbuild utest-build utest-run generate_exp
 
 all: _libs $(_BIN) $(_XBIN)
 
@@ -55,6 +55,7 @@ HEADERS := $(patsubst include_exp/%,../../include/%,$(shell find include_exp/ -n
 _libs: $(HEADERS)
 
 ../../include/%: include_exp/%
+	@echo [LN] $@
 	@mkdir -p $(dir $@)
 	@ln -s $(shell pwd)/$< $@
 
@@ -62,18 +63,16 @@ _libs: $(HEADERS)
 
 utest: utest-build utest-run
 
-generate_exp: $(UTESTS:%=EXP_%.txt)
-	@echo > /dev/null
+utest-build: _ $(UTESTS:%=TEST_%)
 
-utest-build: $(UTESTS:%=TEST_%)
-	@echo > /dev/null
+utest-run: _ $(UTESTS:%=runtest-%)
 
-utest-run: $(UTESTS:%=runtest-%)
-	@echo > /dev/null
+_:
+	@true
 
-$(UTESTS:%=runtest-%): runtest-%: TEST_% EXP_%.txt
+$(UTESTS:%=runtest-%): runtest-%: TEST_%
 	@echo --- [TEST] $*
-	@./TEST_$* | diff EXP_$*.txt -
+	@./TEST_$*
 
 clean:
 	$(RM) $(_BIN) $(_XBIN) $(OBJ) $(_BIN).dsm $(DEPFILES) $(EXTRACLEAN)
@@ -136,7 +135,7 @@ $(OUTPUTDIR)Libs/%:
 obj-native/%.no: %.c
 	@mkdir -p $(dir $@)
 	@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
+	@$(NCC) -g -c $< -o $@ -Wall -std=gnu99 -MD -MP -MF $@.dep '-D_SysDebug(f,v...)=fprintf(stderr,"DEBUG "f"\n",##v)' -include stdio.h -I $(ACESSDIR)/Usermode/Libraries/_utest_include/
 
 TEST_%: obj-native/TEST_%.no obj-native/%.no
 	@echo [CC Native] -o $@