Build - Fix build quirks for fresh

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

diff --git a/Usermode/Libraries/Makefile.tpl b/Usermode/Libraries/Makefile.tpl
index 530b585..de263f5 100644 (file)
--- a/Usermode/Libraries/Makefile.tpl
+++ b/Usermode/Libraries/Makefile.tpl
@@ -24,6 +24,14 @@ LDFLAGS := $(LDFLAGS:--%=-Wl,--%)
 _LIBS := $(filter -l%,$(LDFLAGS))
 _LIBS := $(patsubst -l%,$(OUTPUTDIR)Libs/lib%.so,$(_LIBS))
 
+ifeq ($(ARCHDIR),native)
+ LIBS := $(patsubst -lc,-lc_acess,$(LIBS))
+ LIBS := $(patsubst -lc++,-lc++_acess,$(LIBS))
+ ifneq ($(BIN),libc_acess.so)
+  LIBS += -lc_acess
+ endif
+endif
+
 OBJ := $(addprefix $(_OBJPREFIX),$(OBJ))
 
 UTESTS := $(patsubst TEST_%.c,%,$(wildcard TEST_*.c))
@@ -35,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)
 
@@ -47,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)/$< $@
 
@@ -54,18 +63,13 @@ _libs: $(HEADERS)
 
 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
+$(UTESTS:%=runtest-%): runtest-%: TEST_%
        @echo --- [TEST] $*
-       @./TEST_$* | diff EXP_$*.txt -
+       @./TEST_$*
 
 clean:
        $(RM) $(_BIN) $(_XBIN) $(OBJ) $(_BIN).dsm $(DEPFILES) $(EXTRACLEAN)
@@ -84,7 +88,7 @@ endif
 #endif
 
 LINK_OBJS = $(PRELINK) $(OBJ)
-$(_BIN): $(LINK_OBJS)
+$(_BIN): $(CRTI) $(LINK_OBJS) $(CRTN) $(CRT0S)
        @mkdir -p $(dir $(_BIN))
        @echo [LD] -o $(BIN) $(OBJ)
 ifneq ($(USE_CXX_LINK),)