From cc1d8213d6a58b0022017f8d231a346387aab507 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 26 Jul 2006 17:36:14 +0000
Subject: add new module "module-gconf" which reads configuration information
 from gconf. this will be used in my upcoming paconf module

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1150 fefdeb5f-60dc-0310-8127-8f9354f1896f
---
 src/Makefile.am | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index e0add703..bb08ed78 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,6 +25,7 @@
 pulseincludedir=$(includedir)/pulse
 pulsecoreincludedir=$(includedir)/pulsecore
 pulseconfdir=$(sysconfdir)/pulse
+pulselibexecdir=$(libexecdir)/pulse
 
 ###################################
 #            Defines              #
@@ -883,6 +884,14 @@ modlibexec_LTLIBRARIES += \
 		module-jack-source.la
 endif
 
+if HAVE_GCONF
+modlibexec_LTLIBRARIES += \
+		module-gconf.la
+
+pulselibexec_PROGRAMS = \
+		gconf-helper
+endif
+
 if OS_IS_WIN32
 modlibexec_LTLIBRARIES += \
 		module-waveout.la
@@ -930,8 +939,8 @@ SYMDEF_FILES = \
 		modules/rtp/module-rtp-recv-symdef.h \
 		modules/module-jack-sink-symdef.h \
 		modules/module-jack-source-symdef.h \
-		modules/module-volume-restore-symdef.h
-
+		modules/module-volume-restore-symdef.h \
+		modules/gconf/module-gconf-symdef.h
 
 EXTRA_DIST += $(SYMDEF_FILES)
 BUILT_SOURCES += $(SYMDEF_FILES)
@@ -1171,6 +1180,17 @@ module_jack_source_la_LDFLAGS = -module -avoid-version
 module_jack_source_la_LIBADD = $(AM_LIBADD) libpulsecore.la $(JACK_LIBS)
 module_jack_source_la_CFLAGS = $(AM_LIBADD) $(JACK_CFLAGS)
 
+# GConf support
+module_gconf_la_SOURCES = modules/gconf/module-gconf.c
+module_gconf_la_LDFLAGS = -module -avoid-version
+module_gconf_la_LIBADD = $(AM_LIBADD) libpulsecore.la
+module_gconf_la_CFLAGS = $(AM_CFLAGS) -DPA_GCONF_HELPER=\"$(pulselibexecdir)/gconf-helper\"
+
+gconf_helper_SOURCES = modules/gconf/gconf-helper.c
+gconf_helper_LDADD = $(AM_LDADD) $(GCONF_LIBS)
+gconf_helper_CFLAGS = $(AM_CFLAGS) $(GCONF_CFLAGS)
+gconf_helper_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
+
 ###################################
 #        Some minor stuff         #
 ###################################
-- 
cgit