X-Git-Url: http://nsz.repo.hu/git/?p=libc-test;a=blobdiff_plain;f=Makefile;h=0cd8a1f69543c036219c0f2cc030c1752a4bf3cf;hp=77e85a13ed9906b040aeca697b0dab9c2b968620;hb=1a68cdaedf8e9d379dc742f8a9c6198c0cb99dc5;hpb=fd13cb9d081d7cc2355fc34805377e88399a7534

diff --git a/Makefile b/Makefile
index 77e85a1..0cd8a1f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,28 +1,52 @@
 B:=src
 SRCS:=$(sort $(wildcard src/*/*.c))
 OBJS:=$(SRCS:src/%.c=$(B)/%.o)
-DIRS:=$(patsubst src/%/,%,$(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.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 bin-static
+$(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
+math.BINS_TEMPL:=bin.exe
 
 define template
 D:=$$(patsubst %/,%,$$(dir $(1)))
@@ -30,16 +54,16 @@ N:=$(1)
 $(1).BINS := $$($$(D).BINS_TEMPL:bin%=$(B)/$(1)%)
 -include src/$(1).mk
 #$$(warning D $$(D) N $$(N) B $$($(1).BINS))
-$(B)/$(1) $(B)/$(1)-static: $$($(1).OBJS)
+$(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))))
 
-BINS:=$(foreach n,$(NAMES),$($(n).BINS)) $(B)/api/main
-LIBS:=$(foreach n,$(NAMES),$($(n).LIBS)) $(B)/common/run
-ERRS:=$(BINS:%=%.err)
+BINS:=$(foreach n,$(NAMES),$($(n).BINS)) $(B)/api/main.exe
+LIBS:=$(foreach n,$(NAMES),$($(n).LIBS)) $(B)/common/runtest.exe
+ERRS:=$(BINS:%.exe=%.err)
 
 debug:
 	@echo NAMES $(NAMES)
@@ -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,41 +93,46 @@ $(B)/common/libtest.a: $(common.OBJS)
 	$(AR) rc $@ $^
 	$(RANLIB) $@
 
-$(ERRS): $(B)/common/run | $(BDIRS)
+$(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: $(api.OBJS)
+$(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
-$(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.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 $@
-$(B)/%.s: src/%.c
-	$(CC) $(CFLAGS) $($*.CFLAGS) -S -o $@ $< || echo BUILDERROR $@
-$(B)/%.lo: src/%.c
-	$(CC) $(CFLAGS) $($*.CFLAGS) -fPIC -DSHARED -c -o $@ $< 2>$@.err || echo BUILDERROR $@
+$(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 $@
-$(B)/%-static: $(B)/%.o
-	$(CC) -static $(LDFLAGS) $($*-static.LDFLAGS) -o $@ $< $($*-static.OBJS) $(LDLIBS) $($*-static.LDLIBS) 2>$@.ld.err || echo BUILDERROR $@
-$(B)/%: $(B)/%.o
-	$(CC) $(LDFLAGS) $($*.LDFLAGS) -o $@ $< $($*.OBJS) $(LDLIBS) $($*.LDLIBS) 2>$@.ld.err || echo BUILDERROR $@
+	$(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 $@
@@ -112,10 +140,10 @@ $(B)/%: $(B)/%.o
 	touch $@
 %.so.err: %.so
 	touch $@
-%.ld.err: %
+%.ld.err: %.exe
 	touch $@
-%.err: %
-	$(B)/common/run ./$< 2>/dev/null >$@ || true
+%.err: %.exe
+	$(RUN_TEST) ./$< >$@ || true
 
 .PHONY: all run clean cleanall