[gedit] Do not muck around with BUILT_SOURCES in gsettings.m4
- From: Jesse van den Kieboom <jessevdk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit] Do not muck around with BUILT_SOURCES in gsettings.m4
- Date: Mon, 13 Jan 2014 11:44:44 +0000 (UTC)
commit 4f6a872d36955ded7966401701d45a91a1b0d834
Author: Jesse van den Kieboom <jessevdk gmail com>
Date: Mon Jan 13 12:42:02 2014 +0100
Do not muck around with BUILT_SOURCES in gsettings.m4
Makefile.am | 4 ++--
m4/gsettings.m4 | 6 ------
2 files changed, 2 insertions(+), 8 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 3665f2e..9baf824 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -102,8 +102,8 @@ include gedit/Makefile.am
@GSETTINGS_RULES@
-CLEANFILES += $(gsettings_SCHEMAS) $(BUILT_SOURCES)
-DISTCLEANFILES += $(gsettings_SCHEMAS) $(BUILT_SOURCES)
+CLEANFILES += $(gsettings_SCHEMAS) $(gsettings_ENUMS) $(BUILT_SOURCES)
+DISTCLEANFILES += $(gsettings_SCHEMAS) $(gsettings_ENUMS) $(BUILT_SOURCES)
MAINTAINERCLEANFILES += $(gsettings_SCHEMAS:.xml=.valid)
noinst_PROGRAMS += $(TESTS)
diff --git a/m4/gsettings.m4 b/m4/gsettings.m4
index 8147486..e633ef6 100644
--- a/m4/gsettings.m4
+++ b/m4/gsettings.m4
@@ -77,12 +77,6 @@ endif
ifdef gsettings_ENUMS
$(gsettings_ENUMS):
$(AM_V_GEN) glib-mkenums --comments '\''<!-- @comment@ -->'\'' --fhead "<schemalist>" --vhead "
<@type@ id='\''$(patsubst %.enums.xml,%,$(notdir $[ ])) EnumName@'\''>" --vprod " <value
nick='\''@valuenick@'\'' value='\''@valuenum@'\''/>" --vtail " </@type@>" --ftail "</schemalist>" [$]^ > [$]
tmp && mv [$] tmp [$]@
-
-ifdef BUILT_SOURCES
-BUILT_SOURCES += $(gsettings_ENUMS)
-else
-BUILT_SOURCES = $(gsettings_ENUMS)
-endif
endif
'
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]