summaryrefslogtreecommitdiffstats
path: root/src/Makefile.am
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2006-08-06 16:16:50 +0000
committerLennart Poettering <lennart@poettering.net>2006-08-06 16:16:50 +0000
commit050b73912ca0e81a5740b65745d4ba1d450a66ab (patch)
treeabd8db418eba731500fd831e8f77d5249527d6cc /src/Makefile.am
parentf74e5ef8845b7b7e5ee39b1e0dae8ca7f6113eb8 (diff)
merge HAL support from Shams E. King
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1187 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am18
1 files changed, 18 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 48211e1f..e0fae996 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -899,6 +899,12 @@ modlibexec_LTLIBRARIES += \
module-waveout.la
endif
+if HAVE_HAL
+modlibexec_LTLIBRARIES += \
+ libdbus-util.la \
+ module-hal-detect.la
+endif
+
# These are generated by a M4 script
SYMDEF_FILES = \
@@ -942,6 +948,7 @@ SYMDEF_FILES = \
modules/module-jack-sink-symdef.h \
modules/module-jack-source-symdef.h \
modules/module-volume-restore-symdef.h \
+ modules/module-hal-detect-symdef.h \
modules/gconf/module-gconf-symdef.h
EXTRA_DIST += $(SYMDEF_FILES)
@@ -1182,6 +1189,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)
+# HAL
+libdbus_util_la_SOURCES = modules/dbus-util.c modules/dbus-util.h
+libdbus_util_la_LDFLAGS = -avoid-version
+libdbus_util_la_LIBADD = $(AM_LIBADD) $(HAL_LIBS) libpulsecore.la
+libdbus_util_la_CFLAGS = $(AM_CFLAGS) $(HAL_CFLAGS)
+
+module_hal_detect_la_SOURCES = modules/module-hal-detect.c
+module_hal_detect_la_LDFLAGS = -module -avoid-version
+module_hal_detect_la_LIBADD = $(AM_LIBADD) $(HAL_LIBS) libpulsecore.la libdbus-util.la
+module_hal_detect_la_CFLAGS = $(AM_CFLAGS) $(HAL_CFLAGS)
+
# GConf support
module_gconf_la_SOURCES = modules/gconf/module-gconf.c
module_gconf_la_LDFLAGS = -module -avoid-version