X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/763d5e6ad88ef3ba1cd1d7742d060e4f1e54c6b8..74a94bd06358ca24b4a3a1acaa524c7235f38664:/lib/Makefile.am

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 145b3af..212b1ce 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,6 +1,6 @@
 #
 # This file is part of DisOrder.
-# Copyright (C) 2004, 2005, 2006 Richard Kettlewell
+# Copyright (C) 2004, 2005, 2006, s007 Richard Kettlewell
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,14 +18,11 @@
 # USA
 #
 
-lib_LTLIBRARIES=libdisorder.la
+noinst_LIBRARIES=libdisorder.a
 include_HEADERS=disorder.h
 noinst_PROGRAMS=test
 
-# This library is there to share code between the DisOrder applications,
-# not to provide an interface to anyone else.  As such there are no
-# guarantees regarding its ABI.
-libdisorder_la_SOURCES=charset.c charset.h		\
+libdisorder_a_SOURCES=charset.c charset.h		\
 	addr.c addr.h					\
 	authhash.c authhash.h				\
 	basen.c basen.h					\
@@ -52,6 +49,7 @@ libdisorder_la_SOURCES=charset.c charset.h		\
 	asprintf.c fprintf.c snprintf.c			\
 	queue.c queue.h					\
 	regsub.c regsub.h				\
+	rtp.h						\
 	selection.c selection.h				\
 	signame.c signame.h				\
 	sink.c sink.h					\
@@ -60,6 +58,7 @@ libdisorder_la_SOURCES=charset.c charset.h		\
 	syscalls.c syscalls.h				\
 	types.h						\
 	table.c table.h					\
+	timeval.h					\
 	trackname.c trackname.h				\
 	user.h user.c					\
 	utf8.h utf8.c					\
@@ -68,9 +67,6 @@ libdisorder_la_SOURCES=charset.c charset.h		\
 	words.c words.h casefold.h unicodegc.h 		\
 	wstat.c wstat.h					\
 	disorder.h
-libdisorder_la_LIBADD=$(LIBGCRYPT) $(LIBGC) $(LIBICONV) $(LIBNSL) \
-	$(LIBSOCKET) $(LIBDL) $(LIBPCRE)
-libdisorder_la_LDFLAGS=-release ${VERSION}
 
 definitions.h: Makefile
 	rm -f $@.new
@@ -78,13 +74,16 @@ definitions.h: Makefile
 	echo "#define PKGCONFDIR \"${sysconfdir}/\"PACKAGE" >> $@.new
 	echo "#define PKGSTATEDIR \"${localstatedir}/\"PACKAGE" >> $@.new
 	echo "#define PKGDATADIR \"${pkgdatadir}/\"" >> $@.new
+	echo "#define SBINDIR \"${sbindir}/\"" >> $@.new
+	echo "#define BINDIR \"${bindir}/\"" >> $@.new
+	echo "#define FINKBINDIR \"${finkbindir}/\"" >> $@.new
 	mv $@.new $@
 defs.o: definitions.h
 defs.lo: definitions.h
 
 test_SOURCES=test.c
-test_LDADD=libdisorder.la $(LIBPCRE)
-test_DEPENDENCIES=libdisorder.la
+test_LDADD=libdisorder.a $(LIBPCRE) $(LIBICONV)
+test_DEPENDENCIES=libdisorder.a
 
 check: test
 	./test