diff options
author | Andreas Henriksson <andreas@fatal.se> | 2012-09-19 19:19:44 +0200 |
---|---|---|
committer | Jens Georg <jensg@openismus.com> | 2012-10-06 15:11:32 +0200 |
commit | 1a3e2c1a1256c1ad48e6c92572cb9692b24b7ff6 (patch) | |
tree | 5950ed7aa7aa60c85be052c870918e96bee93d90 | |
parent | 2968c0fd7442d064ab41546a1f9d0cc997dbf5e9 (diff) | |
download | rygel-1a3e2c1a1256c1ad48e6c92572cb9692b24b7ff6.tar.gz |
Move rygel base libs up the linking chain to avoid excessive linking
$((LIBGUPNP_AV_LIBS) and $(GSTREAMER_BASE_LIBS) aren't needed by
librygel-core and $(RYGEL_BASE_LIBS) are only used in a couple of
places, so move these over to those places instead....
-rw-r--r-- | common.am | 2 | ||||
-rw-r--r-- | src/rygel/Makefile.am | 1 |
2 files changed, 2 insertions, 1 deletions
@@ -47,13 +47,13 @@ AM_CFLAGS = \ RYGEL_BASE_LIBS = \ $(LIBGUPNP_LIBS) \ - $(LIBGUPNP_AV_LIBS) \ $(GEE_LIBS) \ $(UUID_LIBS) \ $(COVERAGE_LIBS) RYGEL_COMMON_LIBS = \ $(RYGEL_BASE_LIBS) \ + $(LIBGUPNP_AV_LIBS) \ $(top_builddir)/src/librygel-core/librygel-core-2.0.la RYGEL_COMMON_SERVER_LIBS = \ diff --git a/src/rygel/Makefile.am b/src/rygel/Makefile.am index f4b9ea65..7e623126 100644 --- a/src/rygel/Makefile.am +++ b/src/rygel/Makefile.am @@ -28,6 +28,7 @@ rygel_VALAFLAGS = \ rygel_LDADD = \ $(top_builddir)/src/librygel-core/librygel-core-2.0.la \ $(top_builddir)/src/librygel-server/librygel-server-2.0.la \ + $(LIBGUPNP_AV_LIBS) \ $(RYGEL_BASE_LIBS) rygel_LDFLAGS = -export-dynamic |