Switch build system to cmake

lib{piano,wardrobe} are now static libraries and not installed any more.

3 files changed, 2 insertions, 12 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index 72f0789..0000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-bin_PROGRAMS = pianobar
-
-pianobar_SOURCES = main.c terminal.c terminal.h settings.c settings.h \
-		player.c player.h ui.c ui.h ui_act.c ui_act.h
-pianobar_CPPFLAGS = ${LIBCURL_CFLAGS} ${LIBAO_CFLAGS} ${LIBXML_CFLAGS} \
-		-I../libpiano/src -I../libwardrobe/src
-pianobar_LDADD = ${LIBCURL_LIBS} ${LIBAO_LIBS} ${LIBFAAD_LIBS} \
-		${LIBREADLINE_LIBS} ${LIBXML_LIBS} ${LIBPTHREAD_LIBS} ${LIBM_LIBS} \
-		../libpiano/src/libpiano.la ../libwardrobe/src/libwardrobe.la
-dist_man1_MANS = pianobar.1
diff --git a/src/main.c b/src/main.c
index f7d4bca..b44330a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -65,7 +65,7 @@ int main (int argc, char **argv) {
 	char buf = '\0';
 	BarKeyShortcut_t *curShortcut;
 
-	BarUiMsg ("Welcome to " PACKAGE_NAME "!\n");
+	BarUiMsg ("Welcome to " PACKAGE "!\n");
 
 	/* init some things */
 	curl_global_init (CURL_GLOBAL_SSL);
diff --git a/src/player.c b/src/player.c
index cf22bfd..94c7969 100644
--- a/src/player.c
+++ b/src/player.c
@@ -251,7 +251,7 @@ void *BarPlayerThread (void *data) {
 	curl_easy_setopt (player->audioFd, CURLOPT_URL, player->url);
 	curl_easy_setopt (player->audioFd, CURLOPT_WRITEFUNCTION, BarPlayerCurlCb);
 	curl_easy_setopt (player->audioFd, CURLOPT_WRITEDATA, (void *) player);
-	curl_easy_setopt (player->audioFd, CURLOPT_USERAGENT, PACKAGE_STRING);
+	curl_easy_setopt (player->audioFd, CURLOPT_USERAGENT, PACKAGE);
 	curl_easy_setopt (player->audioFd, CURLOPT_CONNECTTIMEOUT, 60);
 	/* start downloading from beginning of file */
 	curl_easy_setopt (player->audioFd, CURLOPT_RESUME_FROM, 0);