[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[jmalonzo at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit eff81ec18a0a503060cdeaf7320fdd98931bea04
Author: jmalonzo at webkit.org <jmalonzo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 15 23:17:59 2009 +0000

    2009-10-15  Jan Michael Alonzo  <jmalonzo at webkit.org>
    
            Reviewed by Xan Lopez.
    
            [GTK] marshal stamp files are not cleaned after a distclean
            https://bugs.webkit.org/show_bug.cgi?id=30156
    
            Add stamp-po to CLEANFILES.
    
            * GNUmakefile.am:
    
    2009-10-15  Jan Michael Alonzo  <jmalonzo at webkit.org>
    
            Reviewed by Xan Lopez.
    
            [GTK] marshal stamp files are not cleaned after a distclean
            https://bugs.webkit.org/show_bug.cgi?id=30156
    
            Add the stamp files directly to cleanfiles. Also rearrange the
            variable declarations so we don't miss any files that need to be
            cleaned up during the clean targets.
    
            * GNUmakefile.am:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49665 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index a58a8c3..7f9f1c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2009-10-15  Jan Michael Alonzo  <jmalonzo at webkit.org>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] marshal stamp files are not cleaned after a distclean
+        https://bugs.webkit.org/show_bug.cgi?id=30156
+
+        Add the stamp files directly to cleanfiles. Also rearrange the
+        variable declarations so we don't miss any files that need to be
+        cleaned up during the clean targets.
+
+        * GNUmakefile.am:
+
 2009-10-15  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
 
         Unreviewed. Help text fix - Web Sockets default is no, not yes.
diff --git a/GNUmakefile.am b/GNUmakefile.am
index 5aca0e6..6a6eb09 100644
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -75,6 +75,10 @@ global_cflags :=
 global_cxxflags :=
 corekit_cflags :=
 corekit_cppflags :=
+BUILT_SOURCES :=
+CLEANFILES :=
+DISTCLEANFILES :=
+MAINTAINERCLEANFILES :=
 
 # CFLAGS/CXXFLAGS used by WebCore and WebKit
 #
@@ -396,9 +400,13 @@ webkitgtk_cppflags += \
 	-I$(top_builddir)/WebKit/gtk/webkit
 
 webkitgtk_cleanfiles += \
+	$(top_builddir)/stamp-webkitmarshal.cpp \
+	$(top_builddir)/stamp-webkitmarshal.h \
+	$(top_builddir)/stamp-webkitenumtypes.cpp \
+	$(top_builddir)/stamp-webkitenumtypes.h \
+	$(top_builddir)/Programs/GtkLauncher \
 	$(top_builddir)/WebKit/gtk/docs/version.xml \
 	$(top_builddir)/WebKit/gtk/docs/GNUmakefile \
-	$(top_builddir)/Programs/GtkLauncher \
 	$(top_builddir)/WebKit/gtk/webkit-1.0.pc \
 	$(top_builddir)/WebKit/gtk/webkit/webkitenumtypes.h \
 	$(top_builddir)/WebKit/gtk/webkit/webkitversion.h
@@ -406,11 +414,6 @@ webkitgtk_cleanfiles += \
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = WebKit/gtk/webkit-1.0.pc
 
-# Files that will be cleaned
-MAINTAINERCLEANFILES := $(stamp_files) $(BUILT_SOURCES) doltcompile doltlibtool
-DISTCLEANFILES := $(stamp_files) $(BUILT_SOURCES) doltcompile doltlibtool
-CLEANFILES := $(stamp_files) $(BUILT_SOURCES)
-
 if ENABLE_INTROSPECTION
 JSCORE_GIRSOURCES = $(srcdir)/WebKit/gtk/JSCore-1.0.gir # JSCore-1.0.gir is handwritten
 WEBKIT_GIRSOURCES = WebKit-1.0.gir
@@ -446,12 +449,6 @@ CLEANFILES += $(WEBKIT_GIRSOURCES) $(typelibs_DATA)
 
 endif
 
-stamp_files := \
-	stamp-webkitmarshal.cpp \
-	stamp-webkitmarshal.h \
-	stamp-webkitenumtypes.cpp \
-	stamp-webkitenumtypes.h
-
 WEBKIT_MARSHAL = $(GENSOURCES)/webkitmarshal
 WEBKIT_MARSHAL_LIST = $(top_srcdir)/WebKit/gtk/webkitmarshal.list
 
@@ -658,7 +655,7 @@ Programs_unittests_testkeyevents_LDADD = $(webkit_tests_ldadd)
 Programs_unittests_testkeyevents_LDFLAGS = $(webkit_tests_ldflags)
 
 # Autogenerated sources
-BUILT_SOURCES := \
+BUILT_SOURCES += \
 	$(javascriptcore_built_sources) \
 	$(javascriptcore_built_nosources) \
 	$(webcore_built_sources) \
@@ -667,10 +664,20 @@ BUILT_SOURCES := \
 	$(webkitgtk_built_nosources)
 
 # Project-wide clean rules
+# Files that will be cleaned
 CLEANFILES += \
+	$(BUILT_SOURCES) \
 	$(webkitgtk_cleanfiles)
 
+DISTCLEANFILES += \
+	$(CLEANFILES) \
+	$(builddir)/doltcompile \
+	$(builddir)/doltlibtool
+
 MAINTAINERCLEANFILES += \
+	$(CLEANFILES) \
+	$(builddir)/doltcompile \
+	$(builddir)/doltlibtool \
 	$(srcdir)/aconfig.h.in \
 	$(srcdir)/autotools/config.* \
 	$(srcdir)/autotools/compile \
diff --git a/WebKit/gtk/po/ChangeLog b/WebKit/gtk/po/ChangeLog
index 9bcf90b..b0c89ab 100644
--- a/WebKit/gtk/po/ChangeLog
+++ b/WebKit/gtk/po/ChangeLog
@@ -1,3 +1,14 @@
+2009-10-15  Jan Michael Alonzo  <jmalonzo at webkit.org>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] marshal stamp files are not cleaned after a distclean
+        https://bugs.webkit.org/show_bug.cgi?id=30156
+
+        Add stamp-po to CLEANFILES.
+
+        * GNUmakefile.am:
+
 2009-10-09  Rimas Kudelis  <rq at akl.lt>
 
         Rubber-stamped by Gustavo Noronha
diff --git a/WebKit/gtk/po/GNUmakefile.am b/WebKit/gtk/po/GNUmakefile.am
index b5b0c4c..42beb24 100644
--- a/WebKit/gtk/po/GNUmakefile.am
+++ b/WebKit/gtk/po/GNUmakefile.am
@@ -116,8 +116,8 @@ update-po: GNUmakefile
 	exit 1
 
 # clean rules
-stamp_files += \
-	stamp-po
+CLEANFILES += \
+	$(top_builddir)/stamp-po
 
 MAINTAINERCLEANFILES += \
 	$(MOFILES)

-- 
WebKit Debian packaging