a lot of build system updates

1 files changed, 18 insertions, 26 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index a465b44..522b4f4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,20 +1,20 @@
-# $Id$
-#
 # This file is part of libsydney.
 #
+# Copyright 2007-2008 Lennart Poettering
+#
 # libsydney is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation, either version 2.1 of the
+# License, or (at your option) any later version.
 #
 # libsydney is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
+# Lesser General Public License for more details.
 #
-# You should have received a copy of the GNU Lesser General Public License
-# along with libsydney; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# You should have received a copy of the GNU Lesser General Public
+# License along with libsydney. If not, see
+# <http://www.gnu.org/licenses/>.
 
 AM_CFLAGS = $(PTHREAD_CFLAGS)
 AM_CXXFLAGS = $(PTHREAD_CFLAGS)
@@ -22,11 +22,14 @@ AM_LIBADD = $(PTHREAD_LIBS)
 AM_LDADD = $(PTHREAD_LIBS)
 
 EXTRA_DIST = \
-	meta-name-table.gperf
+	map-file
 
 lib_LTLIBRARIES = \
 	libsydney.la
 
+include_HEADERS = \
+	sydney.h
+
 noinst_PROGRAMS = \
 	test-bufferq \
 	test-llist \
@@ -35,6 +38,7 @@ noinst_PROGRAMS = \
 #	test-asyncq
 
 libsydney_la_SOURCES = \
+	sydney.h \
 	common.c common.h \
 	malloc.c malloc.h \
 	oss.c oss.h \
@@ -45,23 +49,22 @@ libsydney_la_SOURCES = \
 	continued-fraction.c continued-fraction.h \
 	zero.c zero.h \
 	add.c add.h \
-	speex/speex_resampler.c speex/speex_resampler.h speex/arch.h \
 	resample.c resample.h \
 	interleave.c interleave.h \
 	converter.c converter.h \
 	g711.c g711.h \
 	mutex-posix.c mutex.h \
 	thread-posix.c thread.h \
-	bufferq.c buffer.h \
-	meta-name-table.h
+	bufferq.c buffer.h
 #	asyncq.c asyncq.h
 libsydney_la_LIBADD = \
 	$(AM_LIBADD) \
-	$(LIBOIL_LIBS)
+	$(LIBOIL_LIBS) \
+	$(SPEEX_LIBS)
 libsydney_la_CXXFLAGS = \
 	$(AM_CXXFLAGS) \
 	$(LIBOIL_CFLAGS) \
-	-DRANDOM_PREFIX=saspeex -DOUTSIDE_SPEEX
+	$(SPEEX_CFLAGS)
 
 test_bufferq_SOURCES = \
 	test-bufferq.c
@@ -93,12 +96,6 @@ test_pull_LDADD = \
 #	$(AM_LDADD) \
 #	libsydney.la
 
-BUILT_SOURCES = \
-	meta-name-table.h
-
-meta-name-table.h: meta-name-table.gperf Makefile
-	gperf -L ANSI-C -t -N sa_lookup_meta_name -H sa_hash_meta_name -p -C < $< | sed -e 's/{""}/{"", 0}/g' > $@
-
 fixme:
 	find -name '*.c' -exec fgrep -H -A 3 -B 3 -i FIXME \{\} \;
 
@@ -106,10 +103,5 @@ indent:
 	indent -bdfa -brf -kr -nbbo -nbc -ip0 -ppi 4 -cs -nbfde -npsl -br -brs -bap -i4 -bs -cdw -ce -npcs -hnl -cli4 -nut -ci8 < oss.c
 #	astyle --indent=spaces=4 --brackets=attach --indent-switches  --max-instatement-indent=40 --pad=oper --unpad=paren --convert-tabs --mode=c < oss.c
 
-update-speex:
-	wget -O speex/speex_resampler.h http://svn.xiph.org/trunk/speex/include/speex/speex_resampler.h
-	wget -O speex/speex_resample.c http://svn.xiph.org/trunk/speex/libspeex/resample.c
-	wget -O speex/arch.h http://svn.xiph.org/trunk/speex/libspeex/arch.h
-
 warn-export: all
 	nm test-bufferq test-llist test-sine test-pull | grep " T " | awk '{print $$3}' | sort | uniq