From 617c912e950d582c5690e558b28fa1070f9b8263 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 6 Jun 2008 12:17:58 +0000
Subject: 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
---
 src/Makefile.am | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'src/Makefile.am')

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 += \
-- 
cgit