summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLars-Dominik Braun <PromyLOPh@lavabit.com>2009-01-31 19:33:40 +0100
committerLars-Dominik Braun <PromyLOPh@lavabit.com>2009-01-31 19:33:40 +0100
commit9312c14b47a2d6e58238902d1424ae8d45d73ac5 (patch)
treea89ba3a812cf987e815dab6df2929f76dd914675 /src
parent46544ec5126051b8e933e6036c528c2e811e932e (diff)
downloadpianobar-windows-9312c14b47a2d6e58238902d1424ae8d45d73ac5.tar.gz
pianobar-windows-9312c14b47a2d6e58238902d1424ae8d45d73ac5.tar.bz2
pianobar-windows-9312c14b47a2d6e58238902d1424ae8d45d73ac5.zip
Switch build system to cmake
lib{piano,wardrobe} are now static libraries and not installed any more.
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am10
-rw-r--r--src/main.c2
-rw-r--r--src/player.c2
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);