From e3e2b6de89bf67778cf53e98068ce1772af6e8c1 Mon Sep 17 00:00:00 2001 From: Manish Singh Date: Tue, 27 Aug 2002 16:38:29 +0000 Subject: [PATCH] add dummy all-local rules for the !gtk-doc case, to fix problems with some 2002-08-27 Manish Singh * devel-docs/lib*/Makefile.am: add dummy all-local rules for the !gtk-doc case, to fix problems with some automake/make combos * modules/Makefile.am: use lib instead of libexec to appease automake 1.6 --- .cvsignore | 3 +++ ChangeLog | 8 ++++++++ devel-docs/libgimp/Makefile.am | 2 ++ devel-docs/libgimpbase/Makefile.am | 2 ++ devel-docs/libgimpcolor/Makefile.am | 2 ++ devel-docs/libgimpmath/Makefile.am | 2 ++ devel-docs/libgimpwidgets/Makefile.am | 2 ++ modules/Makefile.am | 4 ++-- 8 files changed, 23 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index d75b497f2a..c87a809d66 100644 --- a/.cvsignore +++ b/.cvsignore @@ -8,6 +8,9 @@ config.h config.h.in config.log config.status +config.guess +config.sub +ltmain.sh gimp.spec gimptool-1.3 gimp-1.3.pc diff --git a/ChangeLog b/ChangeLog index cfc62fe6d0..f8f0a6bde1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2002-08-27 Manish Singh + + * devel-docs/lib*/Makefile.am: add dummy all-local rules for the + !gtk-doc case, to fix problems with some automake/make combos + + * modules/Makefile.am: use lib instead of libexec to appease automake + 1.6 + 2002-08-27 Michael Natterer * app/widgets/gimppreview.[ch]: added #define for diff --git a/devel-docs/libgimp/Makefile.am b/devel-docs/libgimp/Makefile.am index 8f57dad089..5f146ba9b2 100644 --- a/devel-docs/libgimp/Makefile.am +++ b/devel-docs/libgimp/Makefile.am @@ -133,6 +133,8 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) @echo '-- Fixing Crossreferences' cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) touch html-build.stamp +else +all-local: endif ############## diff --git a/devel-docs/libgimpbase/Makefile.am b/devel-docs/libgimpbase/Makefile.am index 12ed80c6b7..40b8787a58 100644 --- a/devel-docs/libgimpbase/Makefile.am +++ b/devel-docs/libgimpbase/Makefile.am @@ -129,6 +129,8 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) @echo '-- Fixing Crossreferences' cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) touch html-build.stamp +else +all-local: endif ############## diff --git a/devel-docs/libgimpcolor/Makefile.am b/devel-docs/libgimpcolor/Makefile.am index 201110619c..83cec36a23 100644 --- a/devel-docs/libgimpcolor/Makefile.am +++ b/devel-docs/libgimpcolor/Makefile.am @@ -129,6 +129,8 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) @echo '-- Fixing Crossreferences' cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) touch html-build.stamp +else +all-local: endif ############## diff --git a/devel-docs/libgimpmath/Makefile.am b/devel-docs/libgimpmath/Makefile.am index 59fb167c5b..40458f2c00 100644 --- a/devel-docs/libgimpmath/Makefile.am +++ b/devel-docs/libgimpmath/Makefile.am @@ -129,6 +129,8 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) @echo '-- Fixing Crossreferences' cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) touch html-build.stamp +else +all-local: endif ############## diff --git a/devel-docs/libgimpwidgets/Makefile.am b/devel-docs/libgimpwidgets/Makefile.am index b94fd92563..d258d5d96d 100644 --- a/devel-docs/libgimpwidgets/Makefile.am +++ b/devel-docs/libgimpwidgets/Makefile.am @@ -141,6 +141,8 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) @echo '-- Fixing Crossreferences' cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) touch html-build.stamp +else +all-local: endif ############## diff --git a/modules/Makefile.am b/modules/Makefile.am index d014b0a0be..49cba71b19 100644 --- a/modules/Makefile.am +++ b/modules/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -libexecdir = $(gimpplugindir)/modules +libdir = $(gimpplugindir)/modules CPPFLAGS = -DMODULE_COMPILATION @@ -18,7 +18,7 @@ EXTRA_DIST = \ gimpmodregister.h \ colorsel_water.c -libexec_LTLIBRARIES = \ +lib_LTLIBRARIES = \ libcolorsel_triangle.la \ libcdisplay_gamma.la \ libcdisplay_highcontrast.la