~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mdw/gstdecode'
[disorder]
/
lib
/
Makefile.am
diff --git
a/lib/Makefile.am
b/lib/Makefile.am
index
c8ac6a9
..
9d0ff9b
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
@@
-42,7
+42,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 \
@@
-73,10
+73,11
@@
libdisorder_a_SOURCES=charset.c charsetf.c charset.h \
sendmail.c sendmail.h \
signame.c signame.h \
sink.c sink.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
+86,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,6
+97,7
@@
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 \
+ versionstring.c \
wav.h wav.c \
wstat.c wstat.h \
disorder.h
wav.h wav.c \
wstat.c wstat.h \
disorder.h
@@
-105,7
+108,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,8
+134,8
@@
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
client.o: client-stubs.c
@@
-142,4
+145,7
@@
rebuild-unicode:
CLEANFILES=definitions.h definitions.h.new version-string versionstring.h \
*.gcda *.gcov *.gcno *.c.html index.html
CLEANFILES=definitions.h definitions.h.new version-string versionstring.h \
*.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