chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/disorder
[disorder]
/
lib
/
Makefile.am
diff --git
a/lib/Makefile.am
b/lib/Makefile.am
index c8ac6a944caf28505e9d927d5c9b0f85b2d76ed2..249bd98b79b32e45134c1fab538142655b991fca 100644
(file)
--- a/
lib/Makefile.am
+++ b/
lib/Makefile.am
@@
-1,6
+1,6
@@
#
# This file is part of DisOrder.
#
# This file is part of DisOrder.
-# Copyright (C) 2004-2010 Richard Kettlewell
+# Copyright (C) 2004-2010
, 2012, 2013
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
#
# 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
@@
-16,6
+16,8
@@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
+VPATH+=${top_srcdir}/common
+
noinst_LIBRARIES=libdisorder.a
include_HEADERS=disorder.h
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 \
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 \
authhash.c authhash.h \
basen.c basen.h \
base64.c base64.h \
@@
-42,7
+43,7
@@
libdisorder_a_SOURCES=charset.c charsetf.c charset.h \
coreaudio.c coreaudio.h \
dateparse.c dateparse.h xgetdate.c \
defs.c defs.h \
coreaudio.c coreaudio.h \
dateparse.c dateparse.h xgetdate.c \
defs.c defs.h \
- eclient.c eclient.h
\
+ eclient.c eclient.h
eclient-stubs.h
\
email.c \
eventdist.c eventdist.h \
event.c event.h \
email.c \
eventdist.c eventdist.h \
event.c event.h \
@@
-51,8
+52,9
@@
libdisorder_a_SOURCES=charset.c charsetf.c charset.h \
hash.c hash.h \
heap.h \
hex.c hex.h \
hash.c hash.h \
heap.h \
hex.c hex.h \
+ home.c home.h \
hostname.c hostname.h \
hostname.c hostname.h \
- hreader.
c hreader.h
\
+ hreader.
h
\
ifreq.c ifreq.h \
inputline.c inputline.h \
kvp.c kvp.h \
ifreq.c ifreq.h \
inputline.c inputline.h \
kvp.c kvp.h \
@@
-65,18
+67,21
@@
libdisorder_a_SOURCES=charset.c charsetf.c charset.h \
asprintf.c fprintf.c snprintf.c \
queue.c queue.h \
random.c random.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 \
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 \
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 \
speaker-protocol.c speaker-protocol.h \
split.c split.h \
strptime.c strptime.h \
- syscalls.c syscalls
.h
\
+ syscalls.c syscalls
rt.c syscalls.h
\
common.h \
table.c table.h \
timeval.h \
common.h \
table.c table.h \
timeval.h \
@@
-85,6
+90,7
@@
libdisorder_a_SOURCES=charset.c charsetf.c charset.h \
tracksort.c \
uaudio.c uaudio-thread.c uaudio.h uaudio-apis.c \
uaudio-oss.c uaudio-alsa.c \
tracksort.c \
uaudio.c uaudio-thread.c uaudio.h uaudio-apis.c \
uaudio-oss.c uaudio-alsa.c \
+ uaudio-pulseaudio.c \
uaudio-coreaudio.c \
uaudio-rtp.c uaudio-command.c uaudio-schedule.c \
url.h url.c \
uaudio-coreaudio.c \
uaudio-rtp.c uaudio-command.c uaudio-schedule.c \
url.h url.c \
@@
-95,9
+101,12
@@
libdisorder_a_SOURCES=charset.c charsetf.c charset.h \
validity.c validity.h \
vector.c vector.h \
version.c version.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
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
version-string: ../config.status ${top_srcdir}/scripts/make-version-string
CC="${CC}" ${top_srcdir}/scripts/make-version-string > $@.new
@@
-105,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
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 \
${top_srcdir}/scripts/text2c -extern disorder_version_string \
version-string > $@.new
@if cmp $@.new $@; then \
@@
-131,15
+140,18
@@
definitions.h: Makefile
@if cmp $@.new $@; then \
echo rm -f $@.new; rm -f $@.new; else \
echo mv $@.new $@; mv $@.new $@; fi
@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
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
*.gcda *.gcov *.gcno *.c.html index.html
-EXTRA_DIST=trackdb.c trackdb-stub.c client-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
~mdw / disorder / blobdiff