X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=Usermode%2FLibraries%2FMakefile.tpl;h=21f805cbe6a085362b64b7f86c4787990ea3a6b8;hb=b770132cdb8e79f27f3d429f24d94284dd6fe970;hp=5f73632786e77ee5ae55aa4c21f328e7402e3478;hpb=cb8ee714fcb4fce504fd767462789093a9fecbb1;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/Makefile.tpl b/Usermode/Libraries/Makefile.tpl
index 5f736327..21f805cb 100644
--- a/Usermode/Libraries/Makefile.tpl
+++ b/Usermode/Libraries/Makefile.tpl
@@ -2,34 +2,90 @@
 # - Library Common Makefile
 #
 
-DEPFILES := $(addsuffix .d,$(OBJ))
 
 _BIN := $(OUTPUTDIR)Libs/$(BIN)
+_XBIN := $(addprefix $(OUTPUTDIR)Libs/,$(EXTRABIN))
+_OBJPREFIX := obj-$(ARCH)/
 
-.PHONY: all clean install
+_LIBS := $(filter -l%,$(LDFLAGS))
+_LIBS := $(patsubst -l%,$(OUTPUTDIR)Libs/lib%.so,$(_LIBS))
 
-all: $(_BIN)
+OBJ := $(addprefix $(_OBJPREFIX),$(OBJ))
+
+UTESTS := $(patsubst TEST_%.c,%,$(wildcard TEST_*.c))
+DEPFILES := $(addsuffix .dep,$(OBJ))
+
+.PHONY: all clean install postbuild
+
+all: $(_BIN) $(_XBIN)
+
+.PHONY: utest utest-build utest-run $(UTESTS:%=runtest-%)
+
+utest: utest-build utest-run
+
+generate_exp: $(UTESTS:%=EXP_%.txt)
+
+utest-build: $(UTESTS:%=TEST_%)
+
+utest-run: $(UTESTS:%=runtest-%)
+
+$(UTESTS:%=runtest-%): runtest-%: TEST_%
+	./TEST_$* | diff EXP_$*.txt -
 
 clean:
-	$(RM) $(_BIN) $(OBJ) $(_BIN).dsm $(DEPFILES)
+	$(RM) $(_BIN) $(_XBIN) $(OBJ) $(_BIN).dsm $(DEPFILES) $(EXTRACLEAN)
 
-install: $(_BIN)
-	$(xCP) $(_BIN) $(DISTROOT)/Libs/
+install: all
+	@echo [xCP] $(DISTROOT)/Libs/$(BIN)
+	@$(xMKDIR) $(DISTROOT)/Libs; true
+	@$(STRIP) $(_BIN) -o $(_BIN)_
+	@$(xCP) $(_BIN)_ $(DISTROOT)/Libs/$(BIN)
+	@$(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)
+$(_BIN): $(OBJ) $(_LIBS)
 	@mkdir -p $(dir $(_BIN))
 	@echo [LD] -o $(BIN) $(OBJ)
-	@$(LD) $(LDFLAGS) -o $(_BIN) $(OBJ)
-	@$(OBJDUMP) -d -S $(_BIN) > $(_BIN).dsm
+	@$(LD) $(LDFLAGS) -o $(_BIN) $(OBJ) $(shell $(CC) -print-libgcc-file-name)
+	@$(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 $@)
+	@$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
+	@$(CC) -M -MP -MT $@ $(CPPFLAGS) $< -o $@.dep
 
-%.ao: %.asm
+$(_OBJPREFIX)%.ao: %.$(ASSUFFIX)
 	@echo [AS] -o $@
+	@mkdir -p $(dir $@)
 	@$(AS) $(ASFLAGS) -o $@ $<
-	@$(AS) $(ASFLAGS) -o $@ $< -M > $@.d
+ifeq ($(ASSUFFIX),S)
+	@$(AS) $(ASFLAGS) -o $@.dep $< -M
+else
+	@$(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 $@ -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