Re: [gthumb-list] GNU Makefile Conventions

["Ronald F. Guilmette" <rfg tristatelogic com>]

In message <4FAE13BB 9020007 libero it>, Paolo wrote:

> I added many files to MAINTAINERCLEANFILES to automatically generate a 
> complete .gitignore file, it is possible that some of those files should 
> be added to some other variable,

I don't know anything about that.

> also it is important to check whether 
> 'make dist-clean' correctly deletes all the generated files as well.

My intuition tells me that every file that is needed in order to be able
to do ./configure after doing make maintainer-clean should indeed be part
of the distribution sources (and thus should not be removed by dist-clean).
But by all means, please do satisfy yourself that this is inded the case.

> please re-send the patch using 'diff -ur', it's not clear to me what the 
> changes are using this output format.

OK.  Sorry.  Back in the good old daze we always used diff -rc2, but I gather
that this is no longer the fashion.

Please note that the plus signs in the leftmost column in the following
patches are a bit confusing/misleading, because I didn't actually add
anything.  The lines in question were just changed by removing the trailing
backslashes at the end of those lines.  (That was necessary because now,
those specific lines are at the ends of certain multi-line definitions
of certain Makefile variables.)


diff -ur src/gthumb-2.14.3/Makefile.am build/gthumb-2.14.3/Makefile.am
--- src/gthumb-2.14.3/Makefile.am       2011-10-17 01:50:17.000000000 -0700
+++ build/gthumb-2.14.3/Makefile.am     2012-05-09 19:22:42.000000000 -0700
@@ -17,21 +17,11 @@
        po/.intltool-merge-cache        \
        intltool-extract                \
        intltool-merge                  \
-       intltool-update                 \
-       gnome-doc-utils.make
+       intltool-update
 
 MAINTAINERCLEANFILES =                         \
-       $(srcdir)/INSTALL               \
-       $(srcdir)/aclocal.m4            \
        $(srcdir)/autoscan.log          \
-       $(srcdir)/compile               \
-       $(srcdir)/config.guess          \
-       $(srcdir)/config.h.in           \
-       $(srcdir)/config.sub            \
        $(srcdir)/configure.scan        \
-       $(srcdir)/depcomp               \
-       $(srcdir)/install-sh            \
-       $(srcdir)/ltmain.sh             \
        $(srcdir)/m4/gnome-doc-utils.m4 \
        $(srcdir)/m4/intltool.m4        \
        $(srcdir)/m4/libtool.m4         \
@@ -39,13 +29,9 @@
        $(srcdir)/m4/ltoptions.m4       \
        $(srcdir)/m4/ltsugar.m4         \
        $(srcdir)/m4/ltversion.m4       \
-       $(srcdir)/missing               \
-       $(srcdir)/mkinstalldirs         \
        $(srcdir)/omf.make              \
        $(srcdir)/xmldocs.make          \
-       $(srcdir)/gtk-doc.make          \
-       $(srcdir)/ChangeLog             \
-       `find "$(srcdir)" -type f -name Makefile.in -print`
+       $(srcdir)/gtk-doc.make
 
 GITIGNOREFILES = build .autotools .cdt* .cproject .project .settings/
 
diff -ur src/gthumb-2.14.3/Makefile.in build/gthumb-2.14.3/Makefile.in
--- src/gthumb-2.14.3/Makefile.in       2012-04-25 13:06:42.916888000 -0700
+++ build/gthumb-2.14.3/Makefile.in     2012-05-09 19:22:42.000000000 -0700
@@ -336,21 +336,11 @@
        po/.intltool-merge-cache        \
        intltool-extract                \
        intltool-merge                  \
-       intltool-update                 \
-       gnome-doc-utils.make
+       intltool-update
 
 MAINTAINERCLEANFILES = \
-       $(srcdir)/INSTALL               \
-       $(srcdir)/aclocal.m4            \
        $(srcdir)/autoscan.log          \
-       $(srcdir)/compile               \
-       $(srcdir)/config.guess          \
-       $(srcdir)/config.h.in           \
-       $(srcdir)/config.sub            \
        $(srcdir)/configure.scan        \
-       $(srcdir)/depcomp               \
-       $(srcdir)/install-sh            \
-       $(srcdir)/ltmain.sh             \
        $(srcdir)/m4/gnome-doc-utils.m4 \
        $(srcdir)/m4/intltool.m4        \
        $(srcdir)/m4/libtool.m4         \
@@ -358,13 +348,9 @@
        $(srcdir)/m4/ltoptions.m4       \
        $(srcdir)/m4/ltsugar.m4         \
        $(srcdir)/m4/ltversion.m4       \
-       $(srcdir)/missing               \
-       $(srcdir)/mkinstalldirs         \
        $(srcdir)/omf.make              \
        $(srcdir)/xmldocs.make          \
-       $(srcdir)/gtk-doc.make          \
-       $(srcdir)/ChangeLog             \
-       `find "$(srcdir)" -type f -name Makefile.in -print`
+       $(srcdir)/gtk-doc.make
 
 GITIGNOREFILES = build .autotools .cdt* .cproject .project .settings/
 CLEANFILES = ChangeLog
diff -ur src/gthumb-2.14.3/po/Makefile.in.in build/gthumb-2.14.3/po/Makefile.in.in
--- src/gthumb-2.14.3/po/Makefile.in.in 2012-03-01 02:03:27.000000000 -0800
+++ build/gthumb-2.14.3/po/Makefile.in.in       2012-05-09 19:22:42.000000000 -0700
@@ -166,7 +166,6 @@
 maintainer-clean: distclean
        @echo "This command is intended for maintainers to use;"
        @echo "it deletes files that may require special tools to rebuild."
-       rm -f Makefile.in.in
 
 distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
 dist distdir: $(DISTFILES)