make dependency handling work for subdirs

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 2eeeb79aeb0ee3926e32cf05818247a8423f453e..a84e34ca51eb26ec8d0412c8c1cb50363e0df188 100644 (file)
--- 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 3864ad8fe976733c549b9373e2e4cea5322119ca..ce796c70bda7086cd45369931c91c10d84a5c9fc 100644 (file)
--- 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 883e14477b7fb9d15ddb63cdc48721dacc7c45fd..e62d7953a081ea72402777cf3c452f548e28687a 100644 (file)
--- 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