summaryrefslogtreecommitdiffstats
path: root/src/Makefile.am
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2008-06-06 12:17:58 +0000
committerLennart Poettering <lennart@poettering.net>2008-06-06 12:17:58 +0000
commit617c912e950d582c5690e558b28fa1070f9b8263 (patch)
treee0c2ef90b6fcd291f3466a2c703d07b208981d06 /src/Makefile.am
parent0cc6ddf46d77f0f8c657588b8373e1e87512d578 (diff)
unify double inclusion defines src/sound-theme-spec.h src/read-wav.h src/read-vorbis.h src/proplist.h src/mutex.h src/llist.h src/common.h
git-svn-id: file:///home/lennart/svn/public/libcanberra/trunk@52 01b60673-d06a-42c0-afdd-89cb8e0f78ac
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am18
1 files changed, 17 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 393f0b8..ea17f5d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -89,7 +89,7 @@ else
lib_LTLIBRARIES += \
libcanberra-alsa.la
-libcanberra_alsa_la_SOURCE = \
+libcanberra_alsa_la_SOURCES = \
alsa.c
libcanberra_alsa_la_CFLAGS = \
$(ALSA_CFLAGS)
@@ -99,6 +99,22 @@ libcanberra_alsa_la_LIBADD = \
endif
endif
+if HAVE_NULL
+if BUILTIN_NULL
+
+libcanberra_la_SOURCES += \
+ null.c
+
+else
+
+lib_LTLIBRARIES += \
+ libcanberra-null.la
+
+libcanberra_null_la_SOURCES = \
+ null.c
+endif
+endif
+
if BUILTIN_DSO
libcanberra_la_SOURCES += \