Reviewed by Jan Alonzo.
authorkov@webkit.org <kov@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 26 Oct 2009 20:16:59 +0000 (20:16 +0000)
committerkov@webkit.org <kov@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 26 Oct 2009 20:16:59 +0000 (20:16 +0000)
Alternative solution to regression introduced in r48672.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@50089 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
GNUmakefile.am

index 281acdf..0782543 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 2009-10-26  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
 
-        Unreviewed. Fix make dist regression introduced by r48672.
+        Reviewed by Jan Alonzo.
+
+        Alternative solution to regression introduced in r48672.
 
         * GNUmakefile.am:
 
index 89260ad..0800e83 100644 (file)
@@ -74,6 +74,7 @@ global_cflags :=
 global_cxxflags :=
 corekit_cflags :=
 corekit_cppflags :=
+EXTRA_DIST :=
 BUILT_SOURCES :=
 CLEANFILES :=
 DISTCLEANFILES :=
@@ -413,24 +414,6 @@ webkitgtk_cleanfiles += \
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = WebKit/gtk/webkit-1.0.pc
 
-# Files that will be distributed
-EXTRA_DIST = \
-       $(srcdir)/gtk-doc.make \
-       WebKit/LICENSE \
-       $(javascriptcore_dist) \
-       $(webcore_dist) \
-       $(srcdir)/autotools/symbols.filter \
-       $(srcdir)/WebKit/gtk/ChangeLog \
-       $(srcdir)/WebKit/gtk/NEWS \
-       $(srcdir)/WebKit/gtk/webkitmarshal.list \
-       $(srcdir)/WebKit/gtk/docs/GNUmakefile.* \
-       $(srcdir)/WebKit/gtk/docs/webkitenvironment.xml \
-       $(srcdir)/WebKit/gtk/docs/webkitgtk-docs.sgml \
-       $(srcdir)/WebKit/gtk/docs/webkitgtk-sections.txt \
-       $(srcdir)/WebKit/gtk/docs/version.xml.in \
-       $(srcdir)/WebKit/gtk/po/* \
-       $(srcdir)/WebKit/gtk/resources/*
-
 if ENABLE_INTROSPECTION
 JSCORE_GIRSOURCES = $(srcdir)/WebKit/gtk/JSCore-1.0.gir # JSCore-1.0.gir is handwritten
 WEBKIT_GIRSOURCES = WebKit-1.0.gir
@@ -528,6 +511,24 @@ DerivedSources/webkitenumtypes.cpp: $(webkitgtk_h_api) GNUmakefile
        && cp xgen-gtc $@ \
        && rm -f xgen-gtc
 
+# Files that will be distributed
+EXTRA_DIST += \
+       $(srcdir)/gtk-doc.make \
+       WebKit/LICENSE \
+       $(javascriptcore_dist) \
+       $(webcore_dist) \
+       $(srcdir)/autotools/symbols.filter \
+       $(srcdir)/WebKit/gtk/ChangeLog \
+       $(srcdir)/WebKit/gtk/NEWS \
+       $(srcdir)/WebKit/gtk/webkitmarshal.list \
+       $(srcdir)/WebKit/gtk/docs/GNUmakefile.* \
+       $(srcdir)/WebKit/gtk/docs/webkitenvironment.xml \
+       $(srcdir)/WebKit/gtk/docs/webkitgtk-docs.sgml \
+       $(srcdir)/WebKit/gtk/docs/webkitgtk-sections.txt \
+       $(srcdir)/WebKit/gtk/docs/version.xml.in \
+       $(srcdir)/WebKit/gtk/po/* \
+       $(srcdir)/WebKit/gtk/resources/*
+
 # extra resource files
 resourcesdir = ${datadir}/webkit-1.0/resources
 dist_resources_DATA = \