[gnome-initial-setup] Reduce overlinking

[Matthias Clasen <matthiasc src gnome org>]

commit 30e4a1d3477c94c7870343a72d0eb7cf19fb0452
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Nov 22 13:46:35 2012 -0500

    Reduce overlinking
    
    Don't link the copy-worker binary against all the pages and the
    libraries they require - this was causing the no-op copy-worker
    call to show up noticably in my login bootchart.

 configure.ac                    |    2 ++
 gnome-initial-setup/Makefile.am |   12 +++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index b3c47f0..f43bd8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,6 +46,8 @@ PKG_CHECK_MODULES(INITIAL_SETUP,
                   gdm
                   egg-list-box-uninstalled)
 
+PKG_CHECK_MODULES(COPY_WORKER, gio-2.0)
+
 PKG_CHECK_MODULES(CLUTTER,
                   clutter-gtk-1.0
                   clutter-1.0 >= $CLUTTER_REQUIRED_VERSION,
diff --git a/gnome-initial-setup/Makefile.am b/gnome-initial-setup/Makefile.am
index a1a7d73..56295d5 100644
--- a/gnome-initial-setup/Makefile.am
+++ b/gnome-initial-setup/Makefile.am
@@ -7,8 +7,6 @@ AM_CPPFLAGS = \
 	-DUIDIR="\"$(uidir)\"" \
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"
 
-LIBS = $(INITIAL_SETUP_LIBS) -lm
-
 libexec_PROGRAMS = gnome-initial-setup gnome-initial-setup-copy-worker
 
 BUILT_SOURCES =
@@ -46,11 +44,19 @@ gnome_initial_setup_LDADD =	\
 	pages/location/libgislocation.la \
 	pages/account/libgisaccount.la \
 	pages/goa/libgisgoa.la \
-	pages/summary/libgissummary.la
+	pages/summary/libgissummary.la \
+	$(INITIAL_SETUP_LIBS) \
+	-lm
 
 gnome_initial_setup_copy_worker_SOURCES =		\
 	gnome-initial-setup-copy-worker.c
 
+gnome_initial_setup_copy_worker_CFLAGS = \
+	$(COPY_WORKER_CFLAGS)
+
+gnome_initial_setup_copy_worker_LDADD = \
+	$(COPY_WORKER_LIBS)
+
 EXTRA_DIST = \
 	$(UI_FILES) \
 	setup.gresource.xml