From 1a3e2c1a1256c1ad48e6c92572cb9692b24b7ff6 Mon Sep 17 00:00:00 2001 From: Andreas Henriksson Date: Wed, 19 Sep 2012 19:19:44 +0200 Subject: [PATCH] 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.... --- common.am | 2 +- src/rygel/Makefile.am | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/common.am b/common.am index 3eba601..9e44d15 100644 --- a/common.am +++ b/common.am @@ -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 f4b9ea6..7e62312 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 -- 2.7.4