X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2FMakefile.tpl;h=7c9546f5f4153bf872b6b32964b6242e5f6a8f0d;hb=40eb5cfbfd8baaa6f398e9bbc4960632525acd39;hp=d25d5aa585cabe95a8e67bb0756f050e11289efb;hpb=1cf5d4d187852cbe85fb41ae7b23f3e44e197afa;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/Makefile.tpl b/Usermode/Libraries/Makefile.tpl
index d25d5aa5..7c9546f5 100644
--- 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)/
 
@@ -15,17 +30,37 @@ 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_%
 	./TEST_$* | diff EXP_$*.txt -
@@ -35,10 +70,10 @@ clean:
 
 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
@@ -46,26 +81,25 @@ endif
 #	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) $(shell $(CC) -print-libgcc-file-name)
-	@$(DISASM) -D -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 -MP -MT $@ $(CPPFLAGS) $< -o $@.dep
+	$V$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $< -MMD -MP -MT $@ -MF $@.dep
 
 $(_OBJPREFIX)%.ao: %.$(ASSUFFIX)
 	@echo [AS] -o $@
 	@mkdir -p $(dir $@)
-	@$(AS) $(ASFLAGS) -o $@ $<
+	$V$(AS) $(ASFLAGS) -o $@ $<
 ifeq ($(ASSUFFIX),S)
-	@$(AS) $(ASFLAGS) -o $@.dep $< -M
+	$V$(AS) $(ASFLAGS) -o $@.dep $< -M
 else
-	@$(AS) $(ASFLAGS) -o $@ $< -M > $@.dep
+	$V$(AS) $(ASFLAGS) -o $@ $< -M > $@.dep
 endif
 
 #$(OUTPUTDIR)Libs/libld-acess.so:
@@ -76,7 +110,7 @@ $(OUTPUTDIR)Libs/%:
 
 obj-native/%.no: %.c
 	@mkdir -p $(dir $@)
-	$(NCC) -c $< -o $@ -MD -MP -MF $@.dep
+	$(NCC) -c $< -o $@ -Wall -std=gnu99 -MD -MP -MF $@.dep
 
 TEST_%: obj-native/TEST_%.no obj-native/%.no
 	$(NCC) -o $@ $^