[gconf/port-to-dbus: 20/23] Fix make dist
- From: Ross Burton <rburton src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gconf/port-to-dbus: 20/23] Fix make dist
- Date: Tue, 28 Jun 2011 14:29:14 +0000 (UTC)
commit 47f4a8c7c9589ce98da2dffb49b862484b298e5b
Author: Ross Burton <ross linux intel com>
Date: Tue Jun 21 17:57:38 2011 +0100
Fix make dist
gconf/Makefile.am | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/gconf/Makefile.am b/gconf/Makefile.am
index 821e768..7240d12 100644
--- a/gconf/Makefile.am
+++ b/gconf/Makefile.am
@@ -36,14 +36,15 @@ lib_LTLIBRARIES = libgconf-2.la
bin_PROGRAMS = gconftool-2
libexec_PROGRAMS = gconfd-2 $(SANITY_CHECK)
-if HAVE_CORBA
CORBA_SOURCECODE = GConfX-common.c GConfX-skels.c GConfX-stubs.c GConfX.h
-endif
BUILT_SOURCES = \
- $(CORBA_SOURCECODE) \
gconfmarshal.h \
gconfmarshal.c
+if HAVE_CORBA
+BUILT_SOURCES += $(CORBA_SOURCECODE)
+endif
+
$(libgconf_2_la_OBJECTS) $(gconftool_2_OBJECTS) $(gconfd_2_OBJECTS): $(built_sourcecode)
@@ -127,9 +128,12 @@ libgconf_2_la_SOURCES = \
gconf.c \
gconf-client.c \
gconf-enum-types.c \
- $(CORBA_SOURCECODE) \
$(WIN32_SOURCECODE)
+if HAVE_CORBA
+libgconf_2_la_SOURCES += $(CORBA_SOURCECODE)
+endif
+
if HAVE_DBUS
libgconf_2_la_SOURCES += \
gconf-dbus.c \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]