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

diff --git a/Usermode/Libraries/Makefile.tpl b/Usermode/Libraries/Makefile.tpl
index 1bb96a21..8706a0a8 100644
--- a/Usermode/Libraries/Makefile.tpl
+++ b/Usermode/Libraries/Makefile.tpl
@@ -2,42 +2,150 @@
 # - Library Common Makefile
 #
 
+comma=,
 
-_BIN := $(OUTPUTDIR)Libs/$(BIN)
+LDFLAGS += -soname $(BIN)
+
+ifeq ($(ARCH),native)
+ LDFLAGS := $(LDFLAGS:-lc=-lc_acess)
+endif
+
+_BIN := $(addprefix $(OUTPUTDIR)Libs/,$(BIN))
 _XBIN := $(addprefix $(OUTPUTDIR)Libs/,$(EXTRABIN))
 _OBJPREFIX := obj-$(ARCH)/
+LDFLAGS += -Map $(_OBJPREFIX)Map.txt
+
+_LD_CMD := $(lastword $(subst -, ,$(firstword $(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,--%)
+
+_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))
 DEPFILES := $(addsuffix .dep,$(OBJ))
 
-.PHONY: all clean install postbuild
+ifeq ($(VERBOSE),1)
+V :=
+else
+V := @
+endif
+
+.PHONY: all clean install postbuild utest-build utest-run generate_exp
+
+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/%
+	@echo [LN] $@
+	@mkdir -p $(dir $@)
+	@ln -s $(shell pwd)/$< $@
+
+.PHONY: utest utest-build utest-run $(UTESTS:%=runtest-%)
+
+utest: utest-build utest-run
+
+utest-build: _ $(UTESTS:%=TEST_%)
 
-all: $(_BIN) $(_XBIN)
+utest-run: _ $(UTESTS:%=runtest-%)
+
+_:
+	@true
+
+$(UTESTS:%=runtest-%): runtest-%: TEST_%
+	@echo --- [TEST] $*
+	@./TEST_$*
 
 clean:
-	$(RM) $(_BIN) $(_XBIN) $(OBJ) $(_BIN).dsm $(DEPFILES)
+	$(RM) $(_BIN) $(_XBIN) $(OBJ) $(_BIN).dsm $(DEPFILES) $(EXTRACLEAN)
 
 install: all
-	@$(xMKDIR) $(DISTROOT)/Libs; true
-	$(xCP) $(_BIN) $(_XBIN) $(DISTROOT)/Libs/
+	@echo [xCP] $(DISTROOT)/Libs/$(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)
+LINK_OBJS = $(PRELINK) $(OBJ)
+$(_BIN): $(CRTI) $(LINK_OBJS) $(CRTN) $(CRT0S)
 	@mkdir -p $(dir $(_BIN))
 	@echo [LD] -o $(BIN) $(OBJ)
-	@$(LD) $(LDFLAGS) -o $(_BIN) $(OBJ)
-	@$(DISASM) $(_BIN) > $(_BIN).dsm
+ifneq ($(USE_CXX_LINK),)
+	$V$(CXX) $(LDFLAGS) -o $(_BIN) $(LINK_OBJS) $(LIBS)
+else
+	$V$(CC) $(LDFLAGS) -o $(_BIN) $(LINK_OBJS) $(LIBS)
+endif
+	$V$(DISASM) -C $(_BIN) > $(_OBJPREFIX)$(BIN).dsm
 
-$(_OBJPREFIX)%.o: %.c
+$(_OBJPREFIX)%.o: %.c Makefile
 	@echo [CC] -o $@
 	@mkdir -p $(dir $@)
-	@$(CC) $(CFLAGS) -o $@ -c $<
-	@$(CC) -M -MT $@ $(CPPFLAGS) $< -o $@.dep
+	$V$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $< -MMD -MP -MT $@ -MF $@.dep
+
+$(_OBJPREFIX)%.o: %.cc Makefile
+	@echo [CXX] -o $@
+	@mkdir -p $(dir $@)
+	$V$(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $< -MMD -MP -MT $@ -MF $@.dep
 
-$(_OBJPREFIX)%.ao: %.asm
+$(_OBJPREFIX)%.o: %.cpp Makefile
+	@echo [CXX] -o $@
+	@mkdir -p $(dir $@)
+	$V$(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $< -MMD -MP -MT $@ -MF $@.dep
+
+$(_OBJPREFIX)%.ao: %.$(ASSUFFIX) Makefile
 	@echo [AS] -o $@
 	@mkdir -p $(dir $@)
-	@$(AS) $(ASFLAGS) -o $@ $<
-	@$(AS) $(ASFLAGS) -o $@ $< -M > $@.dep
+	$V$(AS) $(ASFLAGS) -o $@ $<
+ifeq ($(ASSUFFIX),S)
+	$V$(AS) $(ASFLAGS) -o $@.dep $< -M
+else
+	$V$(AS) $(ASFLAGS) -o $@ $< -M > $@.dep
+endif
+
+#$(OUTPUTDIR)Libs/libld-acess.so:
+#	@make -C $(ACESSDIR)/Usermode/Libraries/ld-acess.so_src/
+$(OUTPUTDIR)Libs/%:
+	@make -C $(ACESSDIR)/Usermode/Libraries/$*_src/
+
+
+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 -I $(ACESSDIR)/Usermode/Libraries/_utest_include/
+
+TEST_%: obj-native/TEST_%.no obj-native/%.no
+	@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)
 
 -include $(DEPFILES)
+
+# vim: ft=make