[gconf] Revert "build: Ensure that generated CORBA files are deleted when disting"
- From: Rob Bradford <rbradford src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gconf] Revert "build: Ensure that generated CORBA files are deleted when disting"
- Date: Mon, 15 Aug 2011 11:22:08 +0000 (UTC)
commit 3eb4407b0f791acf8b94b9a6ecfbf6a8db61b395
Author: Rob Bradford <rob linux intel com>
Date: Mon Aug 15 12:17:49 2011 +0100
Revert "build: Ensure that generated CORBA files are deleted when disting"
This reverts commit 3385287b5e8566e9a7107410348592571db6440c.
Results in a build error if you don't have ORBIT available on your system.
gconf/Makefile.am | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/gconf/Makefile.am b/gconf/Makefile.am
index af32ec2..e872979 100644
--- a/gconf/Makefile.am
+++ b/gconf/Makefile.am
@@ -40,8 +40,10 @@ CORBA_SOURCECODE = GConfX-common.c GConfX-skels.c GConfX-stubs.c GConfX.h
BUILT_SOURCES = \
gconfmarshal.h \
- gconfmarshal.c \
- $(CORBA_SOURCECODE)
+ gconfmarshal.c
+if HAVE_CORBA
+BUILT_SOURCES += $(CORBA_SOURCECODE)
+endif
$(libgconf_2_la_OBJECTS) $(gconftool_2_OBJECTS) $(gconfd_2_OBJECTS): $(built_sourcecode)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]