[gedit/wip/non-recursive-make: 7/7] Do not distribute BUILT_SOURCES
- From: Jesse van den Kieboom <jessevdk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit/wip/non-recursive-make: 7/7] Do not distribute BUILT_SOURCES
- Date: Sun, 12 Jan 2014 16:58:22 +0000 (UTC)
commit 7f9a874e05648ee91bc56ba794f52dc7b4478f6c
Author: Jesse van den Kieboom <jessevdk gmail com>
Date: Sun Jan 12 17:52:40 2014 +0100
Do not distribute BUILT_SOURCES
Makefile.am | 9 ++++++++-
gedit/Makefile.am | 6 +-----
2 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 0ed17bf..65765f4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -119,7 +119,12 @@ noinst_PROGRAMS += $(TESTS)
CHANGELOG_START = GEDIT_2_26_1
-dist-hook:
+dist-hook: dist-hook-changelog dist-hook-cleanup
+
+dist-hook-cleanup:
+ cd $(distdir); rm -f $(BUILT_SOURCES)
+
+dist-hook-changelog:
@if test -d "$(srcdir)/.git"; \
then \
echo Creating ChangeLog && \
@@ -133,4 +138,6 @@ dist-hook:
echo A git clone is required to generate a ChangeLog >&2; \
fi
+.PHONY: dist-hook-cleanup dist-hook-changelog
+
-include $(top_srcdir)/git.mk
diff --git a/gedit/Makefile.am b/gedit/Makefile.am
index bd4d8f0..6dddf15 100644
--- a/gedit/Makefile.am
+++ b/gedit/Makefile.am
@@ -164,8 +164,6 @@ endif
gedit_headerdir = $(prefix)/include/gedit-$(GEDIT_API_VERSION)/gedit
gedit_header_HEADERS = $(gedit_INST_H_FILES)
-gedit_BUILT_SOURCES_PRIVATE = gedit/gedit-resources.c
-
gedit_libgedit_private_la_SOURCES = \
gedit/gedit-app-activatable.c \
gedit/gedit-view-activatable.c \
@@ -266,8 +264,6 @@ EXTRA_DIST += \
gedit/gedit.rc \
$(gedit_resource_deps)
-CLEANFILES += $(gedit_BUILT_SOURCES_PRIVATE)
-
if HAVE_INTROSPECTION
-include $(INTROSPECTION_MAKEFILE)
INTROSPECTION_GIRS = gedit/Gedit-3.0.gir
@@ -304,4 +300,4 @@ else
ln -s gedit $(DESTDIR)$(bindir)/gnome-text-editor
endif
-BUILT_SOURCES += $(gedit_built_sources)
+BUILT_SOURCES += $(gedit_built_sources) gedit/gedit-resources.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]