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

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

.gitignore

@@ -29,8 +29,8 @@ missing
 stamp-h1
 INSTALL
 
-lib/dleyna-renderer-service.conf
-lib/dleyna-renderer-1.0.pc
+libdleyna/renderer/dleyna-renderer-service.conf
+libdleyna/renderer/dleyna-renderer-1.0.pc
 
 m4/libtool.m4
 m4/ltoptions.m4

Makefile.am

-SUBDIRS = lib
+SUBDIRS = libdleyna/renderer
 
 if BUILD_SERVER
 SUBDIRS += server

configure.ac

@@ -9,7 +9,7 @@ AC_INIT([dleyna-renderer],
 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/renderer/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],
@@ -223,12 +233,12 @@ AC_SUBST([with_connector_name])
 AC_SUBST([with_log_level])
 AC_SUBST([with_log_type])
 
-AC_CONFIG_FILES([Makefile					\
-		 lib/Makefile					\
-		 lib/dleyna-renderer-1.0.pc			\
-		 lib/dleyna-renderer-service.conf		\
-		 server/com.intel.dleyna-renderer.service	\
-		 server/dleyna-renderer-service-1.0.pc		\
+AC_CONFIG_FILES([Makefile						\
+		 libdleyna/renderer/Makefile				\
+		 libdleyna/renderer/dleyna-renderer-1.0.pc		\
+		 libdleyna/renderer/dleyna-renderer-service.conf	\
+		 server/com.intel.dleyna-renderer.service		\
+		 server/dleyna-renderer-service-1.0.pc			\
 		 server/Makefile
 		])
 

server/Makefile.am

-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/renderer	\
 		-include config.h
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
@@ -10,10 +10,10 @@ libexec_PROGRAMS = dleyna-renderer-service
 
 dleyna_renderer_service_SOURCES =	daemon.c
 
-dleyna_renderer_service_LDADD =	$(GLIB_LIBS)				      \
-				$(GIO_LIBS)				      \
-				$(DLEYNA_CORE_LIBS)			      \
-				$(top_builddir)/lib/libdleyna-renderer-1.0.la
+dleyna_renderer_service_LDADD =	$(GLIB_LIBS)				      			\
+				$(GIO_LIBS)				     			\
+				$(DLEYNA_CORE_LIBS)			      			\
+				$(top_builddir)/libdleyna/renderer/libdleyna-renderer-1.0.la
 			
 			
 dbussessiondir = @DBUS_SESSION_DIR@
@@ -24,4 +24,4 @@ pkgconfig_DATA = dleyna-renderer-service-1.0.pc
 
 CLEANFILES = $(dbussession_DATA) $(pkgconfig_DATA)
 DISTCLEANFILES = $(dbussession_DATA) $(pkgconfig_DATA)
-			
\ No newline at end of file
+			

server/daemon.c

@@ -25,7 +25,7 @@
 #include <sys/signalfd.h>
 
 #include <libdleyna/core/main-loop.h>
-#include <lib/control-point-renderer.h>
+#include <libdleyna/renderer/control-point-renderer.h>
 
 #define DLR_RENDERER_SERVICE_NAME "dleyna-renderer-service"