~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build fix for linux
[disorder]
/
server
/
Makefile.am
diff --git
a/server/Makefile.am
b/server/Makefile.am
index
e63f6aa
..
e3a1a0a
100644
(file)
--- a/
server/Makefile.am
+++ b/
server/Makefile.am
@@
-19,7
+19,8
@@
#
sbin_PROGRAMS=disorderd disorder-deadlock disorder-rescan disorder-dump \
#
sbin_PROGRAMS=disorderd disorder-deadlock disorder-rescan disorder-dump \
- disorder-speaker disorder-decode disorder-normalize
+ disorder-speaker disorder-decode disorder-normalize \
+ disorder-stats
noinst_PROGRAMS=disorder.cgi trackname
noinst_DATA=uk.org.greenend.rjk.disorder.plist
noinst_PROGRAMS=disorder.cgi trackname
noinst_DATA=uk.org.greenend.rjk.disorder.plist
@@
-30,6
+31,8
@@
disorderd_SOURCES=disorderd.c \
daemonize.c daemonize.h \
play.c play.h \
server.c server.h \
daemonize.c daemonize.h \
play.c play.h \
server.c server.h \
+ server-queue.c server-queue.h \
+ setup.c setup.h \
state.c state.h \
trackdb.c trackdb.h trackdb-int.h exports.c \
../lib/memgc.c
state.c state.h \
trackdb.c trackdb.h trackdb-int.h exports.c \
../lib/memgc.c
@@
-41,15
+44,17
@@
disorderd_DEPENDENCIES=../lib/libdisorder.a
disorder_deadlock_SOURCES=deadlock.c \
trackdb.c trackdb.h
disorder_deadlock_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
disorder_deadlock_SOURCES=deadlock.c \
trackdb.c trackdb.h
disorder_deadlock_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
- $(LIBDB) $(LIBPCRE) $(LIBICONV)
+ $(LIBDB) $(LIBPCRE) $(LIBICONV)
$(LIBGCRYPT)
disorder_deadlock_DEPENDENCIES=../lib/libdisorder.a
disorder_speaker_SOURCES=speaker.c speaker.h \
speaker-command.c \
speaker-network.c \
disorder_deadlock_DEPENDENCIES=../lib/libdisorder.a
disorder_speaker_SOURCES=speaker.c speaker.h \
speaker-command.c \
speaker-network.c \
+ speaker-coreaudio.c \
+ speaker-oss.c \
speaker-alsa.c
disorder_speaker_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
speaker-alsa.c
disorder_speaker_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
- $(LIBASOUND) $(LIBPCRE) $(LIBICONV) $(LIBGCRYPT)
+ $(LIBASOUND) $(LIBPCRE) $(LIBICONV) $(LIBGCRYPT)
$(COREAUDIO)
disorder_speaker_DEPENDENCIES=../lib/libdisorder.a
disorder_decode_SOURCES=decode.c
disorder_speaker_DEPENDENCIES=../lib/libdisorder.a
disorder_decode_SOURCES=decode.c
@@
-58,7
+63,8
@@
disorder_decode_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
disorder_decode_DEPENDENCIES=../lib/libdisorder.a
disorder_normalize_SOURCES=normalize.c
disorder_decode_DEPENDENCIES=../lib/libdisorder.a
disorder_normalize_SOURCES=normalize.c
-disorder_normalize_LDADD=$(LIBOBJS) ../lib/libdisorder.a $(LIBPCRE) $(LIBICONV)
+disorder_normalize_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
+ $(LIBPCRE) $(LIBICONV) $(LIBGCRYPT)
disorder_normalize_DEPENDENCIES=../lib/libdisorder.a
disorder_rescan_SOURCES=rescan.c \
disorder_normalize_DEPENDENCIES=../lib/libdisorder.a
disorder_rescan_SOURCES=rescan.c \
@@
-66,15
+72,20
@@
disorder_rescan_SOURCES=rescan.c \
trackdb.c trackdb.h exports.c \
../lib/memgc.c
disorder_rescan_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
trackdb.c trackdb.h exports.c \
../lib/memgc.c
disorder_rescan_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
- $(LIBDB) $(LIBGC) $(LIBPCRE) $(LIBICONV)
+ $(LIBDB) $(LIBGC) $(LIBPCRE) $(LIBICONV)
$(LIBGCRYPT)
disorder_rescan_LDFLAGS=-export-dynamic
disorder_rescan_DEPENDENCIES=../lib/libdisorder.a
disorder_rescan_LDFLAGS=-export-dynamic
disorder_rescan_DEPENDENCIES=../lib/libdisorder.a
+disorder_stats_SOURCES=stats.c trackdb.c trackdb.h
+disorder_stats_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
+ $(LIBDB) $(LIBPCRE) $(LIBICONV) $(LIBGCRYPT)
+disorder_stats_DEPENDENCIES=../lib/libdisorder.a
+
disorder_dump_SOURCES=dump.c \
trackdb.c trackdb.h \
../lib/memgc.c
disorder_dump_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
disorder_dump_SOURCES=dump.c \
trackdb.c trackdb.h \
../lib/memgc.c
disorder_dump_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
- $(LIBPCRE) $(LIBDB) $(LIBICONV) $(LIBGC)
+ $(LIBPCRE) $(LIBDB) $(LIBICONV) $(LIBGC)
$(LIBGCRYPT)
disorder_dump_DEPENDENCIES=$(LIBOBJS) ../lib/libdisorder.a
disorder_cgi_SOURCES=dcgi.c dcgi.h \
disorder_dump_DEPENDENCIES=$(LIBOBJS) ../lib/libdisorder.a
disorder_cgi_SOURCES=dcgi.c dcgi.h \
@@
-86,7
+97,7
@@
disorder_cgi_LDFLAGS=-export-dynamic
disorder_cgi_DEPENDENCIES=../lib/libdisorder.a
trackname_SOURCES=trackname.c
disorder_cgi_DEPENDENCIES=../lib/libdisorder.a
trackname_SOURCES=trackname.c
-trackname_LDADD=../lib/libdisorder.a $(LIBPCRE) $(LIBICONV)
+trackname_LDADD=../lib/libdisorder.a $(LIBPCRE) $(LIBICONV)
$(LIBGCRYPT)
trackname_DEPENDENCIES=../lib/libdisorder.a
install-exec-hook:
trackname_DEPENDENCIES=../lib/libdisorder.a
install-exec-hook: