[Architecture] Change directory structure to enable build from a master project

Signed-off-by: Regis Merlino <regis.merlino@intel.com>

29 files changed, 31 insertions, 21 deletions

diff --git a/.gitignore b/.gitignore
index 10dc7b0..e79920d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,8 +36,8 @@ m4/ltversion.m4
 m4/lt~obsolete.m4
 
 server/com.intel.dleyna-server.service
-lib/dleyna-server-service.conf
-lib/dleyna-server-1.0.pc
+libdleyna/server/dleyna-server-service.conf
+libdleyna/server/dleyna-server-1.0.pc
 
 server/dleyna-server-service
 test/dbus/dms-info
diff --git a/Makefile.am b/Makefile.am
index ac4efd8..05ccd36 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = lib
+SUBDIRS = libdleyna/server
 
 if BUILD_SERVER
 SUBDIRS += server test/dbus
diff --git a/configure.ac b/configure.ac
index c7e7925..693911d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ AC_INIT([dleyna-server],
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_SRCDIR([lib/server.c])
+AC_CONFIG_SRCDIR([libdleyna/server/server.c])
 
 AC_PREFIX_DEFAULT(/usr/local)
 
@@ -38,7 +38,6 @@ LT_LANG([C])
 PKG_PROG_PKG_CONFIG(0.16)
 PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.28])
 PKG_CHECK_MODULES([GIO], [gio-2.0 >= 2.28])
-PKG_CHECK_MODULES([DLEYNA_CORE], [dleyna-core-1.0 >= 0.0.1])
 PKG_CHECK_MODULES([GSSDP], [gssdp-1.0 >= 0.13.2])
 PKG_CHECK_MODULES([GUPNP], [gupnp-1.0 >= 0.19.1])
 PKG_CHECK_MODULES([GUPNPAV], [gupnp-av-1.0 >= 0.11.5])
