Makefile - Fix mtest target (and clean up utest targets)

[tpg/acess2.git] / Usermode / Libraries / Makefile.tpl

diff --git a/Usermode/Libraries/Makefile.tpl b/Usermode/Libraries/Makefile.tpl
index e32dd60..5c796c3 100644 (file)
--- a/Usermode/Libraries/Makefile.tpl
+++ b/Usermode/Libraries/Makefile.tpl
@@ -2,8 +2,23 @@
 # - Library Common Makefile
 #
 
+comma=,
 
-_BIN := $(OUTPUTDIR)Libs/$(BIN)
+LDFLAGS += -soname $(BIN)
+
+ifeq ($(ARCH),native)
+ LDFLAGS := $(LDFLAGS:-lc=-lc_acess)
+endif
+
+_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)
+  LDFLAGS := $(LDFLAGS:--%=-Wl,--%)
+endif
+
+_BIN := $(addprefix $(OUTPUTDIR)Libs/,$(BIN))
 _XBIN := $(addprefix $(OUTPUTDIR)Libs/,$(EXTRABIN))
 _OBJPREFIX := obj-$(ARCH)/
 
@@ -12,45 +27,86 @@ _LIBS := $(patsubst -l%,$(OUTPUTDIR)Libs/lib%.so,$(_LIBS))
 
 OBJ := $(addprefix $(_OBJPREFIX),$(OBJ))
 
+UTESTS := $(patsubst TEST_%.c,%,$(wildcard TEST_*.c))
 DEPFILES := $(addsuffix .dep,$(OBJ))
 
+ifeq ($(VERBOSE),1)
+V :=
+else
+V := @
+endif
+
 .PHONY: all clean install postbuild
 
-all: $(_BIN) $(_XBIN)
+all: _libs $(_BIN) $(_XBIN)
+
+.PHONY: _libs
+
+.PRECIOUS: .no
+
+HEADERS := $(patsubst include_exp/%,../../include/%,$(shell find include_exp/ -name \*.h 2>/dev/null))
+_libs: $(HEADERS)
+
+../../include/%: include_exp/%
+       @mkdir -p $(dir $@)
+       @ln -s $(shell pwd)/$< $@
+
+.PHONY: utest utest-build utest-run $(UTESTS:%=runtest-%)
+
+utest: utest-build utest-run
+
+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_% EXP_%.txt
+       ./TEST_$* | diff EXP_$*.txt -
 
 clean:
        $(RM) $(_BIN) $(_XBIN) $(OBJ) $(_BIN).dsm $(DEPFILES) $(EXTRACLEAN)
 
 install: all
        @echo [xCP] $(DISTROOT)/Libs/$(BIN)
-       @$(xMKDIR) $(DISTROOT)/Libs; true
-       @$(STRIP) $(_BIN) -o $(_BIN)_
-       @$(xCP) $(_BIN)_ $(DISTROOT)/Libs/$(BIN)
-       @$(RM) $(_BIN)_
+       $V$(xMKDIR) $(DISTROOT)/Libs; true
+       $V$(STRIP) $(_BIN) -o $(_BIN)_
+       $V$(xCP) $(_BIN)_ $(DISTROOT)/Libs/$(BIN)
+       $V$(RM) $(_BIN)_
 ifneq ($(_XBIN),)
        $(xCP) $(_XBIN) $(DISTROOT)/Libs/
 endif
+#ifneq ($(INCFILES),)
+#      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)
-       @$(LD) $(LDFLAGS) -o $(_BIN) $(OBJ)
-       @$(DISASM) -S $(_BIN) > $(_OBJPREFIX)$(BIN).dsm
+       $V$(LD) $(LDFLAGS) -o $(_BIN) $(OBJ) $(shell $(CC) -print-libgcc-file-name)
+       $V$(DISASM) -D -S $(_BIN) > $(_OBJPREFIX)$(BIN).dsm
 
 $(_OBJPREFIX)%.o: %.c
        @echo [CC] -o $@
        @mkdir -p $(dir $@)
-       @$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
-       @$(CC) -M -MT $@ $(CPPFLAGS) $< -o [email protected]
+       $V$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $< -MMD -MP -MT $@ -MF [email protected]
+
+$(_OBJPREFIX)%.o: %.cc
+       @echo [CXX] -o $@
+       @mkdir -p $(dir $@)
+       $V$(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $< -MMD -MP -MT $@ -MF [email protected]
 
 $(_OBJPREFIX)%.ao: %.$(ASSUFFIX)
        @echo [AS] -o $@
        @mkdir -p $(dir $@)
-       @$(AS) $(ASFLAGS) -o $@ $<
+       $V$(AS) $(ASFLAGS) -o $@ $<
 ifeq ($(ASSUFFIX),S)
-       @$(AS) $(ASFLAGS) -o [email protected] $< -M
+       $V$(AS) $(ASFLAGS) -o [email protected] $< -M
 else
-       @$(AS) $(ASFLAGS) -o $@ $< -M > [email protected]
+       $V$(AS) $(ASFLAGS) -o $@ $< -M > [email protected]
 endif
 
 #$(OUTPUTDIR)Libs/libld-acess.so:
@@ -58,4 +114,17 @@ endif
 $(OUTPUTDIR)Libs/%:
        @make -C $(ACESSDIR)/Usermode/Libraries/$*_src/
 
+
+obj-native/%.no: %.c
+       @mkdir -p $(dir $@)
+       $(NCC) -g -c $< -o $@ -Wall -std=gnu99 -MD -MP -MF [email protected] '-D_SysDebug(f,v...)=fprintf(stderr,"DEBUG "f"\n",##v)' -include stdio.h
+
+TEST_%: obj-native/TEST_%.no obj-native/%.no
+       $(NCC) -g -o $@ $^
+
+-include $(UTESTS:%=obj-native/TEST_%.no.dep)
+-include $(UTESTS:%=obj-native/%.no.dep)
+
 -include $(DEPFILES)
+
+# vim: ft=make