fix build system for TOC files

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10522 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/doc/ChangeLog b/lib/doc/ChangeLog
index 5a07644f90331b2cb1fc3cd5fd53db35bd806af9..3015b5b364b942a9ef3d7005732bd58f44cfc997 100644 (file)
--- a/lib/doc/ChangeLog
+++ b/lib/doc/ChangeLog
@@ -1,3 +1,11 @@
+2005-10-03  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
+
+       * depend.py, Makefile.am: Don't use TOCs both as variable name and
+       target, because automake 1.6 complains
+       * depend.py: Don't hardcode current srcdir and builddir, use variables
+       * Makefile.am: Use install and dist hooks for TOCs because they don't
+       get built otherwise
+
 2005-09-28  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
 
        * doc_toc.py: make it work again with builddir == srcdir

diff --git a/lib/doc/Makefile.am b/lib/doc/Makefile.am
index cff57aee81527648a54ccd360d4a1767b69916de..c35be2eae2bd92b39b8c9e36127738f6e4f5e2a1 100644 (file)
--- a/lib/doc/Makefile.am
+++ b/lib/doc/Makefile.am
@@ -1,10 +1,10 @@
 include $(top_srcdir)/config/common.am
 
-DISTCLEANFILES += LyXConfig.lyx LaTeXConfig.lyx $(TOCs)
+DISTCLEANFILES += LyXConfig.lyx LaTeXConfig.lyx $(tocfiles)
 
 EXTRA_DIST = depend.py doc_toc.py LyXConfig.lyx.in README.Documentation $(DEPENDFILE) $(docfiles)
 
-docfiles = $(TOCs) \
+docfiles = \
        cs_Tutorial.lyx \
        Customization.lyx \
        da_Intro.lyx \
@@ -70,18 +70,32 @@ doc_DATA = \
        $(docfiles) \
        LaTeXConfig.lyx
 
-DEPENDFILE = Makefile.depend
-include $(DEPENDFILE)
+DEPENDFILE = $(srcdir)/Makefile.depend
+# include $(DEPENDFILE) does not work because automake is too limited.
+include $(srcdir)/Makefile.depend
 
-TOCs : $(DEPENDFILE) $(TOCs)
+TOCs : $(DEPENDFILE) $(tocfiles)
        @echo Made TOCs succesfully.
 
 # Force regeneration of $(DEPENDFILE) when Makefile.am changes because
 # new doc files might have been added
-$(DEPENDFILE): Makefile.am
+$(DEPENDFILE): $(srcdir)/Makefile.am $(srcdir)/depend.py
        python $(srcdir)/depend.py > $(DEPENDFILE)
 
-# Force generation of the TOC files for 'make dist'
-distdir: TOCs
+# The TOCs are not built for the install and dist targets if they don't exist
+# for some weird reason.
+# Make complains although we have rules for them in $(DEPENDFILE), so we
+# must not include the TOCs in $(docfiles) and have to use the install and
+# dist hooks below.
+dist-hook: $(tocfiles)
+       for i in $(tocfiles); \
+       do \
+               cp -p "$$i" "$(distdir)"; \
+       done
+install-data-hook: $(tocfiles)
+       for i in $(tocfiles); \
+       do \
+               $(docDATA_INSTALL) "$$i" "$(DESTDIR)$(docdir)/$$i"; \
+       done
 
 .PHONY: TOCs

diff --git a/lib/doc/Makefile.depend b/lib/doc/Makefile.depend
index 1d70fa0d3f25b73e3c3a34c323818f5b651921a1..535eb2cc8eb67a1a6e417df7837b488a1496842e 100644 (file)
--- a/lib/doc/Makefile.depend
+++ b/lib/doc/Makefile.depend
@@ -4,61 +4,61 @@
 # First come the rules for each xx_TOC.lyx file. Then comes the
 # TOCs target, which prints all the TOC files.
 
-TOC.lyx: Intro.lyx FAQ.lyx Tutorial.lyx UserGuide.lyx Extended.lyx Customization.lyx
-       python doc_toc.py
+TOC.lyx: $(srcdir)/Intro.lyx $(srcdir)/FAQ.lyx $(srcdir)/Tutorial.lyx $(srcdir)/UserGuide.lyx $(srcdir)/Extended.lyx $(srcdir)/Customization.lyx
+       python $(srcdir)/doc_toc.py
 
-cs_TOC.lyx: cs_Tutorial.lyx
-       python doc_toc.py cs
+cs_TOC.lyx: $(srcdir)/cs_Tutorial.lyx
+       python $(srcdir)/doc_toc.py cs
 
