-disorder_speaker_SOURCES=speaker.c
-disorder_speaker_LDADD=$(LIBOBJS) ../lib/libdisorder.la $(LIBASOUND)
-disorder_speaker_DEPENDENCIES=../lib/libdisorder.la
+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 \
+ $(LIBASOUND) $(LIBPCRE) $(LIBICONV) $(LIBGCRYPT) $(COREAUDIO)
+disorder_speaker_DEPENDENCIES=../lib/libdisorder.a
+
+disorder_decode_SOURCES=decode.c
+disorder_decode_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
+ $(LIBMAD) $(LIBVORBISFILE) $(LIBFLAC)
+disorder_decode_DEPENDENCIES=../lib/libdisorder.a
+
+disorder_normalize_SOURCES=normalize.c
+disorder_normalize_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
+ $(LIBPCRE) $(LIBICONV) $(LIBGCRYPT)
+disorder_normalize_DEPENDENCIES=../lib/libdisorder.a