From 3a55c153b81a295c76104d81fc4e71804fe0c3b1 Mon Sep 17 00:00:00 2001 From: Julien BLACHE Date: Thu, 2 Apr 2009 12:11:29 +0200 Subject: [PATCH] Move wavstreamer to tools --- Makefile.am | 2 +- configure.in | 2 +- src/Makefile.am | 3 --- tools/Makefile.am | 4 ++++ {src => tools}/wavstreamer.c | 0 5 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 tools/Makefile.am rename {src => tools}/wavstreamer.c (100%) diff --git a/Makefile.am b/Makefile.am index f72226fe..e70aeadb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ EXTRA_DIST = configure CREDITS -SUBDIRS=src admin-root contrib +SUBDIRS = src tools admin-root contrib diff --git a/configure.in b/configure.in index dbeb22bb..94a55d0e 100644 --- a/configure.in +++ b/configure.in @@ -133,4 +133,4 @@ AC_SUBST(V_NETLIBS) AC_DEFINE_UNQUOTED(HOST, "$host", [host triplet]) -AC_OUTPUT(src/Makefile src/plugins/Makefile admin-root/Makefile admin-root/lib-js/Makefile admin-root/lib-js/script.aculo.us/Makefile contrib/Makefile contrib/init.d/Makefile Makefile) +AC_OUTPUT(src/Makefile src/plugins/Makefile tools/Makefile admin-root/Makefile admin-root/lib-js/Makefile admin-root/lib-js/script.aculo.us/Makefile contrib/Makefile contrib/init.d/Makefile Makefile) diff --git a/src/Makefile.am b/src/Makefile.am index 718ff80c..50c7b44c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,7 +2,6 @@ SUBDIRS = plugins sbin_PROGRAMS = mt-daapd -bin_PROGRAMS = wavstreamer if COND_OGGVORBIS OGGVORBISSRC=scan-ogg.c @@ -21,8 +20,6 @@ UPNP=upnp.c upnp.h endif -wavstreamer_SOURCES = wavstreamer.c - mt_daapd_CPPFLAGS = @AVAHI_CFLAGS@ @SQLITE3_CFLAGS@ @ID3TAG_CFLAGS@ @OGGVORBIS_CFLAGS@ @TAGLIB_CFLAGS@ mt_daapd_LDADD = @AVAHI_LIBS@ @SQLITE3_LIBS@ @ID3TAG_LIBS@ @OGGVORBIS_LIBS@ @FLAC_LIBS@ @TAGLIB_LIBS@ @LIBICONV@ mt_daapd_SOURCES = main.c daapd.h rend.h webserver.c \ diff --git a/tools/Makefile.am b/tools/Makefile.am new file mode 100644 index 00000000..1afa8950 --- /dev/null +++ b/tools/Makefile.am @@ -0,0 +1,4 @@ + +bin_PROGRAMS = wavstreamer + +wavstreamer_SOURCES = wavstreamer.c diff --git a/src/wavstreamer.c b/tools/wavstreamer.c similarity index 100% rename from src/wavstreamer.c rename to tools/wavstreamer.c