Changeset 41580 in webkit

Timestamp:

Mar 11, 2009 4:57:43 AM (15 years ago)

Author:

jmalonzo@webkit.org

Message:

2009-03-11 Jan Michael Alonzo <​jmalonzo@webkit.org>

Reviewed by Holger Freyther.

[Gtk] Fix make clean targets
​https://bugs.webkit.org/show_bug.cgi?id=24450

Fix 'make' clean targets. We shouldn't be removing DerivedSources
if it's only clean. Only remove it if it's distclean or
maintainer-clean. Also remove build-related auxillary files on
dist/maintainer clean.

• GNUmakefile.am:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• GNUmakefile.am (modified) (3 diffs)

trunk/ChangeLog

@@ +1 @@
+2009-03-11  Jan Michael Alonzo  <jmalonzo@webkit.org>
+
+        Reviewed by Holger Freyther.
+
+        [Gtk] Fix make clean targets
+        https://bugs.webkit.org/show_bug.cgi?id=24450
+
+        Fix 'make' clean targets. We shouldn't be removing DerivedSources
+        if it's only clean. Only remove it if it's distclean or
+        maintainer-clean. Also remove build-related auxillary files on
+        dist/maintainer clean.
+
+        * GNUmakefile.am:
+
 2009-03-11  Jan Michael Alonzo  <jmalonzo@webkit.org>
 

trunk/GNUmakefile.am

@@ -455 +455 @@
 
 # Files that will be cleaned
-MAINTAINERCLEANFILES := $(stamp_files) $(BUILT_SOURCES)
+MAINTAINERCLEANFILES := $(stamp_files) $(BUILT_SOURCES) doltcompile doltlibtool
 DISTCLEANFILES := $(stamp_files) $(BUILT_SOURCES) doltcompile doltlibtool
 CLEANFILES := $(stamp_files) $(BUILT_SOURCES)
@@ -503 +503 @@
 MAINTAINERCLEANFILES += \
         $(srcdir)/aconfig.h.in \
-        configure \
-        config.* \
-        GNUmakefile.in \
-        INSTALL \
-        README
+        $(srcdir)/autotools/config.* \
+        $(srcdir)/autotools/compile \
+        $(srcdir)/autotools/depcomp \
+        $(srcdir)/autotools/install-sh \
+        $(srcdir)/autotools/missing \
+        $(srcdir)/configure \
+        $(srcdir)/GNUmakefile.in \
+        $(srcdir)/INSTALL \
+        $(srcdir)/README \
+        $(top_builddir)/config.*
 
 # Older automake versions (1.7) place Plo files in a different place so we need
@@ -516 +521 @@
 # remove built sources and program directories
 clean-local:
+        -rm -rf $(GENPROGRAMS)
+
+maintainer-clean-local distclean-local:
         -rm -rf $(GENSOURCES) $(GENPROGRAMS)