Fix EXTRA_DIST automake warnings. (#501107)

2007-12-03  Behdad Esfahbod  <behdad@gnome.org>

        * glib/gnulib/Makefile.am: Fix EXTRA_DIST automake warnings. (#501107)

svn path=/trunk/; revision=6029

diff --git a/ChangeLog b/ChangeLog
index cd994e3fdfb433937c0965ab7d7357470ee6da98..f0576ddefe8fadc3d79321c7ec6a765d19a18185 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-03  Behdad Esfahbod  <behdad@gnome.org>
+
+       * glib/gnulib/Makefile.am: Fix EXTRA_DIST automake warnings. (#501107)
+
 2007-12-03  Hans Breuer  <hans@breuer.org>
 
        * glib/glib.symbols : added glib_gettext (in use by gio)

diff --git a/gio/ChangeLog b/gio/ChangeLog
index bfebabe782827884ef108879eae269a199b6cbfe..4eefffe5d75530cffc8d4981b5adfece1a93b530 100644 (file)
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-03  Behdad Esfahbod  <behdad@gnome.org>
+
+       * glib/gnulib/Makefile.am: Fix EXTRA_DIST automake warnings. (#501107)
+
 2007-12-03  Hans Breuer  <hans@breuer.org>
 
        [start of port to win32/msvc]

diff --git a/gio/Makefile.am b/gio/Makefile.am
index 6ba1878c0b4cb7647ecf4edc29071756273cd27e..638470acb3953c45acf0ffe38ce6c4d7fdc45519 100644 (file)
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -247,7 +247,7 @@ BUILT_SOURCES =             \
        gioenumtypes.c          \
        $(NULL)
 
-EXTRA_DIST =                   \
+EXTRA_DIST +=                  \
        gio-marshal.list        \
        gio.symbols             \
        gioenumtypes.h.template \

diff --git a/glib/gnulib/Makefile.am b/glib/gnulib/Makefile.am
index fb4ecfac84d8273d83cad5279d2f0d56803bcc1b..5f5ef06350a6f3974e9c8f386e530f63e0ef7b53 100644 (file)
--- a/glib/gnulib/Makefile.am
+++ b/glib/gnulib/Makefile.am
@@ -19,11 +19,4 @@ libgnulib_la_SOURCES =       \
        g-gnulib.h
 
 
-EXTRA_DIST = makefile.msc
-
-
-
-
-
-
-
+EXTRA_DIST += makefile.msc