[GnomeMeeting-devel-list] [PATCH] fixing dist* targets, cleaning a little lib/Makefile.am

[PUYDT Julien <julien puydt laposte net>]

Hi,

the following patch makes the dist* targets work again.

The problem is simple: if SUBDIRS has a conditional definition, then
DIST_SUBDIRS will be defined, and list each and every directory that
could appear in SUBDIRS, because even if they're not build, they must be
distributed.

Now, if those directories' Makefiles are conditionnally made in
configure, then all dist* targets will fail, because there won't be any
Makefile in there!

The solution is to always create the Makefiles.

I modified lib/Makefile.am to make it a little more readable, too.

Snark

PS: http://mail.gnu.org/archive/html/automake/2003-08/msg00038.html

diff -ur gnomemeeting-cvs-20040412.CVS/configure.in gnomemeeting-cvs-20040412.CVS.patched/configure.in
--- gnomemeeting-cvs-20040412.CVS/configure.in	2004-04-13 10:32:39.000000000 +0200
+++ gnomemeeting-cvs-20040412.CVS.patched/configure.in	2004-04-13 10:34:41.000000000 +0200
@@ -454,6 +454,8 @@
 src/gnomemeeting-config-tool
 gnomemeeting.schemas.in
 lib/Makefile
+lib/about/Makefile
+lib/druid/Makefile
 lib/widgets/Makefile
 lib/xdap/Makefile
 po/Makefile.in
@@ -461,20 +463,9 @@
 src/Makefile
 pixmaps/Makefile
 sounds/Makefile
-xdap_data/Makefile)
-
-if test x"${disable_gnome}" = xyes; then
-AC_OUTPUT(
-lib/druid/Makefile
-lib/about/Makefile)
-fi
-
-if test x"${disable_gnome}" = xno ; then
-AC_OUTPUT(
+xdap_data/Makefile
 help/Makefile
 help/C/Makefile)
-fi
-
 
 dnl ###########################################################################
 dnl Summary
diff -ur gnomemeeting-cvs-20040412.CVS/lib/Makefile.am gnomemeeting-cvs-20040412.CVS.patched/lib/Makefile.am
--- gnomemeeting-cvs-20040412.CVS/lib/Makefile.am	2004-04-07 11:37:43.000000000 +0200
+++ gnomemeeting-cvs-20040412.CVS.patched/lib/Makefile.am	2004-04-13 10:37:13.000000000 +0200
@@ -1,10 +1,11 @@
-SUBDIRS =						\
-	widgets						\
-	xdap						
+if DISABLE_GNOME
+SUBDIRS = widgets xdap about druid
+else
+SUBDIRS = widgets xdap
+endif
 
 noinst_LTLIBRARIES = libgnomemeeting.la
 
-
 libgnomemeeting_la_SOURCES =				\
 	dialog.c					\
 	dialog.h					\
@@ -28,15 +29,12 @@
 	eggtrayicon.h					\
 	eggtrayicon.c
 
-
 if DISABLE_GNOME
 libgnomemeeting_la_SOURCES += gm_conf-glib.c
-SUBDIRS += about druid
 else
 libgnomemeeting_la_SOURCES += gm_conf-gconf.c
 endif
 
-
 INCLUDES =						\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
 	-DGNOMEMEETING_IMAGES=\""$(datadir)/pixmaps"\"	\