X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/de0ef46ee9c9089a5a787fd1cd5f27ca475fc0be..e1e3ef08ef3419f4aabcfb3f45ab49a78000cdb7:/lib/Makefile.am

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 4f7be92..249bd98 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -16,6 +16,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+VPATH+=${top_srcdir}/common
+
 noinst_LIBRARIES=libdisorder.a
 include_HEADERS=disorder.h
 
@@ -27,7 +29,6 @@ endif
 
 libdisorder_a_SOURCES=charset.c charsetf.c charset.h	\
 	addr.c addr.h					\
-	arcfour.c arcfour.h				\
 	authhash.c authhash.h				\
 	basen.c basen.h					\
 	base64.c base64.h				\
@@ -51,8 +52,9 @@ libdisorder_a_SOURCES=charset.c charsetf.c charset.h	\
 	hash.c hash.h					\
 	heap.h						\
 	hex.c hex.h					\
+	home.c home.h					\
 	hostname.c hostname.h				\
-	hreader.c hreader.h				\
+	hreader.h					\
 	ifreq.c ifreq.h					\
 	inputline.c inputline.h				\
 	kvp.c kvp.h					\
@@ -65,14 +67,17 @@ libdisorder_a_SOURCES=charset.c charsetf.c charset.h	\
 	asprintf.c fprintf.c snprintf.c			\
 	queue.c queue.h					\
 	random.c random.h				\
+	regexp.c regexp.h				\
 	regsub.c regsub.h				\
 	resample.c resample.h				\
 	rights.c queue-rights.c rights.h		\
 	rtp.h						\
+	salsa208.c salsa208.h				\
 	selection.c selection.h				\
 	sendmail.c sendmail.h				\
 	signame.c signame.h				\
 	sink.c sink.h					\
+	socketio.c socketio.h				\
 	speaker-protocol.c speaker-protocol.h		\
 	split.c split.h					\
 	strptime.c strptime.h				\
@@ -96,9 +101,12 @@ libdisorder_a_SOURCES=charset.c charsetf.c charset.h	\
 	validity.c validity.h				\
 	vector.c vector.h				\
 	version.c version.h				\
-	wav.h wav.c					\
+	versionstring.c					\
+	wav.h						\
 	wstat.c wstat.h					\
 	disorder.h
+nodist_libdisorder_a_SOURCES=hreader.c			\
+	wav.c
 
 version-string: ../config.status ${top_srcdir}/scripts/make-version-string
 	CC="${CC}" ${top_srcdir}/scripts/make-version-string > $@.new
@@ -106,7 +114,7 @@ version-string: ../config.status ${top_srcdir}/scripts/make-version-string
 		echo rm -f $@.new; rm -f $@.new; else \
 		echo mv $@.new $@; mv $@.new $@; fi
 
-versionstring.h: version-string ${top_srcdir}/scripts/text2c
+versionstring.c: version-string ${top_srcdir}/scripts/text2c
 	${top_srcdir}/scripts/text2c -extern disorder_version_string \
 		version-string > $@.new
 	@if cmp $@.new $@; then \
@@ -132,15 +140,18 @@ definitions.h: Makefile
 	@if cmp $@.new $@; then \
 		echo rm -f $@.new; rm -f $@.new; else \
 		echo mv $@.new $@; mv $@.new $@; fi
-defs.o: definitions.h versionstring.h
-defs.lo: definitions.h versionstring.h
+defs.o: definitions.h
+defs.lo: definitions.h
 
 client.o: client-stubs.c
 
 rebuild-unicode:
 	cd ${srcdir} && ${top_srcdir}/scripts/make-unidata
 
-CLEANFILES=definitions.h definitions.h.new version-string versionstring.h \
+CLEANFILES=definitions.h definitions.h.new version-string versionstring.[ch] \
 	   *.gcda *.gcov *.gcno *.c.html index.html
 
-EXTRA_DIST=trackdb.c trackdb-stub.c client-stubs.c eclient-stubs.c
+EXTRA_DIST=trackdb.c trackdb-stub.c client-stubs.c eclient-stubs.c \
+	getopt.c getopt.h getopt1.c \
+	disorder-win32.c disorder-win32.h \
+	lib.vcxproj lib.vcxproj.filters