diff options
author | 2014-01-04 01:24:48 +0000 | |
---|---|---|
committer | 2014-01-04 01:24:48 +0000 | |
commit | d249205f3e61b82253dbfabd21da3c5ea1fe83fb (patch) | |
tree | 2d3c5844c11fc6a8cbe482f47ac1d949f4b201f2 /Makefile | |
parent | 6f0b0fbe92a133fce77709fc467fc17dde75240f (diff) | |
download | mandoc-d249205f3e61b82253dbfabd21da3c5ea1fe83fb.tar.gz mandoc-d249205f3e61b82253dbfabd21da3c5ea1fe83fb.tar.zst mandoc-d249205f3e61b82253dbfabd21da3c5ea1fe83fb.zip |
Merge cleanup of feature tests to VERSION_1_12, resolving conflicts.
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 63 |
1 files changed, 12 insertions, 51 deletions
@@ -60,6 +60,14 @@ DBLN = llib-lapropos.ln llib-lmandocdb.ln llib-lman.cgi.ln llib-lcatman.ln all: mandoc preconv demandoc $(DBBIN) +TESTSRCS = test-betoh64.c \ + test-fgetln.c \ + test-getsubopt.c \ + test-mmap.c \ + test-strlcat.c \ + test-strlcpy.c \ + test-strptime.c + SRCS = Makefile \ NEWS \ TODO \ @@ -160,17 +168,11 @@ SRCS = Makefile \ term.h \ term_ascii.c \ term_ps.c \ - test-betoh64.c \ - test-fgetln.c \ - test-getsubopt.c \ - test-mmap.c \ - test-strlcat.c \ - test-strlcpy.c \ - test-strptime.c \ tree.c \ vol.c \ vol.in \ - whatis.1 + whatis.1 \ + $(TESTSRCS) LIBMAN_OBJS = man.o \ man_hash.o \ @@ -390,50 +392,9 @@ mdocml.tar.gz: $(SRCS) index.html: $(INDEX_OBJS) -config.h: config.h.pre config.h.post +config.h: configure config.h.pre config.h.post $(TESTSRCS) rm -f config.log - ( cat config.h.pre; \ - echo; \ - echo '#define VERSION "$(VERSION)"'; \ - if $(CC) $(CFLAGS) -Werror -Wno-unused -o test-fgetln test-fgetln.c >> config.log 2>&1; then \ - echo '#define HAVE_FGETLN'; \ - rm test-fgetln; \ - fi; \ - if $(CC) $(CFLAGS) -Werror -Wno-unused -o test-strptime test-strptime.c >> config.log 2>&1; then \ - echo '#define HAVE_STRPTIME'; \ - rm test-strptime; \ - fi; \ - if $(CC) $(CFLAGS) -Werror -Wno-unused -o test-getsubopt test-getsubopt.c >> config.log 2>&1; then \ - echo '#define HAVE_GETSUBOPT'; \ - rm test-getsubopt; \ - fi; \ - if $(CC) $(CFLAGS) -Werror -Wno-unused -o test-strlcat test-strlcat.c >> config.log 2>&1; then \ - echo '#define HAVE_STRLCAT'; \ - rm test-strlcat; \ - fi; \ - if $(CC) $(CFLAGS) -Werror -Wno-unused -o test-mmap test-mmap.c >> config.log 2>&1; then \ - echo '#define HAVE_MMAP'; \ - rm test-mmap; \ - fi; \ - if $(CC) $(CFLAGS) -Werror -Wno-unused -o test-strlcpy test-strlcpy.c >> config.log 2>&1; then \ - echo '#define HAVE_STRLCPY'; \ - rm test-strlcpy; \ - fi; \ - if $(CC) $(CFLAGS) -Werror -Wno-unused -o test-betoh64 test-betoh64.c >> config.log 2>&1; then \ - echo '#define HAVE_BETOH64'; \ - rm test-betoh64; \ - fi; \ - if $(CC) $(CFLAGS) -Werror -Wno-unused -o test-strcasestr test-strcasestr.c >> config.log 2>&1; then \ - echo '#define HAVE_STRCASESTR'; \ - rm test-strcasestr; \ - fi; \ - if $(CC) $(CFLAGS) -Werror -Wno-unused -o test-strsep test-strsep.c >> config.log 2>&1; then \ - echo '#define HAVE_STRSEP'; \ - rm test-strsep; \ - fi; \ - echo; \ - cat config.h.post \ - ) > $@ + CC="$(CC)" CFLAGS="$(CFLAGS)" VERSION="$(VERSION)" ./configure .h.h.html: highlight -I $< >$@ |