From cb5e78da65d94d1329dbff5598c3490e3deac075 Mon Sep 17 00:00:00 2001 From: Frank Mori Hess Date: Wed, 3 Dec 2003 02:43:47 +0000 Subject: [PATCH] make dependency handling work for subdirs --- doc/Makefile.am | 12 +++++++++--- doc/html/Makefile.am | 2 +- doc/man/Makefile.am | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index 2eeeb79..a84e34c 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,9 +1,9 @@ -SUBDIRS = html man +SUBDIRS = . html man SGML= drivers.sgml funcref.sgml glossary.sgml \ install.sgml intro.sgml other.sgml reference.sgml tutorial.sgml \ - driverwriting.sgml + driverwriting.sgml BUILT_SOURCES = funcref.sgml drivers.sgml @@ -12,7 +12,7 @@ EXTRA_DIST=$(SGML) comedilib.sgml funcref mkref drivers.txt mkdr if HAVE_DOCBOOK2PDF pkgdata_DATA = comedilib.pdf else -pkgdata_DATA = +pkgdata_DATA = endif CLEANFILES = comedilib.pdf @@ -26,6 +26,11 @@ funcref.sgml: funcref mkref drivers.sgml: drivers.txt mkdr $(srcdir)/mkdr drivers.txt >drivers.sgml +#touch comedilib.sgml if any of the source files have changed, +# so subdirs know they need to regenerate files +comedilib.sgml: $(SGML) + touch $(srcdir)/comedilib.sgml + locales = de messages: .phony @@ -36,3 +41,4 @@ messages: .phony msgfmt $$i.po -o locale/$$i/LC_MESSAGES/comedilib.mo; \ done + diff --git a/doc/html/Makefile.am b/doc/html/Makefile.am index 3864ad8..ce796c7 100644 --- a/doc/html/Makefile.am +++ b/doc/html/Makefile.am @@ -13,7 +13,7 @@ endif all-local: $(all_html) -dummy: $(srcdir)/../comedilib.sgml $(SGML) +dummy: $(srcdir)/../comedilib.sgml $(DOCBOOK2HTML) $(srcdir)/../comedilib.sgml touch $(srcdir)/dummy diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am index 883e144..e62d795 100644 --- a/doc/man/Makefile.am +++ b/doc/man/Makefile.am @@ -11,7 +11,7 @@ endif all-local: $(all_man) -dummy: $(srcdir)/../comedilib.sgml $(SGML) +dummy: $(srcdir)/../comedilib.sgml $(DOCBOOK2MAN) $(srcdir)/../comedilib.sgml touch $(srcdir)/dummy -- 2.26.2