diff options
| author | Lars-Dominik Braun <PromyLOPh@lavabit.com> | 2009-01-31 19:33:40 +0100 |
|---|---|---|
| committer | Lars-Dominik Braun <PromyLOPh@lavabit.com> | 2009-01-31 19:33:40 +0100 |
| commit | 9312c14b47a2d6e58238902d1424ae8d45d73ac5 (patch) | |
| tree | a89ba3a812cf987e815dab6df2929f76dd914675 /libpiano/src | |
| parent | 46544ec5126051b8e933e6036c528c2e811e932e (diff) | |
| download | pianobar-9312c14b47a2d6e58238902d1424ae8d45d73ac5.tar.gz pianobar-9312c14b47a2d6e58238902d1424ae8d45d73ac5.tar.bz2 pianobar-9312c14b47a2d6e58238902d1424ae8d45d73ac5.zip | |
Switch build system to cmake
lib{piano,wardrobe} are now static libraries and not installed any more.
Diffstat (limited to 'libpiano/src')
| -rw-r--r-- | libpiano/src/Makefile.am | 7 | ||||
| -rw-r--r-- | libpiano/src/main.c | 6 |
2 files changed, 3 insertions, 10 deletions
diff --git a/libpiano/src/Makefile.am b/libpiano/src/Makefile.am deleted file mode 100644 index 7b7402d..0000000 --- a/libpiano/src/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -lib_LTLIBRARIES = libpiano.la - -libpiano_la_SOURCES = crypt.c http.c main.c xml.c crypt.h crypt_key_input.h \ - crypt_key_output.h http.h main.h xml.h -include_HEADERS = piano.h -libpiano_la_CPPFLAGS = ${LIBCURL_CFLAGS} ${LIBXML_CFLAGS} -libpiano_la_LIBADD = ${LIBCURL_LIBS} ${LIBXML_LIBS} diff --git a/libpiano/src/main.c b/libpiano/src/main.c index 600c74c..87b2d2b 100644 --- a/libpiano/src/main.c +++ b/libpiano/src/main.c @@ -73,7 +73,7 @@ void PianoInit (PianoHandle_t *ph) { memset (ph, 0, sizeof (*ph)); ph->curlHandle = curl_easy_init (); snprintf (ph->routeId, sizeof (ph->routeId), "%07liP", time (NULL) % 10000000); - curl_easy_setopt (ph->curlHandle, CURLOPT_USERAGENT, PACKAGE_STRING); + curl_easy_setopt (ph->curlHandle, CURLOPT_USERAGENT, PACKAGE); curl_easy_setopt (ph->curlHandle, CURLOPT_CONNECTTIMEOUT, 60); curl_easy_setopt (ph->curlHandle, CURLOPT_TIMEOUT, 60); } @@ -200,7 +200,7 @@ PianoReturn_t PianoConnect (PianoHandle_t *ph, const char *user, PianoReturn_t ret; #if 0 - printf ("\n==========\n" PACKAGE_NAME ": Pandora changed their blowfish " + printf ("\n==========\n" PACKAGE ": Pandora changed their blowfish " "encryption key. You will not be able to connect to pandora.\n" "==========\n"); #endif @@ -865,7 +865,7 @@ const char *PianoErrorToStr (PianoReturn_t ret) { break; case PIANO_RET_PROTOCOL_INCOMPATIBLE: - return "Protocol incompatible. Please upgrade " PACKAGE_NAME "."; + return "Protocol incompatible. Please upgrade " PACKAGE "."; break; case PIANO_RET_READONLY_MODE: |