X-Git-Url: http://nsz.repo.hu/git/?p=libc-test;a=blobdiff_plain;f=Makefile;h=13ed2cb0e84de96de2991069aab911062e8b0290;hp=be3d181bde5a8178d7fcc6fe6cad2c5d86dc948c;hb=8f89d908656122033909033a7a71c87636319a08;hpb=6c699be2856c963bcc0e197845a199193f66d19a

diff --git a/Makefile b/Makefile
index be3d181..13ed2cb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,38 @@
 B:=src
 SRCS:=$(sort $(wildcard src/*/*.c))
 OBJS:=$(SRCS:src/%.c=$(B)/%.o)
-DIRS:=$(patsubst src/%,%,$(filter-out src/REPORT,$(sort $(wildcard src/*))))
+LOBJS:=$(SRCS:src/%.c=$(B)/%.lo)
+DIRS:=$(patsubst src/%/,%,$(sort $(dir $(SRCS))))
 BDIRS:=$(DIRS:%=$(B)/%)
 NAMES:=$(SRCS:src/%.c=%)
-CFLAGS:=-Isrc/common
+CFLAGS:=-Isrc/common -I$(B)/common
 LDLIBS:=$(B)/common/libtest.a
+AR = $(CROSS_COMPILE)ar
+RANLIB = $(CROSS_COMPILE)ranlib
+RUN_TEST = $(RUN_WRAP) $(B)/common/runtest -w '$(RUN_WRAP)'
 
 all:
 %.mk:
+# turn off evil implicit rules
+.SUFFIXES:
+%: %.o
+%: %.c
+%: %.cc
+%: %.C
+%: %.cpp
+%: %.p
+%: %.f
+%: %.F
+%: %.r
+%: %.s
+%: %.S
+%: %.mod
+%: %.sh
+%: %,v
+%: RCS/%,v
+%: RCS/%
+%: s.%
+%: SCCS/s.%
 
 config.mak:
 	cp config.mak.def $@
@@ -38,7 +62,7 @@ endef
 $(foreach n,$(NAMES),$(eval $(call template,$(n))))
 
 BINS:=$(foreach n,$(NAMES),$($(n).BINS)) $(B)/api/main
-LIBS:=$(foreach n,$(NAMES),$($(n).LIBS)) $(B)/common/run
+LIBS:=$(foreach n,$(NAMES),$($(n).LIBS)) $(B)/common/runtest
 ERRS:=$(BINS:%=%.err)
 
 debug:
@@ -51,12 +75,11 @@ debug:
 define target_template
 $(1).ERRS:=$$(filter $(B)/$(1)/%,$$(ERRS))
 $(B)/$(1)/all: $(B)/$(1)/REPORT
-# TODO: $(B)/common/run collides with the run binary target
 $(B)/$(1)/run: $(B)/$(1)/cleanerr $(B)/$(1)/REPORT
 $(B)/$(1)/cleanerr:
 	rm -f $$(filter-out $(B)/$(1)/%-static.err,$$($(1).ERRS))
 $(B)/$(1)/clean:
-	rm -f $$(filter $(B)/$(1)/%,$$(OBJS) $$(BINS) $$(LIBS)) $(B)/$(1)/*.err
+	rm -f $$(filter $(B)/$(1)/%,$$(OBJS) $$(LOBJS) $$(BINS) $$(LIBS)) $(B)/$(1)/*.err
 $(B)/$(1)/REPORT: $$($(1).ERRS)
 	cat $(B)/$(1)/*.err >$$@
 run: $(B)/$(1)/run
@@ -70,34 +93,39 @@ $(B)/common/libtest.a: $(common.OBJS)
 	$(AR) rc $@ $^
 	$(RANLIB) $@
 
-$(ERRS): $(B)/common/run | $(BDIRS)
+$(B)/common/all: $(B)/common/runtest
+
+$(ERRS): $(B)/common/runtest | $(BDIRS)
 $(BINS) $(LIBS): $(B)/common/libtest.a
 $(OBJS): src/common/test.h | $(BDIRS)
 $(BDIRS):
 	mkdir -p $@
 
+$(B)/common/options.h: src/common/options.h.in
+	$(CC) -E - <$< | sed -e '1,/optiongroups_unistd_end/d' -e '/^#/d' -e '/^[[:space:]]*$$/d' -e 's/^/#define /' >$@
+
 $(B)/common/mtest.o: src/common/mtest.h
 $(math.OBJS): src/common/mtest.h
 
 $(B)/api/main: $(api.OBJS)
 api/main.OBJS:=$(api.OBJS)
+$(api.OBJS):$(B)/common/options.h
 $(api.OBJS):CFLAGS+=-pedantic-errors -Werror -Wno-unused -D_XOPEN_SOURCE=700
-$(api.OBJS):CFLAGS+=-DX_PS -DX_TPS -DX_SS
 
 all:$(B)/REPORT
 run:$(B)/REPORT
 clean:
-	rm -f $(OBJS) $(BINS) $(LIBS) $(B)/common/libtest.a $(B)/common/run $(B)/*/*.err
+	rm -f $(OBJS) $(BINS) $(LIBS) $(B)/common/libtest.a $(B)/common/runtest $(B)/common/options.h $(B)/*/*.err
 cleanall: clean
 	rm -f $(B)/REPORT $(B)/*/REPORT
 $(B)/REPORT:
 	cat $^ |tee $@
 
-$(B)/%.o: src/%.c
+$(B)/%.o:: src/%.c
 	$(CC) $(CFLAGS) $($*.CFLAGS) -c -o $@ $< 2>$@.err || echo BUILDERROR $@
-$(B)/%.s: src/%.c
+$(B)/%.s:: src/%.c
 	$(CC) $(CFLAGS) $($*.CFLAGS) -S -o $@ $< || echo BUILDERROR $@
-$(B)/%.lo: src/%.c
+$(B)/%.lo:: src/%.c
 	$(CC) $(CFLAGS) $($*.CFLAGS) -fPIC -DSHARED -c -o $@ $< 2>$@.err || echo BUILDERROR $@
 $(B)/%.so: $(B)/%.lo
 	$(CC) -shared $(LDFLAGS) $($*.so.LDFLAGS) -o $@ $< $($*.so.LOBJS) $(LDLIBS) $($*.so.LDLIBS) 2>$@.err || echo BUILDERROR $@
@@ -115,7 +143,7 @@ $(B)/%: $(B)/%.o
 %.ld.err: %
 	touch $@
 %.err: %
-	$(B)/common/run ./$< 2>/dev/null >$@ || true
+	$(RUN_TEST) ./$< >$@ || true
 
 .PHONY: all run clean cleanall