summaryrefslogtreecommitdiff
path: root/common.am
diff options
context:
space:
mode:
authorMurray Cumming <murrayc@openismus.com>2012-06-26 10:56:14 +0200
committerJens Georg <mail@jensge.org>2012-07-03 09:53:49 +0200
commit8d31261930239bef18919228436a4bdd3a6e3c0f (patch)
treef8322e3babd1d226b86fde3f87876fb85b9ceadb /common.am
parent55fcc2444aff9601e2c336cd6a0fa6adbd84de01 (diff)
downloadrygel-8d31261930239bef18919228436a4bdd3a6e3c0f.tar.gz
core: Move library code into its own directory
Diffstat (limited to 'common.am')
-rw-r--r--common.am5
1 files changed, 4 insertions, 1 deletions
diff --git a/common.am b/common.am
index a3667b88..dbaf065e 100644
--- a/common.am
+++ b/common.am
@@ -18,6 +18,7 @@ smallicondir = $(shareddir)/icons/48x48
bigicondir = $(shareddir)/icons/120x120
rygeldir = $(top_srcdir)/src/rygel
+librygelcoredir = $(top_srcdir)/src/librygel-core
MAINTAINERCLEANFILES = Makefile.in
@@ -30,6 +31,7 @@ AM_CFLAGS = \
$(UUID_CFLAGS) \
$(COVERAGE_CFLAGS) \
-I$(rygeldir) \
+ -I$(librygelcoredir) \
-DDATA_DIR='"$(shareddir)"' -DSYS_CONFIG_DIR='"$(sysconfigdir)"'\
-DPLUGIN_DIR='"$(plugindir)"' -DDESKTOP_DIR='"$(desktopdir)"'\
-DPRESET_DIR='"$(presetdir)"'\
@@ -46,7 +48,7 @@ RYGEL_BASE_LIBS = \
RYGEL_COMMON_LIBS = \
$(RYGEL_BASE_LIBS) \
- $(top_builddir)/src/rygel/librygel-core-1.0.la
+ $(top_builddir)/src/librygel-core/librygel-core-1.0.la
# Note: the -g needs to be at the end of VALAFLAGS to not break make dist
RYGEL_COMMON_PLUGIN_VALAFLAGS = \
@@ -56,6 +58,7 @@ RYGEL_COMMON_PLUGIN_VALAFLAGS = \
RYGEL_COMMON_VALAFLAGS = \
--pkg rygel-build-config --pkg gupnp-1.0 \
--vapidir=$(rygeldir) \
+ --vapidir=$(librygelcoredir) \
--pkg gupnp-av-1.0 --pkg gee-1.0 \
$(RYGEL_DEBUG_VALAFLAGS) \
$(COVERAGE_VALAFLAGS)