lib: Move sources to src

16 files changed, 11 insertions, 10 deletions

diff --git a/libpiano/Makefile.am b/libpiano/Makefile.am
index e74d442..af437a6 100644
--- a/libpiano/Makefile.am
+++ b/libpiano/Makefile.am
@@ -1,6 +1 @@
-lib_LTLIBRARIES = libpiano.la
-
-libpiano_la_SOURCES = crypt.c http.c main.c xml.c const.h 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}
+SUBDIRS = src
diff --git a/libpiano/configure.in b/libpiano/configure.in
index 2f25f4c..6d7e380 100644
--- a/libpiano/configure.in
+++ b/libpiano/configure.in
@@ -1,6 +1,6 @@
 AC_INIT([libpiano], [0.1], [PromyLOPh@gmail.com])
 AC_CONFIG_AUX_DIR([.])
-AC_CONFIG_SRCDIR([main.c])
+AC_CONFIG_SRCDIR([src/main.c])
 AM_INIT_AUTOMAKE([-Wall])
 
 AC_PROG_CC
@@ -18,6 +18,6 @@ PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= 2.6.31)
 AC_SUBST(LIBXML_CFLAGS)
 AC_SUBST(LIBXML_LIBS)
 
-AC_CONFIG_FILES(Makefile)
+AC_CONFIG_FILES(Makefile src/Makefile)
 
 AC_OUTPUT
diff --git a/libpiano/src/Makefile.am b/libpiano/src/Makefile.am
new file mode 100644
index 0000000..e74d442
--- /dev/null
+++ b/libpiano/src/Makefile.am
@@ -0,0 +1,6 @@
+lib_LTLIBRARIES = libpiano.la
+
+libpiano_la_SOURCES = crypt.c http.c main.c xml.c const.h 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/const.h b/libpiano/src/const.h
index dfaca1f..dfaca1f 100644
--- a/libpiano/const.h
+++ b/libpiano/src/const.h
diff --git a/libpiano/crypt.c b/libpiano/src/crypt.c
index 10744e0..10744e0 100644
--- a/libpiano/crypt.c
+++ b/libpiano/src/crypt.c
diff --git a/libpiano/crypt.h b/libpiano/src/crypt.h
index 5b097f1..5b097f1 100644
--- a/libpiano/crypt.h
+++ b/libpiano/src/crypt.h
diff --git a/libpiano/crypt_key_input.h b/libpiano/src/crypt_key_input.h
index 101d382..101d382 100644
--- a/libpiano/crypt_key_input.h
+++ b/libpiano/src/crypt_key_input.h
diff --git a/libpiano/crypt_key_output.h b/libpiano/src/crypt_key_output.h
index 5bafaf5..5bafaf5 100644
--- a/libpiano/crypt_key_output.h
+++ b/libpiano/src/crypt_key_output.h
diff --git a/libpiano/http.c b/libpiano/src/http.c
index ee63fef..ee63fef 100644
--- a/libpiano/http.c
+++ b/libpiano/src/http.c
diff --git a/libpiano/http.h b/libpiano/src/http.h
index 87dc49c..87dc49c 100644
--- a/libpiano/http.h
+++ b/libpiano/src/http.h
diff --git a/libpiano/main.c b/libpiano/src/main.c
index 95adc48..95adc48 100644
--- a/libpiano/main.c
+++ b/libpiano/src/main.c
diff --git a/libpiano/main.h b/libpiano/src/main.h
index 1746e53..1746e53 100644
--- a/libpiano/main.h
+++ b/libpiano/src/main.h
diff --git a/libpiano/piano.h b/libpiano/src/piano.h
index b832b69..b832b69 100644
--- a/libpiano/piano.h
+++ b/libpiano/src/piano.h
diff --git a/libpiano/xml.c b/libpiano/src/xml.c
index 3369074..3369074 100644
--- a/libpiano/xml.c
+++ b/libpiano/src/xml.c
diff --git a/libpiano/xml.h b/libpiano/src/xml.h
index 54deb6e..54deb6e 100644
--- a/libpiano/xml.h
+++ b/libpiano/src/xml.h
diff --git a/src/Makefile.am b/src/Makefile.am
index dd687d7..6bffa2d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 bin_PROGRAMS = pianobar
 
 pianobar_SOURCES = main.c terminal.c terminal.h settings.c settings.h
-pianobar_CPPFLAGS = ${LIBCURL_CFLAGS} ${LIBAO_CFLAGS} ${LIBXML_CFLAGS} -I../libpiano
-pianobar_LDADD = ${LIBCURL_LIBS} ${LIBAO_LIBS} ${LIBFAAD_LIBS} ${LIBREADLINE_LIBS} ${LIBXML_LIBS} -lpthread ../libpiano/libpiano.la
+pianobar_CPPFLAGS = ${LIBCURL_CFLAGS} ${LIBAO_CFLAGS} ${LIBXML_CFLAGS} -I../libpiano/src
+pianobar_LDADD = ${LIBCURL_LIBS} ${LIBAO_LIBS} ${LIBFAAD_LIBS} ${LIBREADLINE_LIBS} ${LIBXML_LIBS} -lpthread ../libpiano/src/libpiano.la
 dist_man1_MANS = pianobar.1