-da_TOC.lyx: da_Intro.lyx
-       python doc_toc.py da
+da_TOC.lyx: $(srcdir)/da_Intro.lyx
+       python $(srcdir)/doc_toc.py da
 
-de_TOC.lyx: de_Extended.lyx de_UserGuide.lyx de_Intro.lyx de_FAQ.lyx de_Customization.lyx de_Tutorial.lyx
-       python doc_toc.py de
+de_TOC.lyx: $(srcdir)/de_Extended.lyx $(srcdir)/de_UserGuide.lyx $(srcdir)/de_Intro.lyx $(srcdir)/de_FAQ.lyx $(srcdir)/de_Customization.lyx $(srcdir)/de_Tutorial.lyx
+       python $(srcdir)/doc_toc.py de
 
-es_TOC.lyx: es_Tutorial.lyx es_Intro.lyx
-       python doc_toc.py es
+es_TOC.lyx: $(srcdir)/es_Tutorial.lyx $(srcdir)/es_Intro.lyx
+       python $(srcdir)/doc_toc.py es
 
-eu_TOC.lyx: eu_Extended.lyx eu_FAQ.lyx eu_Intro.lyx eu_Customization.lyx eu_UserGuide.lyx eu_Tutorial.lyx
-       python doc_toc.py eu
+eu_TOC.lyx: $(srcdir)/eu_Extended.lyx $(srcdir)/eu_FAQ.lyx $(srcdir)/eu_Intro.lyx $(srcdir)/eu_Customization.lyx $(srcdir)/eu_UserGuide.lyx $(srcdir)/eu_Tutorial.lyx
+       python $(srcdir)/doc_toc.py eu
 
-fr_TOC.lyx: fr_Customization.lyx fr_Intro.lyx fr_UserGuide.lyx fr_FAQ.lyx fr_Tutorial.lyx fr_Extended.lyx
-       python doc_toc.py fr
+fr_TOC.lyx: $(srcdir)/fr_Customization.lyx $(srcdir)/fr_Intro.lyx $(srcdir)/fr_UserGuide.lyx $(srcdir)/fr_FAQ.lyx $(srcdir)/fr_Tutorial.lyx $(srcdir)/fr_Extended.lyx
+       python $(srcdir)/doc_toc.py fr
 
-he_TOC.lyx: he_Tutorial.lyx he_Intro.lyx
-       python doc_toc.py he
+he_TOC.lyx: $(srcdir)/he_Tutorial.lyx $(srcdir)/he_Intro.lyx
+       python $(srcdir)/doc_toc.py he
 
-hu_TOC.lyx: hu_Intro.lyx
-       python doc_toc.py hu
+hu_TOC.lyx: $(srcdir)/hu_Intro.lyx
+       python $(srcdir)/doc_toc.py hu
 
-it_TOC.lyx: it_UserGuide.lyx it_Customization.lyx it_Tutorial.lyx it_Intro.lyx
-       python doc_toc.py it
+it_TOC.lyx: $(srcdir)/it_UserGuide.lyx $(srcdir)/it_Customization.lyx $(srcdir)/it_Tutorial.lyx $(srcdir)/it_Intro.lyx
+       python $(srcdir)/doc_toc.py it
 
-nl_TOC.lyx: nl_Intro.lyx nl_Tutorial.lyx
-       python doc_toc.py nl
+nl_TOC.lyx: $(srcdir)/nl_Intro.lyx $(srcdir)/nl_Tutorial.lyx
+       python $(srcdir)/doc_toc.py nl
 
-no_TOC.lyx: no_Intro.lyx
-       python doc_toc.py no
+no_TOC.lyx: $(srcdir)/no_Intro.lyx
+       python $(srcdir)/doc_toc.py no
 
-pl_TOC.lyx: pl_Extended.lyx pl_Intro.lyx pl_Tutorial.lyx
-       python doc_toc.py pl
+pl_TOC.lyx: $(srcdir)/pl_Extended.lyx $(srcdir)/pl_Intro.lyx $(srcdir)/pl_Tutorial.lyx
+       python $(srcdir)/doc_toc.py pl
 
-pt_TOC.lyx: pt_Intro.lyx pt_Tutorial.lyx
-       python doc_toc.py pt
+pt_TOC.lyx: $(srcdir)/pt_Intro.lyx $(srcdir)/pt_Tutorial.lyx
+       python $(srcdir)/doc_toc.py pt
 
-ro_TOC.lyx: ro_Intro.lyx
-       python doc_toc.py ro
+ro_TOC.lyx: $(srcdir)/ro_Intro.lyx
+       python $(srcdir)/doc_toc.py ro
 
