autoconfization

git-svn-id: file:///home/lennart/svn/public/libsydney/trunk@35 9ba3c220-e4d3-45a2-8aa3-73fcc9aff6ce

3 files changed, 115 insertions, 47 deletions

diff --git a/src/Makefile b/src/Makefile
deleted file mode 100644
index bd82b1f..0000000
--- a/src/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-CFLAGS=-Wall -O0 -g -W -Wno-unused-parameter `pkg-config --cflags liboil-0.3` -DRANDOM_PREFIX=saspeex -DOUTSIDE_SPEEX -D_GNU_SOURCE -pthread
-LIBS=-lm `pkg-config --libs liboil-0.3`
-
-SOURCES=common.c malloc.c oss.c bbuffer.c format.c volscale.c byteswap.c continued-fraction.c zero.c add.c speex/resample.c resample.c interleave.c converter.c g711.c mutex.c once.c thread.c bufferq.c # asyncq.c
-OBJS=$(SOURCES:.c=.o)
-
-all: test-bufferq test-llist test-sine test-pull #test-asyncq
-
-test-bufferq: test-bufferq.o bufferq.o malloc.o #$(OBJS) 
-	$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
-
-test-llist: test-llist.o
-	$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
-
-test-sine: $(OBJS) test-sine.o
-	$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
-
-test-pull: $(OBJS) test-pull.o
-	$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
-
-test-asyncq: $(OBJS) test-asyncq.o
-	$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
-
-*.o: *.h
-
-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
-
-clean:
-	rm -f *.o meta-name-table.h test-bufferq test-llist test-sine core test-pull speex/*.o
-
-common.o: meta-name-table.h
-
-meta-name-table.h: meta-name-table.gperf Makefile
-	gperf -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 \{\} \;
-
-update-speex:
-	wget -O speex/speex_resampler.h http://svn.xiph.org/trunk/speex/include/speex/speex_resampler.h
-	wget -O 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
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..b6b57ea
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,115 @@
+# $Id$
+#
+# This file is part of libsydney.
+#
+# 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.
+#
+# 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.
+#
+# 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.
+
+AM_CFLAGS = $(PTHREAD_CFLAGS)
+AM_LIBADD = $(PTHREAD_LIBS)
+AM_LDADD = $(PTHREAD_LIBS)
+
+EXTRA_DIST = \
+	meta-name-table.gperf
+
+lib_LTLIBRARIES = \
+	libsydney.la
+
+noinst_PROGRAMS = \
+	test-bufferq \
+	test-llist \
+	test-sine \
+	test-pull
+#	test-asyncq
+
+libsydney_la_SOURCES = \
+	common.c common.h \
+	malloc.c malloc.h \
+	oss.c oss.h \
+	bbuffer.c bbuffer.h \
+	format.c fomat.h \
+	volscale.c volscale.h \
+	byteswap.c byteswap.h \
+	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.c mutex.h \
+	once.c once.h \
+	thread.c thread.h \
+	bufferq.c buffer.h \
+	meta-name-table.h
+#	asyncq.c asyncq.h
+libsydney_la_LIBADD = \
+	$(AM_LIBADD) \
+	$(LIBOIL_LIBS)
+libsydney_la_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(LIBOIL_CFLAGS) \
+	-DRANDOM_PREFIX=saspeex -DOUTSIDE_SPEEX
+
+test_bufferq_SOURCES = \
+	test-bufferq.c
+test_bufferq_LDADD = \
+	$(AM_LDADD) \
+	libsydney.la
+
+test_llist_SOURCES = \
+	test-llist.c
+test_llist_LDADD = \
+	$(AM_LDADD) \
+	libsydney.la
+
+test_sine_SOURCES = \
+	test-sine.c
+test_sine_LDADD = \
+	$(AM_LDADD) \
+	libsydney.la
+
+test_pull_SOURCES = \
+	test-pull.c
+test_pull_LDADD = \
+	$(AM_LDADD) \
+	libsydney.la
+
+#test_asyncq_SOURCES = \
+#	test-asyncq.c
+#test_asyncq_LDADD = \
+#	$(AM_LDADD) \
+#	libsydney.la
+
+BUILT_SOURCES = \
+	meta-name-table.h
+
+meta-name-table.h: meta-name-table.gperf Makefile
+	gperf -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 \{\} \;
+
+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
diff --git a/src/speex/resample.c b/src/speex/speex_resampler.c
index 1cc4d49..1cc4d49 100644
--- a/src/speex/resample.c
+++ b/src/speex/speex_resampler.c