[maemo-commits] [maemo-commits] r18587 - in projects/haf/branches/gtk+/upgrade-gtk-2-14: . gdk

[From: subversion at stage.maemo.org]

Author: csaavedra
Date: 2009-06-03 16:34:58 +0300 (Wed, 03 Jun 2009)
New Revision: 18587

Modified:
   projects/haf/branches/gtk+/upgrade-gtk-2-14/ChangeLog
   projects/haf/branches/gtk+/upgrade-gtk-2-14/gdk/Makefile.am
Log:
2009-06-03  Claudio Saavedra  <csaavedra at igalia.com>

	Merge from upstream:

    2009-01-29  Claudio Saavedra  <csaavedra at igalia.com>

       Bug 569435 ?\226?\128?\147 make maintainer-clean removes non-generated sources

       * gdk/Makefile.am: Do not remove gdkprivate.h and gdkwindowimpl.h
       during make maintainer-clean, as these files are not generated.



Modified: projects/haf/branches/gtk+/upgrade-gtk-2-14/ChangeLog
===================================================================
--- projects/haf/branches/gtk+/upgrade-gtk-2-14/ChangeLog	2009-06-03 12:53:12 UTC (rev 18586)
+++ projects/haf/branches/gtk+/upgrade-gtk-2-14/ChangeLog	2009-06-03 13:34:58 UTC (rev 18587)
@@ -1,3 +1,14 @@
+2009-06-03  Claudio Saavedra  <csaavedra at igalia.com>
+
+	Merge from upstream:
+
+    2009-01-29  Claudio Saavedra  <csaavedra at igalia.com>
+
+       Bug 569435 – make maintainer-clean removes non-generated sources
+
+       * gdk/Makefile.am: Do not remove gdkprivate.h and gdkwindowimpl.h
+       during make maintainer-clean, as these files are not generated.
+
 2009-06-03  Kristian Rietveld  <kris at lanedo.com>
 
 	Fixes: NB#120404 - LOcation widget in home view doesnt respond on

Modified: projects/haf/branches/gtk+/upgrade-gtk-2-14/gdk/Makefile.am
===================================================================
--- projects/haf/branches/gtk+/upgrade-gtk-2-14/gdk/Makefile.am	2009-06-03 12:53:12 UTC (rev 18586)
+++ projects/haf/branches/gtk+/upgrade-gtk-2-14/gdk/Makefile.am	2009-06-03 13:34:58 UTC (rev 18587)
@@ -13,6 +13,7 @@
 	gdk.def 		\
 	gdkmarshalers.list	\
 	gdkmedialib.h		\
+	gdkwindowimpl.h		\
 	makeenums.pl		\
 	makefile.msc		\
 	gdk.symbols		\
@@ -97,8 +98,6 @@
 	gdkenumtypes.h
 
 gdk_built_private_headers =			\
-	gdkprivate.h				\
-	gdkwindowimpl.h				\
 	gdkalias.h
 
 gdk_c_sources =                 \