From 270bf7df411e9f1bb2fd520009881744cffad2dd Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Tue, 5 Aug 2014 05:29:53 +0000 Subject: Switch to autogenerated dependency rules; they are less error-prone. Provide a maintainer target to regenerate them. --- Makefile | 157 ++++++++++++++++++++++++++------------------------------ Makefile.depend | 64 +++++++++++++++++++++++ 2 files changed, 136 insertions(+), 85 deletions(-) create mode 100644 Makefile.depend diff --git a/Makefile b/Makefile index f325ecea..273f4cc5 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.395.2.23 2014/08/05 03:15:22 schwarze Exp $ +# $Id: Makefile,v 1.395.2.24 2014/08/05 05:29:53 schwarze Exp $ # # Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons # Copyright (c) 2011, 2013, 2014 Ingo Schwarze @@ -94,20 +94,11 @@ TESTSRCS = test-betoh64.c \ test-strptime.c \ test-strsep.c -SRCS = LICENSE \ - Makefile \ - NEWS \ - TODO \ - apropos.1 \ - apropos.c \ +SRCS = apropos.c \ apropos_db.c \ - apropos_db.h \ arch.c \ - arch.in \ att.c \ - att.in \ chars.c \ - chars.in \ compat_fgetln.c \ compat_getsubopt.c \ compat_reallocarray.c \ @@ -115,51 +106,24 @@ SRCS = LICENSE \ compat_strlcat.c \ compat_strlcpy.c \ compat_strsep.c \ - config.h.post \ - config.h.pre \ - configure \ - demandoc.1 \ demandoc.c \ - eqn.7 \ eqn.c \ eqn_html.c \ eqn_term.c \ - example.style.css \ - gmdiff \ html.c \ - html.h \ lib.c \ - lib.in \ - libman.h \ - libmandoc.h \ - libmdoc.h \ - libroff.h \ main.c \ - main.h \ - man.7 \ man.c \ - man.h \ man_hash.c \ man_html.c \ man_macro.c \ man_term.c \ man_validate.c \ - mandoc.1 \ - mandoc.3 \ mandoc.c \ - mandoc.h \ mandoc_aux.c \ - mandoc_aux.h \ - mandoc_char.7 \ - mandoc_html.3 \ - mandocdb.8 \ mandocdb.c \ - mandocdb.h \ manpath.c \ - manpath.h \ - mdoc.7 \ mdoc.c \ - mdoc.h \ mdoc_argv.c \ mdoc_hash.c \ mdoc_html.c \ @@ -168,20 +132,11 @@ SRCS = LICENSE \ mdoc_term.c \ mdoc_validate.c \ msec.c \ - msec.in \ out.c \ - out.h \ - preconv.1 \ preconv.c \ - predefs.in \ read.c \ - roff.7 \ roff.c \ st.c \ - st.in \ - style.css \ - tbl.3 \ - tbl.7 \ tbl.c \ tbl_data.c \ tbl_html.c \ @@ -189,14 +144,62 @@ SRCS = LICENSE \ tbl_opts.c \ tbl_term.c \ term.c \ - term.h \ term_ascii.c \ term_ps.c \ tree.c \ vol.c \ + $(TESTSRCS) + +DISTFILES = LICENSE \ + Makefile \ + Makefile.depend \ + NEWS \ + TODO \ + apropos.1 \ + apropos_db.h \ + arch.in \ + att.in \ + chars.in \ + config.h.post \ + config.h.pre \ + configure \ + demandoc.1 \ + eqn.7 \ + example.style.css \ + gmdiff \ + html.h \ + lib.in \ + libman.h \ + libmandoc.h \ + libmdoc.h \ + libroff.h \ + main.h \ + man.7 \ + man.h \ + mandoc.1 \ + mandoc.3 \ + mandoc.h \ + mandoc_aux.h \ + mandoc_char.7 \ + mandoc_html.3 \ + mandocdb.8 \ + mandocdb.h \ + manpath.h \ + mdoc.7 \ + mdoc.h \ + msec.in \ + out.h \ + preconv.1 \ + predefs.in \ + roff.7 \ + st.in \ + style.css \ + tbl.3 \ + tbl.7 \ + term.h \ vol.in \ whatis.1 \ - $(TESTSRCS) + $(SRCS) LIBMAN_OBJS = man.o \ man_hash.o \ @@ -238,37 +241,11 @@ COMPAT_OBJS = compat_fgetln.o \ compat_strlcpy.o \ compat_strsep.o -# === DEPENDENCY HANDLING ============================================== - -all: base-build $(BUILD_TARGETS) - -base-build: $(BASEBIN) - -db-build: $(DBBIN) - -install: base-install $(INSTALL_TARGETS) - -arch.o: arch.in -att.o: att.in -chars.o: chars.in -lib.o: lib.in -msec.o: msec.in -roff.o: predefs.in -st.o: st.in -vol.o: vol.in - -$(LIBMAN_OBJS): libman.h -$(LIBMDOC_OBJS): libmdoc.h -$(LIBROFF_OBJS): libroff.h -$(LIBMANDOC_OBJS): mandoc.h mandoc_aux.h mdoc.h man.h libmandoc.h config.h -$(COMPAT_OBJS): config.h - MANDOC_HTML_OBJS = eqn_html.o \ html.o \ man_html.o \ mdoc_html.o \ tbl_html.o -$(MANDOC_HTML_OBJS): html.h MANDOC_MAN_OBJS = mdoc_man.o @@ -279,7 +256,6 @@ MANDOC_TERM_OBJS = eqn_term.o \ term_ascii.o \ term_ps.o \ tbl_term.o -$(MANDOC_TERM_OBJS): term.h MANDOC_OBJS = $(MANDOC_HTML_OBJS) \ $(MANDOC_MAN_OBJS) \ @@ -287,21 +263,14 @@ MANDOC_OBJS = $(MANDOC_HTML_OBJS) \ main.o \ out.o \ tree.o -$(MANDOC_OBJS): main.h mandoc.h mandoc_aux.h mdoc.h man.h config.h out.h MANDOCDB_OBJS = mandocdb.o manpath.o -$(MANDOCDB_OBJS): mandocdb.h mandoc.h mandoc_aux.h \ - mdoc.h man.h config.h manpath.h PRECONV_OBJS = preconv.o -$(PRECONV_OBJS): config.h APROPOS_OBJS = apropos.o apropos_db.o manpath.o -$(APROPOS_OBJS): config.h mandoc.h mandoc_aux.h manpath.h \ - apropos_db.h mandocdb.h DEMANDOC_OBJS = demandoc.o -$(DEMANDOC_OBJS): config.h mandoc.h man.h mdoc.h WWW_MANS = apropos.1.html \ demandoc.1.html \ @@ -327,8 +296,20 @@ WWW_MANS = apropos.1.html \ WWW_OBJS = mdocml.tar.gz \ mdocml.sha256 +# === DEPENDENCY HANDLING ============================================== + +all: base-build $(BUILD_TARGETS) + +base-build: $(BASEBIN) + +db-build: $(DBBIN) + +install: base-install $(INSTALL_TARGETS) + www: $(WWW_OBJS) $(WWW_MANS) +.include "Makefile.depend" + # === TARGETS CONTAINING SHELL COMMANDS ================================ clean: @@ -378,6 +359,12 @@ www-install: www $(INSTALL_DATA) mdocml.sha256 \ $(DESTDIR)$(HTDOCDIR)/snapshots/mdocml-$(VERSION).sha256 +Makefile.depend: $(SRCS) config.h Makefile + mkdep -f Makefile.depend $(CFLAGS) $(SRCS) + perl -e 'undef $$/; $$_ = <>; s|/usr/include/\S+||g; \ + s|\\\n||g; s| +| |g; print;' Makefile.depend > Makefile.tmp + mv Makefile.tmp Makefile.depend + libmandoc.a: $(COMPAT_OBJS) $(LIBMANDOC_OBJS) $(AR) rs $@ $(COMPAT_OBJS) $(LIBMANDOC_OBJS) @@ -399,9 +386,9 @@ demandoc: $(DEMANDOC_OBJS) libmandoc.a mdocml.sha256: mdocml.tar.gz sha256 mdocml.tar.gz > $@ -mdocml.tar.gz: $(SRCS) +mdocml.tar.gz: $(DISTFILES) mkdir -p .dist/mdocml-$(VERSION)/ - $(INSTALL_SOURCE) $(SRCS) .dist/mdocml-$(VERSION) + $(INSTALL_SOURCE) $(DISTFILES) .dist/mdocml-$(VERSION) chmod 755 .dist/mdocml-$(VERSION)/configure ( cd .dist/ && tar zcf ../$@ mdocml-$(VERSION) ) rm -rf .dist/ diff --git a/Makefile.depend b/Makefile.depend new file mode 100644 index 00000000..dd7fa72e --- /dev/null +++ b/Makefile.depend @@ -0,0 +1,64 @@ +apropos.o: apropos.c config.h apropos_db.h mandoc.h manpath.h +apropos_db.o: apropos_db.c config.h mandocdb.h apropos_db.h mandoc.h mandoc_aux.h +arch.o: arch.c config.h mdoc.h libmdoc.h arch.in +att.o: att.c config.h mdoc.h libmdoc.h att.in +chars.o: chars.c config.h mandoc.h mandoc_aux.h libmandoc.h chars.in +compat_fgetln.o: compat_fgetln.c config.h +compat_getsubopt.o: compat_getsubopt.c config.h +compat_reallocarray.o: compat_reallocarray.c config.h +compat_strcasestr.o: compat_strcasestr.c config.h +compat_strlcat.o: compat_strlcat.c config.h +compat_strlcpy.o: compat_strlcpy.c config.h +compat_strsep.o: compat_strsep.c config.h +demandoc.o: demandoc.c config.h man.h mdoc.h mandoc.h +eqn.o: eqn.c config.h mandoc.h mandoc_aux.h libmandoc.h libroff.h +eqn_html.o: eqn_html.c config.h mandoc.h out.h html.h +eqn_term.o: eqn_term.c config.h mandoc.h out.h term.h +html.o: html.c config.h mandoc.h mandoc_aux.h libmandoc.h out.h html.h main.h +lib.o: lib.c config.h mdoc.h libmdoc.h lib.in +main.o: main.c config.h mandoc.h mandoc_aux.h main.h mdoc.h man.h +man.o: man.c config.h man.h mandoc.h mandoc_aux.h libman.h libmandoc.h +man_hash.o: man_hash.c config.h man.h mandoc.h libman.h +man_html.o: man_html.c config.h mandoc.h mandoc_aux.h out.h html.h man.h main.h +man_macro.o: man_macro.c config.h man.h mandoc.h libmandoc.h libman.h +man_term.o: man_term.c config.h mandoc.h mandoc_aux.h out.h man.h term.h main.h +man_validate.o: man_validate.c config.h man.h mandoc.h mandoc_aux.h libman.h libmandoc.h +mandoc.o: mandoc.c config.h mandoc.h mandoc_aux.h libmandoc.h +mandoc_aux.o: mandoc_aux.c config.h mandoc.h mandoc_aux.h +mandocdb.o: mandocdb.c config.h man.h mdoc.h mandoc.h mandoc_aux.h mandocdb.h manpath.h +manpath.o: manpath.c config.h mandoc_aux.h manpath.h +mdoc.o: mdoc.c config.h mdoc.h mandoc.h mandoc_aux.h libmdoc.h libmandoc.h +mdoc_argv.o: mdoc_argv.c config.h mdoc.h mandoc.h mandoc_aux.h libmdoc.h libmandoc.h +mdoc_hash.o: mdoc_hash.c config.h mdoc.h libmdoc.h +mdoc_html.o: mdoc_html.c config.h mandoc.h mandoc_aux.h out.h html.h mdoc.h main.h +mdoc_macro.o: mdoc_macro.c config.h mdoc.h mandoc.h libmdoc.h libmandoc.h +mdoc_man.o: mdoc_man.c config.h mandoc.h mandoc_aux.h out.h man.h mdoc.h main.h +mdoc_term.o: mdoc_term.c config.h mandoc.h mandoc_aux.h out.h term.h mdoc.h main.h +mdoc_validate.o: mdoc_validate.c config.h mdoc.h mandoc.h mandoc_aux.h libmdoc.h libmandoc.h +msec.o: msec.c config.h mandoc.h libmandoc.h msec.in +out.o: out.c config.h mandoc_aux.h mandoc.h out.h +preconv.o: preconv.c config.h +read.o: read.c config.h mandoc.h mandoc_aux.h libmandoc.h mdoc.h man.h main.h +roff.o: roff.c config.h mandoc.h mandoc_aux.h libroff.h libmandoc.h predefs.in +st.o: st.c config.h mdoc.h libmdoc.h st.in +tbl.o: tbl.c config.h mandoc.h mandoc_aux.h libmandoc.h libroff.h +tbl_data.o: tbl_data.c config.h mandoc.h mandoc_aux.h libmandoc.h libroff.h +tbl_html.o: tbl_html.c config.h mandoc.h out.h html.h +tbl_layout.o: tbl_layout.c config.h mandoc.h mandoc_aux.h libmandoc.h libroff.h +tbl_opts.o: tbl_opts.c config.h mandoc.h libmandoc.h libroff.h +tbl_term.o: tbl_term.c config.h mandoc.h out.h term.h +term.o: term.c config.h mandoc.h mandoc_aux.h out.h term.h main.h +term_ascii.o: term_ascii.c config.h mandoc.h mandoc_aux.h out.h term.h main.h +term_ps.o: term_ps.c config.h mandoc.h mandoc_aux.h out.h main.h term.h +tree.o: tree.c config.h mandoc.h mdoc.h man.h main.h +vol.o: vol.c config.h mdoc.h libmdoc.h vol.in +test-betoh64.o: test-betoh64.c +test-fgetln.o: test-fgetln.c +test-getsubopt.o: test-getsubopt.c +test-mmap.o: test-mmap.c +test-reallocarray.o: test-reallocarray.c +test-strcasestr.o: test-strcasestr.c +test-strlcat.o: test-strlcat.c +test-strlcpy.o: test-strlcpy.c +test-strptime.o: test-strptime.c +test-strsep.o: test-strsep.c -- cgit v1.2.3-56-ge451