X-Git-Url: http://nsz.repo.hu/git/?p=libc-test;a=blobdiff_plain;f=Makefile;h=0cd8a1f69543c036219c0f2cc030c1752a4bf3cf;hp=a1c91fcb11a5337ca90251cdca21227c972d66cc;hb=2bfb414517031063e18dc4a07543e279dc07461d;hpb=b9502244c24917c2fc442fc32e34c6803f8a3bcd

diff --git a/Makefile b/Makefile
index a1c91fc..0cd8a1f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,81 +1,138 @@
+B:=src
 SRCS:=$(sort $(wildcard src/*/*.c))
-OBJS:=$(SRCS:%.c=%.o)
-DIRS:=$(sort $(wildcard src/*))
-NAMES:=$(OBJS:.o=)
-SPEC_PATTERNS:=src/common/% src/api/% src/math/%
-CFLAGS:=-Isrc/common
-LDLIBS:=src/common/libtest.a
-
--include config.mak
+OBJS:=$(SRCS:src/%.c=$(B)/%.o)
+LOBJS:=$(SRCS:src/%.c=$(B)/%.lo)
+DIRS:=$(patsubst src/%/,%,$(sort $(dir $(SRCS))))
+BDIRS:=$(DIRS:%=$(B)/%)
+NAMES:=$(SRCS:src/%.c=%)
+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.exe -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 $@
+-include config.mak
+
+define default_template
+$(1).BINS_TEMPL:=bin.exe bin-static.exe
+$(1).NAMES:=$$(filter $(1)/%,$$(NAMES))
+$(1).OBJS:=$$($(1).NAMES:%=$(B)/%.o)
+endef
+$(foreach d,$(DIRS),$(eval $(call default_template,$(d))))
+common.BINS_TEMPL:=
+api.BINS_TEMPL:=
+math.BINS_TEMPL:=bin.exe
 
 define template
-$(1).BINS := $(1) $(1)-static
-D:=$$(dir $(1))
+D:=$$(patsubst %/,%,$$(dir $(1)))
 N:=$(1)
--include $(1).mk
-$(1) $(1)-static: $$($(1).OBJS)
-$(1).so: $$($(1).LOBJS)
+$(1).BINS := $$($$(D).BINS_TEMPL:bin%=$(B)/$(1)%)
+-include src/$(1).mk
+#$$(warning D $$(D) N $$(N) B $$($(1).BINS))
+$(B)/$(1).exe $(B)/$(1)-static.exe: $$($(1).OBJS)
+$(B)/$(1).so: $$($(1).LOBJS)
+# make sure dynamic and static binaries are not run parallel (matters for some tests eg ipc)
+$(B)/$(1)-static.err: $(B)/$(1).err
 endef
+$(foreach n,$(NAMES),$(eval $(call template,$(n))))
 
-$(foreach n,$(filter-out $(SPEC_PATTERNS),$(NAMES)),$(eval $(call template,$(n))))
+BINS:=$(foreach n,$(NAMES),$($(n).BINS)) $(B)/api/main.exe
+LIBS:=$(foreach n,$(NAMES),$($(n).LIBS)) $(B)/common/runtest.exe
+ERRS:=$(BINS:%.exe=%.err)
 
-MBINS:=$(filter src/math/%,$(NAMES))
-BINS:=$(foreach n,$(NAMES),$($(n).BINS)) src/api/main $(MBINS)
-LIBS:=$(foreach n,$(NAMES),$($(n).LIBS)) src/common/libtest.a
-ERRS:=$(BINS:%=%.err)
+debug:
+	@echo NAMES $(NAMES)
+	@echo BINS $(BINS)
+	@echo LIBS $(LIBS)
+	@echo ERRS $(ERRS)
+	@echo DIRS $(DIRS)
 
 define target_template
-$(1)/all: $(1)/REPORT
-$(1)/clean:
-	rm -f $$(filter $(1)/%,$$(OBJS) $$(BINS) $$(LIBS)) $(1)/*.err
-$(1)/REPORT: $$(filter $(1)/%,$$(ERRS))
-	cat $(1)/*.err >$$@
-REPORT: $(1)/REPORT
-.PHONY: $(1)/all $(1)/clean
+$(1).ERRS:=$$(filter $(B)/$(1)/%,$$(ERRS))
+$(B)/$(1)/all: $(B)/$(1)/REPORT
+$(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) $$(LOBJS) $$(BINS) $$(LIBS)) $(B)/$(1)/*.err
+$(B)/$(1)/REPORT: $$($(1).ERRS)
+	cat $(B)/$(1)/*.err >$$@
+run: $(B)/$(1)/run
+$(B)/REPORT: $(B)/$(1)/REPORT
+.PHONY: $(B)/$(1)/all $(B)/$(1)/clean
 endef
-
 $(foreach d,$(DIRS),$(eval $(call target_template,$(d))))
 
-all:REPORT
-clean:
-	rm -f $(OBJS) $(BINS) $(LIBS) src/*/*.err
-cleanall: clean
-	rm -f REPORT src/*/REPORT
-REPORT:
-	cat $^ |tee $@
-
-src/common/libtest.a: $(filter src/common/%,$(OBJS))
+$(B)/common/libtest.a: $(common.OBJS)
 	rm -f $@
 	$(AR) rc $@ $^
 	$(RANLIB) $@
 
-$(BINS) $(LIBS): src/common/libtest.a
-$(OBJS): src/common/test.h
-
-src/common/mtest.o: src/common/mtest.h
-$(MBINS:%=%.o): src/common/mtest.h
-
-IOBJS:=$(filter src/api/%,$(OBJS))
-src/api/main: $(IOBJS)
-src/api/main.OBJS:=$(IOBJS)
-$(IOBJS):CFLAGS+=-pedantic-errors -Werror -Wno-unused -D_XOPEN_SOURCE=700
-$(IOBJS):CFLAGS+=-DX_PS -DX_TPS -DX_SS
-
-%.o: %.c
-	$(CC) $(CFLAGS) $($*.CFLAGS) -c -o $@ $< 2>$@.err || echo BUILDERROR $@
-%.s: %.c
-	$(CC) $(CFLAGS) $($*.CFLAGS) -S -o $@ $< || echo BUILDERROR $@
-%.lo: %.c
-	$(CC) $(CFLAGS) $($*.CFLAGS) -fPIC -DSHARED -c -o $@ $< 2>$@.err || echo BUILDERROR $@
-%.so: %.lo
-	$(CC) -shared $(LDFLAGS) $($@.LDFLAGS) -o $@ $< $($*.LOBJS) $(LDLIBS) $($@.LDLIBS) 2>$@.err || echo BUILDERROR $@
-%-static: %.o
-	$(CC) -static $(LDFLAGS) $($@.LDFLAGS) -o $@ $< $($*.OBJS) $(LDLIBS) $($@.LDLIBS) 2>$@.err || echo BUILDERROR $@
-%: %.o
-	$(CC) $(LDFLAGS) $($@.LDFLAGS) -o $@ $< $($@.OBJS) $(LDLIBS) $($@.LDLIBS) 2>$@.err || echo BUILDERROR $@
+$(B)/common/all: $(B)/common/runtest.exe
+
+$(ERRS): $(B)/common/runtest.exe | $(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.exe: $(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
+
+all:$(B)/REPORT
+run:$(B)/REPORT
+clean:
+	rm -f $(OBJS) $(BINS) $(LIBS) $(B)/common/libtest.a $(B)/common/runtest.exe $(B)/common/options.h $(B)/*/*.err
+cleanall: clean
+	rm -f $(B)/REPORT $(B)/*/REPORT
+$(B)/REPORT:
+	cat $^ |tee $@
+
+$(B)/%.o:: src/%.c
+	$(CC) $(CFLAGS) $($*.CFLAGS) -c -o $@ $< 2>$@.err || echo BUILDERROR $@; cat $@.err
+$(B)/%.s:: src/%.c
+	$(CC) $(CFLAGS) $($*.CFLAGS) -S -o $@ $< || echo BUILDERROR $@; cat $@.err
+$(B)/%.lo:: src/%.c
+	$(CC) $(CFLAGS) $($*.CFLAGS) -fPIC -DSHARED -c -o $@ $< 2>$@.err || echo BUILDERROR $@; cat $@.err
+$(B)/%.so: $(B)/%.lo
+	$(CC) -shared $(LDFLAGS) $($*.so.LDFLAGS) -o $@ $< $($*.so.LOBJS) $(LDLIBS) $($*.so.LDLIBS) 2>$@.err || echo BUILDERROR $@; cat $@.err
+$(B)/%-static.exe: $(B)/%.o
+	$(CC) -static $(LDFLAGS) $($*-static.LDFLAGS) -o $@ $< $($*-static.OBJS) $(LDLIBS) $($*-static.LDLIBS) 2>$@.ld.err || echo BUILDERROR $@; cat $@.ld.err
+$(B)/%.exe: $(B)/%.o
+	$(CC) $(LDFLAGS) $($*.LDFLAGS) -o $@ $< $($*.OBJS) $(LDLIBS) $($*.LDLIBS) 2>$@.ld.err || echo BUILDERROR $@; cat $@.ld.err
 
 %.o.err: %.o
 	touch $@
@@ -83,9 +140,10 @@ $(IOBJS):CFLAGS+=-DX_PS -DX_TPS -DX_SS
 	touch $@
 %.so.err: %.so
 	touch $@
-%.err: %
-# TODO: proper wrapping that records exit status
-	./$< 2>/dev/null >$@ || true
+%.ld.err: %.exe
+	touch $@
+%.err: %.exe
+	$(RUN_TEST) ./$< >$@ || true
 
-.PHONY: all clean cleanall
+.PHONY: all run clean cleanall