X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2FMakefile.tpl;h=a99ff144e3099134fd0ea5a9f0f745d4d5787d49;hb=b7d9f86f7a1c23be18b50d5c647fd5d3c08369c3;hp=ccae9cacd3afe6c0ef9d83d27fbb97615fba126a;hpb=c8e606164e7bb405295b2f14e6949d0812cfa342;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/Makefile.tpl b/Usermode/Libraries/Makefile.tpl
index ccae9cac..a99ff144 100644
--- a/Usermode/Libraries/Makefile.tpl
+++ b/Usermode/Libraries/Makefile.tpl
@@ -2,36 +2,127 @@
 # - Library Common Makefile
 #
 
-DEPFILES := $(addsuffix .d,$(OBJ))
+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)/
+
+_LIBS := $(filter -l%,$(LDFLAGS))
+_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
+
+
+HEADERS := $(patsubst include_exp/%,../../include/%,$(shell find include_exp/ -name \*.h))
+_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_%)
+
+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)
+	$(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)
 	@mkdir -p $(dir $(_BIN))
 	@echo [LD] -o $(BIN) $(OBJ)
-	@$(LD) $(LDFLAGS) -o $(_BIN) $(OBJ)
-	@$(OBJDUMP) -d -S $(_BIN) > $(_BIN).dsm
+	$V$(LD) $(LDFLAGS) -o $(_BIN) $(OBJ) $(shell $(CC) -print-libgcc-file-name)
+	$V$(DISASM) -D -S $(_BIN) > $(_OBJPREFIX)$(BIN).dsm
 
-%.o: %.c
+$(_OBJPREFIX)%.o: %.c
 	@echo [CC] -o $@
-	@$(CC) $(CFLAGS) -o $@ -c $<
-	@$(CC) -M -MT $@ $(CPPFLAGS) $< -o $@.d
+	@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
 
-%.ao: %.asm
+$(_OBJPREFIX)%.ao: %.$(ASSUFFIX)
 	@echo [AS] -o $@
-	@$(AS) $(ASFLAGS) -o $@ $<
-	@$(AS) $(ASFLAGS) -o $@ $< -M > $@.d
+	@mkdir -p $(dir $@)
+	$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 $@)
+	$(NCC) -c $< -o $@ -Wall -std=gnu99 -MD -MP -MF $@.dep
+
+TEST_%: obj-native/TEST_%.no obj-native/%.no
+	$(NCC) -o $@ $^
+
+-include $(UTESTS:%=obj-native/TEST_%.no.dep)
+-include $(UTESTS:%=obj-native/%.no.dep)
 
 -include $(DEPFILES)
+
+# vim: ft=make