diff options
| author | Rob Bradford <rob@linux.intel.com> | 2011-06-16 13:33:03 +0100 |
|---|---|---|
| committer | Ross Burton <ross@linux.intel.com> | 2011-06-28 15:25:45 +0100 |
| commit | 06cf82b965216c5063994f2822cd3f152457110d (patch) | |
| tree | 316b5d98a2b37a5c2497be13e173b95cdb774802 | |
| parent | 0d45f84fb771f09a690fca28ce2d191bc05349da (diff) | |
| download | gconf-06cf82b965216c5063994f2822cd3f152457110d.tar.gz | |
build: Export ORBIT CFLAGS/LIBS
| -rw-r--r-- | backends/Makefile.am | 1 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | gconf/Makefile.am | 7 |
3 files changed, 8 insertions, 2 deletions
diff --git a/backends/Makefile.am b/backends/Makefile.am index 3c1bc3b6..e184c060 100644 --- a/backends/Makefile.am +++ b/backends/Makefile.am @@ -1,5 +1,6 @@ INCLUDES= -I$(top_srcdir) -I$(top_builddir) -I$(top_builddir)/gconf \ $(DEPENDENT_WITH_XML_CFLAGS) \ + $(DEPENDENT_ORBIT_CFLAGS) \ -DGCONF_ENABLE_INTERNALS=1 -DG_LOG_DOMAIN=\"GConf-Backends\" backenddir = $(pkglibdir)/$(MAJOR_VERSION) diff --git a/configure.in b/configure.in index c499c5e7..f72d4493 100644 --- a/configure.in +++ b/configure.in @@ -225,6 +225,8 @@ AC_SUBST(DEPENDENT_WITH_XML_AND_GTK_LIBS) AC_SUBST(DEPENDENT_WITH_XML_AND_GTK_CFLAGS) AC_SUBST([DEPENDENT_DBUS_CFLAGS]) AC_SUBST([DEPENDENT_DBUS_LIBS]) +AC_SUBST([DEPENDENT_ORBIT_CFLAGS]) +AC_SUBST([DEPENDENT_ORBIT_LIBS]) HAVE_POLKIT=no AC_ARG_ENABLE(defaults_service, diff --git a/gconf/Makefile.am b/gconf/Makefile.am index 616fa284..75586974 100644 --- a/gconf/Makefile.am +++ b/gconf/Makefile.am @@ -6,6 +6,8 @@ INCLUDES= \ -I$(top_srcdir) \ -I$(top_builddir) \ $(DEPENDENT_WITH_XML_AND_GTK_CFLAGS) \ + $(DEPENDENT_DBUS_CFLAGS) \ + $(DEPENDENT_ORBIT_CFLAGS) \ -DG_LOG_DOMAIN=\"GConf\" \ -DPREFIX=\""$(prefix)"\" \ -DGCONF_LOCALE_DIR=\""$(datadir)/locale"\" \ @@ -80,7 +82,8 @@ endif gconfd_2_CFLAGS = $(INCLUDES) $(DEPENDENT_DBUS_CFLAGS) -gconfd_2_LDADD = libgconf-$(MAJOR_VERSION).la $(EFENCE) $(INTLLIBS) $(DEPENDENT_LIBS) $(DEPENDENT_DBUS_LIBS) +gconfd_2_LDADD = libgconf-$(MAJOR_VERSION).la $(EFENCE) $(INTLLIBS) \ + $(DEPENDENT_LIBS) $(DEPENDENT_DBUS_LIBS) $(DEPENDENT_ORBIT_LIBS) gconftool_2_SOURCES = \ gconftool.c @@ -120,7 +123,7 @@ libgconf_2_la_SOURCES = \ libgconf_2_la_LDFLAGS = -version-info $(GCONF_CURRENT):$(GCONF_REVISION):$(GCONF_AGE) -no-undefined -libgconf_2_la_LIBADD = $(INTLLIBS) $(DEPENDENT_LIBS) +libgconf_2_la_LIBADD = $(INTLLIBS) $(DEPENDENT_LIBS) $(DEPENDENT_DBUS_LIBS) $(DEPENDENT_ORBIT_LIBS) -include $(INTROSPECTION_MAKEFILE) INTROSPECTION_GIRS = |