summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Bradford <rob@linux.intel.com>2011-08-15 12:17:49 +0100
committerRob Bradford <rob@linux.intel.com>2011-08-15 12:17:49 +0100
commit3eb4407b0f791acf8b94b9a6ecfbf6a8db61b395 (patch)
treec32e1d6e50e6c6e75571176401aa90502326dd74
parenta77254e76818c2ebf0e5c043220ac2ba9366f981 (diff)
downloadgconf-3eb4407b0f791acf8b94b9a6ecfbf6a8db61b395.tar.gz
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.
-rw-r--r--gconf/Makefile.am6
1 files changed, 4 insertions, 2 deletions
diff --git a/gconf/Makefile.am b/gconf/Makefile.am
index af32ec2d..e872979f 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)