@@ -79,6 +78,17 @@ AC_DEFINE_UNQUOTED([DLEYNA_LOG_LEVEL_DEBUG],    [${LOG_LEVEL_6}], [Log level fla
 AC_DEFINE_UNQUOTED([DLEYNA_LOG_LEVEL_DEFAULT],  [${LOG_LEVEL_7}], [Log level flag to display default level messages])
 AC_DEFINE_UNQUOTED([DLEYNA_LOG_LEVEL_ALL],      [${LOG_LEVEL_8}], [Log level flag for all messages])
 
+AC_ARG_ENABLE(master-build,,
+		[],
+		[master_build=no])
+
+AS_IF([test "x$master_build" = "xno"],
+      [PKG_CHECK_MODULES([DLEYNA_CORE], [dleyna-core-1.0 >= 0.0.1])],
+      [this_abs_top_srcdir=`cd "$srcdir" && pwd`;
+       DLEYNA_CORE_CFLAGS="-I$this_abs_top_srcdir/../dleyna-core";
+       DLEYNA_CORE_LIBS="-L$this_abs_top_srcdir/../dleyna-core/.libs -ldleyna-core-1.0"
+      ])
+
 AC_ARG_ENABLE(debug,
 		AS_HELP_STRING(
 			[--enable-debug],
@@ -217,13 +227,13 @@ AC_SUBST([with_connector_name])
 AC_SUBST([with_log_level])
 AC_SUBST([with_log_type])
 
-AC_CONFIG_FILES([Makefile				\
-		 lib/Makefile				\
-		 lib/dleyna-server-1.0.pc		\
-		 lib/dleyna-server-service.conf		\
-		 server/com.intel.dleyna-server.service	\
-		 server/dleyna-server-service-1.0.pc	\
-		 server/Makefile			\
+AC_CONFIG_FILES([Makefile					\
+		 libdleyna/server/Makefile			\
+		 libdleyna/server/dleyna-server-1.0.pc		\
+		 libdleyna/server/dleyna-server-service.conf	\
+		 server/com.intel.dleyna-server.service		\
+		 server/dleyna-server-service-1.0.pc		\
+		 server/Makefile				\
 		 test/dbus/Makefile
 		])
 
diff --git a/lib/Makefile.am b/libdleyna/server/Makefile.am
index fcdba64..fcdba64 100644
--- a/lib/Makefile.am
+++ b/libdleyna/server/Makefile.am
diff --git a/lib/async.c b/libdleyna/server/async.c
index fcdbe9a..fcdbe9a 100644
--- a/lib/async.c
+++ b/libdleyna/server/async.c
diff --git a/lib/async.h b/libdleyna/server/async.h
index 8efb8c5..8efb8c5 100644
--- a/lib/async.h
+++ b/libdleyna/server/async.h
diff --git a/lib/client.h b/libdleyna/server/client.h
index 6d499dd..6d499dd 100644
--- a/lib/client.h
+++ b/libdleyna/server/client.h
diff --git a/lib/control-point-server.h b/libdleyna/server/control-point-server.h
index 1f9876b..1f9876b 100644
--- a/lib/control-point-server.h
+++ b/libdleyna/server/control-point-server.h
diff --git a/lib/device.c b/libdleyna/server/device.c
index c6b7dc4..c6b7dc4 100644
--- a/lib/device.c
+++ b/libdleyna/server/device.c
diff --git a/lib/device.h b/libdleyna/server/device.h
index ef3e3df..ef3e3df 100644
--- a/lib/device.h
+++ b/libdleyna/server/device.h
diff --git a/lib/dleyna-server-1.0.pc.in b/libdleyna/server/dleyna-server-1.0.pc.in
index 4f7f5a2..4f7f5a2 100644
--- a/lib/dleyna-server-1.0.pc.in
+++ b/libdleyna/server/dleyna-server-1.0.pc.in
diff --git a/lib/dleyna-server-service.conf.in b/libdleyna/server/dleyna-server-service.conf.in
index 0acca2c..0acca2c 100644
--- a/lib/dleyna-server-service.conf.in
+++ b/libdleyna/server/dleyna-server-service.conf.in
diff --git a/lib/interface.h b/libdleyna/server/interface.h
index fb2695e..fb2695e 100644
--- a/lib/interface.h
+++ b/libdleyna/server/interface.h
diff --git a/lib/path.c b/libdleyna/server/path.c
index 345cba4..345cba4 100644
--- a/lib/path.c
+++ b/libdleyna/server/path.c
diff --git a/lib/path.h b/libdleyna/server/path.h
index 1ccd12d..1ccd12d 100644
--- a/lib/path.h
+++ b/libdleyna/server/path.h
diff --git a/lib/props.c b/libdleyna/server/props.c
index 2dbd63b..2dbd63b 100644
--- a/lib/props.c
+++ b/libdleyna/server/props.c
diff --git a/lib/props.h b/libdleyna/server/props.h
index 610fcea..610fcea 100644
--- a/lib/props.h
+++ b/libdleyna/server/props.h
diff --git a/lib/search.c b/libdleyna/server/search.c
index 264654e..264654e 100644
--- a/lib/search.c
+++ b/libdleyna/server/search.c
diff --git a/lib/search.h b/libdleyna/server/search.h
index 150a764..150a764 100644
--- a/lib/search.h
+++ b/libdleyna/server/search.h
diff --git a/lib/server.c b/libdleyna/server/server.c
index 6cfa036..6cfa036 100644
--- a/lib/server.c
+++ b/libdleyna/server/server.c
diff --git a/lib/server.h b/libdleyna/server/server.h
index 01d9356..01d9356 100644
--- a/lib/server.h
+++ b/libdleyna/server/server.h
diff --git a/lib/sort.c b/libdleyna/server/sort.c
index d1f3c4d..d1f3c4d 100644
--- a/lib/sort.c
+++ b/libdleyna/server/sort.c
diff --git a/lib/sort.h b/libdleyna/server/sort.h
index 378d163..378d163 100644
--- a/lib/sort.h
+++ b/libdleyna/server/sort.h
diff --git a/lib/task.c b/libdleyna/server/task.c
index 6a8cf85..6a8cf85 100644
--- a/lib/task.c
+++ b/libdleyna/server/task.c
diff --git a/lib/task.h b/libdleyna/server/task.h
index 0257a9f..0257a9f 100644
--- a/lib/task.h
+++ b/libdleyna/server/task.h
diff --git a/lib/upnp.c b/libdleyna/server/upnp.c
index dcb9876..dcb9876 100644
--- a/lib/upnp.c
+++ b/libdleyna/server/upnp.c
diff --git a/lib/upnp.h b/libdleyna/server/upnp.h
index dfe2d1b..dfe2d1b 100644
--- a/lib/upnp.h
+++ b/libdleyna/server/upnp.h
diff --git a/server/Makefile.am b/server/Makefile.am
index 87fabf0..01821d6 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -1,7 +1,7 @@
-AM_CFLAGS =	$(GLIB_CFLAGS)		\
-		$(GIO_CFLAGS)		\
-		$(DLEYNA_CORE_CFLAGS)	\
-		-I$(top_builddir)/lib	\
+AM_CFLAGS =	$(GLIB_CFLAGS)				\
+		$(GIO_CFLAGS)				\
+		$(DLEYNA_CORE_CFLAGS)			\
+		-I$(top_builddir)/libdleyna/server	\
 		-include config.h
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
@@ -10,10 +10,10 @@ libexec_PROGRAMS = dleyna-server-service
 
 dleyna_server_service_SOURCES =	daemon.c
 
-dleyna_server_service_LDADD =	$(GLIB_LIBS)				    \
-				$(GIO_LIBS)				    \
-				$(DLEYNA_CORE_LIBS)			    \
-				$(top_builddir)/lib/libdleyna-server-1.0.la
+dleyna_server_service_LDADD =	$(GLIB_LIBS)				    			\
+				$(GIO_LIBS)				    			\
+				$(DLEYNA_CORE_LIBS)			    			\
+				$(top_builddir)/libdleyna/server/libdleyna-server-1.0.la
 			
 dbussessiondir = @DBUS_SESSION_DIR@
 dbussession_DATA = com.intel.dleyna-server.service
diff --git a/server/daemon.c b/server/daemon.c
index 7804b7f..9a8121d 100644
--- a/server/daemon.c
+++ b/server/daemon.c
@@ -25,7 +25,7 @@
 #include <sys/signalfd.h>
 
 #include <libdleyna/core/main-loop.h>
-#include <lib/control-point-server.h>
+#include <libdleyna/server/control-point-server.h>
 
 #define DLS_SERVER_SERVICE_NAME "dleyna-server-service"