diff options
| -rw-r--r-- | AUTHORS | 2 | ||||
| -rw-r--r-- | Makefile | 13 | ||||
| -rw-r--r-- | contrib/pianobar.1 (renamed from src/pianobar.1) | 0 | ||||
| -rw-r--r-- | libpiano/AUTHORS | 2 | ||||
| -rw-r--r-- | libpiano/COPYING | 20 | ||||
| -rw-r--r-- | libpiano/README | 5 | ||||
| -rw-r--r-- | libwaitress/AUTHORS | 2 | ||||
| -rw-r--r-- | libwaitress/COPYING | 20 | ||||
| -rw-r--r-- | libwaitress/README | 4 | ||||
| -rw-r--r-- | src/libezxml/COPYING (renamed from libezxml/COPYING) | 0 | ||||
| -rw-r--r-- | src/libezxml/ezxml.c (renamed from libezxml/src/ezxml.c) | 0 | ||||
| -rw-r--r-- | src/libezxml/ezxml.h (renamed from libezxml/src/ezxml.h) | 0 | ||||
| -rw-r--r-- | src/libpiano/config.h (renamed from libpiano/src/config.h) | 0 | ||||
| -rw-r--r-- | src/libpiano/crypt.c (renamed from libpiano/src/crypt.c) | 0 | ||||
| -rw-r--r-- | src/libpiano/crypt.h (renamed from libpiano/src/crypt.h) | 0 | ||||
| -rw-r--r-- | src/libpiano/crypt_key_input.h (renamed from libpiano/src/crypt_key_input.h) | 0 | ||||
| -rw-r--r-- | src/libpiano/crypt_key_output.h (renamed from libpiano/src/crypt_key_output.h) | 0 | ||||
| -rw-r--r-- | src/libpiano/piano.c (renamed from libpiano/src/piano.c) | 0 | ||||
| -rw-r--r-- | src/libpiano/piano.h (renamed from libpiano/src/piano.h) | 0 | ||||
| -rw-r--r-- | src/libpiano/piano_private.h (renamed from libpiano/src/piano_private.h) | 0 | ||||
| -rw-r--r-- | src/libpiano/xml.c (renamed from libpiano/src/xml.c) | 0 | ||||
| -rw-r--r-- | src/libpiano/xml.h (renamed from libpiano/src/xml.h) | 0 | ||||
| -rw-r--r-- | src/libwaitress/config.h (renamed from libwaitress/src/config.h) | 0 | ||||
| -rw-r--r-- | src/libwaitress/waitress.c (renamed from libwaitress/src/waitress.c) | 0 | ||||
| -rw-r--r-- | src/libwaitress/waitress.h (renamed from libwaitress/src/waitress.h) | 0 |
25 files changed, 7 insertions, 61 deletions
diff --git a/AUTHORS b/AUTHORS deleted file mode 100644 index 09787cf..0000000 --- a/AUTHORS +++ /dev/null @@ -1,2 +0,0 @@ -Main code: - Lars-Dominik Braun <PromyLOPh@lavabit.com> @@ -26,7 +26,7 @@ PIANOBAR_HDR=\ ${PIANOBAR_DIR}/config.h PIANOBAR_OBJ=${PIANOBAR_SRC:.c=.o} -LIBPIANO_DIR=libpiano/src +LIBPIANO_DIR=src/libpiano LIBPIANO_SRC=\ ${LIBPIANO_DIR}/crypt.c \ ${LIBPIANO_DIR}/piano.c \ @@ -43,7 +43,7 @@ LIBPIANO_OBJ=${LIBPIANO_SRC:.c=.o} LIBPIANO_RELOBJ=${LIBPIANO_SRC:.c=.lo} LIBPIANO_INCLUDE=${LIBPIANO_DIR} -LIBWAITRESS_DIR=libwaitress/src +LIBWAITRESS_DIR=src/libwaitress LIBWAITRESS_SRC=${LIBWAITRESS_DIR}/waitress.c LIBWAITRESS_HDR=\ ${LIBWAITRESS_DIR}/config.h \ @@ -52,11 +52,12 @@ LIBWAITRESS_OBJ=${LIBWAITRESS_SRC:.c=.o} LIBWAITRESS_RELOBJ=${LIBWAITRESS_SRC:.c=.lo} LIBWAITRESS_INCLUDE=${LIBWAITRESS_DIR} -LIBEZXML_SRC=libezxml/src/ezxml.c -LIBEZXML_HDR=libezxml/src/ezxml.h +LIBEZXML_DIR=src/libezxml +LIBEZXML_SRC=${LIBEZXML_DIR}/ezxml.c +LIBEZXML_HDR=${LIBEZXML_DIR}/ezxml.h LIBEZXML_OBJ=${LIBEZXML_SRC:.c=.o} LIBEZXML_RELOBJ=${LIBEZXML_SRC:.c=.lo} -LIBEZXML_INCLUDE=libezxml/src +LIBEZXML_INCLUDE=${LIBEZXML_DIR} LIBAO_INCLUDE=/usr/include LIBAO_LIB=-lao @@ -119,7 +120,7 @@ install: pianobar install -d ${DESTDIR}/${BINDIR}/ install -m755 pianobar ${DESTDIR}/${BINDIR}/ install -d ${DESTDIR}/${MANDIR}/man1/ - install -m644 src/pianobar.1 ${DESTDIR}/${MANDIR}/man1/ + install -m644 contrib/pianobar.1 ${DESTDIR}/${MANDIR}/man1/ install-libpiano: libpiano install -d ${DESTDIR}/${LIBDIR}/ diff --git a/src/pianobar.1 b/contrib/pianobar.1 index 6a6bd33..6a6bd33 100644 --- a/src/pianobar.1 +++ b/contrib/pianobar.1 diff --git a/libpiano/AUTHORS b/libpiano/AUTHORS deleted file mode 100644 index e7ae75e..0000000 --- a/libpiano/AUTHORS +++ /dev/null @@ -1,2 +0,0 @@ -Reverse engineering, main code: - Lars-Dominik Braun <PromyLOPh@lavabit.com> diff --git a/libpiano/COPYING b/libpiano/COPYING deleted file mode 100644 index 4bcd1a3..0000000 --- a/libpiano/COPYING +++ /dev/null @@ -1,20 +0,0 @@ -Copyright (c) 2008-2010 - Lars-Dominik Braun <PromyLOPh@lavabit.com> - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/libpiano/README b/libpiano/README deleted file mode 100644 index e75f313..0000000 --- a/libpiano/README +++ /dev/null @@ -1,5 +0,0 @@ -libpiano -======== - -libpiano handles all communication with pandora's xmlrpc api. It is part of the -pianobar package. diff --git a/libwaitress/AUTHORS b/libwaitress/AUTHORS deleted file mode 100644 index 09787cf..0000000 --- a/libwaitress/AUTHORS +++ /dev/null @@ -1,2 +0,0 @@ -Main code: - Lars-Dominik Braun <PromyLOPh@lavabit.com> diff --git a/libwaitress/COPYING b/libwaitress/COPYING deleted file mode 100644 index 2df3345..0000000 --- a/libwaitress/COPYING +++ /dev/null @@ -1,20 +0,0 @@ -Copyright (c) 2009-2010 - Lars-Dominik Braun <PromyLOPh@lavabit.com> - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/libwaitress/README b/libwaitress/README deleted file mode 100644 index 83b2d02..0000000 --- a/libwaitress/README +++ /dev/null @@ -1,4 +0,0 @@ -README -====== - -libwaitress is pianobar's http communication library. diff --git a/libezxml/COPYING b/src/libezxml/COPYING index 80e4e88..80e4e88 100644 --- a/libezxml/COPYING +++ b/src/libezxml/COPYING diff --git a/libezxml/src/ezxml.c b/src/libezxml/ezxml.c index 967d535..967d535 100644 --- a/libezxml/src/ezxml.c +++ b/src/libezxml/ezxml.c diff --git a/libezxml/src/ezxml.h b/src/libezxml/ezxml.h index 0ee2513..0ee2513 100644 --- a/libezxml/src/ezxml.h +++ b/src/libezxml/ezxml.h diff --git a/libpiano/src/config.h b/src/libpiano/config.h index febad25..febad25 100644 --- a/libpiano/src/config.h +++ b/src/libpiano/config.h diff --git a/libpiano/src/crypt.c b/src/libpiano/crypt.c index 8a8ad01..8a8ad01 100644 --- a/libpiano/src/crypt.c +++ b/src/libpiano/crypt.c diff --git a/libpiano/src/crypt.h b/src/libpiano/crypt.h index e20847c..e20847c 100644 --- a/libpiano/src/crypt.h +++ b/src/libpiano/crypt.h diff --git a/libpiano/src/crypt_key_input.h b/src/libpiano/crypt_key_input.h index a02e668..a02e668 100644 --- a/libpiano/src/crypt_key_input.h +++ b/src/libpiano/crypt_key_input.h diff --git a/libpiano/src/crypt_key_output.h b/src/libpiano/crypt_key_output.h index b8823d5..b8823d5 100644 --- a/libpiano/src/crypt_key_output.h +++ b/src/libpiano/crypt_key_output.h diff --git a/libpiano/src/piano.c b/src/libpiano/piano.c index f6343b4..f6343b4 100644 --- a/libpiano/src/piano.c +++ b/src/libpiano/piano.c diff --git a/libpiano/src/piano.h b/src/libpiano/piano.h index ef6e386..ef6e386 100644 --- a/libpiano/src/piano.h +++ b/src/libpiano/piano.h diff --git a/libpiano/src/piano_private.h b/src/libpiano/piano_private.h index bb14c8f..bb14c8f 100644 --- a/libpiano/src/piano_private.h +++ b/src/libpiano/piano_private.h diff --git a/libpiano/src/xml.c b/src/libpiano/xml.c index 01294d8..01294d8 100644 --- a/libpiano/src/xml.c +++ b/src/libpiano/xml.c diff --git a/libpiano/src/xml.h b/src/libpiano/xml.h index dc778ca..dc778ca 100644 --- a/libpiano/src/xml.h +++ b/src/libpiano/xml.h diff --git a/libwaitress/src/config.h b/src/libwaitress/config.h index e13fe40..e13fe40 100644 --- a/libwaitress/src/config.h +++ b/src/libwaitress/config.h diff --git a/libwaitress/src/waitress.c b/src/libwaitress/waitress.c index 27f7b3d..27f7b3d 100644 --- a/libwaitress/src/waitress.c +++ b/src/libwaitress/waitress.c diff --git a/libwaitress/src/waitress.h b/src/libwaitress/waitress.h index 04333fb..04333fb 100644 --- a/libwaitress/src/waitress.h +++ b/src/libwaitress/waitress.h |