[maemo-commits] [maemo-commits] r11723 - in projects/haf/trunk/gtk+: . docs/tools gtk

[From: subversion at stage.maemo.org]

Author: xan
Date: 2007-05-21 12:05:41 +0300 (Mon, 21 May 2007)
New Revision: 11723

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/docs/tools/Makefile.am
   projects/haf/trunk/gtk+/gtk/Makefile.am
Log:
	2007-04-28  Matthias Clasen  <mclasen at redhat.com>

        * docs/tools/Makefile.am:
        * gtk/Makefile.am: Make make clean clean.  (#410160, Tommi
        Komulainen)


Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2007-05-21 09:05:12 UTC (rev 11722)
+++ projects/haf/trunk/gtk+/ChangeLog	2007-05-21 09:05:41 UTC (rev 11723)
@@ -1,3 +1,11 @@
+2007-05-21  Xan Lopez  <xan.lopez at nokia.com>
+
+	2007-04-28  Matthias Clasen  <mclasen at redhat.com>
+
+        * docs/tools/Makefile.am:
+        * gtk/Makefile.am: Make make clean clean.  (#410160, Tommi
+        Komulainen)
+
 2007-05-02  Matthias Clasen  <mclasen at redhat.com>
 
 	* === Released 2.10.12 ===

Modified: projects/haf/trunk/gtk+/docs/tools/Makefile.am
===================================================================
--- projects/haf/trunk/gtk+/docs/tools/Makefile.am	2007-05-21 09:05:12 UTC (rev 11722)
+++ projects/haf/trunk/gtk+/docs/tools/Makefile.am	2007-05-21 09:05:41 UTC (rev 11723)
@@ -32,4 +32,9 @@
 	widgets.h
 
 clean-local:
-	rm -f *.png
+	for file in gnome-foot.png *.png; do \
+	  case "$$file" in \
+	    gnome-foot.png|gnome-gmush.png) ;; \
+	    *) rm -f $$file ;; \
+	  esac ; \
+	done

Modified: projects/haf/trunk/gtk+/gtk/Makefile.am
===================================================================
--- projects/haf/trunk/gtk+/gtk/Makefile.am	2007-05-21 09:05:12 UTC (rev 11722)
+++ projects/haf/trunk/gtk+/gtk/Makefile.am	2007-05-21 09:05:41 UTC (rev 11723)
@@ -709,7 +709,7 @@
 #
 # setup GTK+ sources and their dependencies
 #
-MAINTAINERCLEANFILES = $(gtk_built_sources) $(stamp_files)
+MAINTAINERCLEANFILES = $(gtk_built_sources) $(stamp_files) $(GENERATED_ICONS)
 EXTRA_HEADERS =
 EXTRA_DIST = $(gtk_private_h_sources) $(gtk_extra_sources)
 EXTRA_DIST += $(gtk_built_sources)