-ru_TOC.lyx: ru_Intro.lyx ru_FAQ.lyx ru_Tutorial.lyx
-       python doc_toc.py ru
+ru_TOC.lyx: $(srcdir)/ru_Intro.lyx $(srcdir)/ru_FAQ.lyx $(srcdir)/ru_Tutorial.lyx
+       python $(srcdir)/doc_toc.py ru
 
-sk_TOC.lyx: sk_Tutorial.lyx sk_UserGuide.lyx
-       python doc_toc.py sk
+sk_TOC.lyx: $(srcdir)/sk_Tutorial.lyx $(srcdir)/sk_UserGuide.lyx
+       python $(srcdir)/doc_toc.py sk
 
-sl_TOC.lyx: sl_Tutorial.lyx sl_Intro.lyx
-       python doc_toc.py sl
+sl_TOC.lyx: $(srcdir)/sl_Tutorial.lyx $(srcdir)/sl_Intro.lyx
+       python $(srcdir)/doc_toc.py sl
 
-sv_TOC.lyx: sv_Tutorial.lyx sv_Intro.lyx
-       python doc_toc.py sv
+sv_TOC.lyx: $(srcdir)/sv_Tutorial.lyx $(srcdir)/sv_Intro.lyx
+       python $(srcdir)/doc_toc.py sv
 
-TOCs = TOC.lyx cs_TOC.lyx da_TOC.lyx de_TOC.lyx es_TOC.lyx eu_TOC.lyx fr_TOC.lyx he_TOC.lyx hu_TOC.lyx it_TOC.lyx nl_TOC.lyx no_TOC.lyx pl_TOC.lyx pt_TOC.lyx ro_TOC.lyx ru_TOC.lyx sk_TOC.lyx sl_TOC.lyx sv_TOC.lyx
+tocfiles = TOC.lyx cs_TOC.lyx da_TOC.lyx de_TOC.lyx es_TOC.lyx eu_TOC.lyx fr_TOC.lyx he_TOC.lyx hu_TOC.lyx it_TOC.lyx nl_TOC.lyx no_TOC.lyx pl_TOC.lyx pt_TOC.lyx ro_TOC.lyx ru_TOC.lyx sk_TOC.lyx sl_TOC.lyx sv_TOC.lyx

diff --git a/lib/doc/depend.py b/lib/doc/depend.py
index d3b33400833546972c98fc212899e3ec9ad43646..f8e02758aac9e099cfaa649e262cc0bbfe704619 100644 (file)
--- a/lib/doc/depend.py
+++ b/lib/doc/depend.py
@@ -48,13 +48,14 @@ def main(argv):
 #
 # First come the rules for each xx_TOC.lyx file. Then comes the
 # TOCs target, which prints all the TOC files.
-""" % argv[0]
+""" % os.path.basename(argv[0])
 
     # What are the languages available? And its documents?
     languages = {}
     srcdir = os.path.dirname(argv[0])
     for file in glob(srcdir + '/*'):
-        lang = lang_pattern.match(os.path.basename(file))
+        file = os.path.basename(file)
+        lang = lang_pattern.match(file)
         if lang:
             if lang.group(1) not in languages:
                 languages[lang.group(1)] = [file]
@@ -66,8 +67,8 @@ def main(argv):
     langs.sort()
 
     # The default language is english and doesn't need any prefix
-    print 'TOC.lyx:', ('.lyx ' + srcdir + '/').join(possible_documents) + '.lyx'
-    print '\tpython %s/doc_toc.py' % srcdir
+    print 'TOC.lyx: $(srcdir)/' + '.lyx $(srcdir)/'.join(possible_documents) + '.lyx'
+    print '\tpython $(srcdir)/doc_toc.py'
     print
     tocs = ['TOC.lyx']
 
@@ -78,15 +79,13 @@ def main(argv):
 
         if toc_name in languages[lang]:
             languages[lang].remove(toc_name)
-        if srcdir + '/' + toc_name in languages[lang]:
-            languages[lang].remove(srcdir + '/' + toc_name)
 
-        print toc_name + ':', ' '.join(languages[lang])
-        print '\tpython %s/doc_toc.py %s' % (srcdir, lang)
+        print toc_name + ': $(srcdir)/' + ' $(srcdir)/'.join(languages[lang])
+        print '\tpython $(srcdir)/doc_toc.py %s' % lang
         print
 
     # Write meta-rule to call all the other rules
-    print 'TOCs =', ' '.join(tocs)
+    print 'tocfiles =', ' '.join(tocs)
 
 
 if __name__ == "__main__":