diff options
| author | Regis Merlino <regis.merlino@intel.com> | 2013-03-11 10:52:35 -0700 |
|---|---|---|
| committer | Regis Merlino <regis.merlino@intel.com> | 2013-03-11 10:52:35 -0700 |
| commit | d929e2f2b70447e3589952d8c69688880b7b514d (patch) | |
| tree | 935e700c96d309003009e236b58860461efc3918 /server | |
| parent | 6b9249f2b95ee7e01546bce4ea6366c4e7aa25f7 (diff) | |
| download | dleyna-server-d929e2f2b70447e3589952d8c69688880b7b514d.tar.gz | |
[Architecture] Change directory structure to enable build from a master project
Signed-off-by: Regis Merlino <regis.merlino@intel.com>
Diffstat (limited to 'server')
| -rw-r--r-- | server/Makefile.am | 16 | ||||
| -rw-r--r-- | server/daemon.c | 2 |
2 files changed, 9 insertions, 9 deletions
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" |