summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaudio Saavedra <csaavedra@igalia.com>2009-01-29 07:41:04 +0000
committerClaudio Saavedra <csaavedra@src.gnome.org>2009-01-29 07:41:04 +0000
commit90e88b44f886ee6d5c39c8cc5f876250701e4f4a (patch)
tree44751946a2e2e94da2ea4fb1b00372e9ff7e10d5
parent701a975cb2a2e9013a52960bfbe5f89573e5d32e (diff)
downloadgtk+-90e88b44f886ee6d5c39c8cc5f876250701e4f4a.tar.gz
Merged from trunk:
2009-01-29 Claudio Saavedra <csaavedra@igalia.com> Merged from trunk: 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. svn path=/branches/gtk-2-14/; revision=22249
-rw-r--r--ChangeLog9
-rw-r--r--gdk/Makefile.am3
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0ca4fb9e62..9e57fd871e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-01-29 Claudio Saavedra <csaavedra@igalia.com>
+
+ Merged from trunk:
+
+ 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-01-26 Claudio Saavedra <csaavedra@igalia.com>
Merged from trunk:
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 500c95064b..cc0ae0da04 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -13,6 +13,7 @@ EXTRA_DIST += \
gdk.def \
gdkmarshalers.list \
gdkmedialib.h \
+ gdkwindowimpl.h \
makeenums.pl \
makefile.msc \
gdk.symbols \
@@ -97,8 +98,6 @@ gdk_built_public_sources = \
gdkenumtypes.h
gdk_built_private_headers = \
- gdkprivate.h \
- gdkwindowimpl.h \
gdkalias.h
gdk_c_sources = \