From 5b677c9eba69a4335a853519ccbc8a138d97ba06 Mon Sep 17 00:00:00 2001 From: Bertrand Lorentz Date: Sat, 11 Sep 2010 15:31:44 +0200 Subject: [PATCH] [build] Fix up gtk references in autotools build SparkleLib does not depend on gtk, but SparkleShare and SparkleDiff do, so update the build to reflect that. Also remove some unneeded variables. --- build/build.environment.mk | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/build/build.environment.mk b/build/build.environment.mk index 4fa916ea..a8d45ca3 100644 --- a/build/build.environment.mk +++ b/build/build.environment.mk @@ -4,17 +4,8 @@ MONO_BASE_PATH = # Install Paths DEFAULT_INSTALL_DIR = $(pkglibdir) - -## Directories -DIR_DOCS = $(top_builddir)/docs - -DIR_ICONS = $(top_builddir)/icons -DIR_NOTIFYSHARP = $(top_builddir)/notify-sharp -DIR_SRC = $(top_builddir)/src - DIR_BIN = $(top_builddir)/bin - # External libraries to link against, generated from configure LINK_SYSTEM = -r:System LINK_MONO_POSIX = -r:Mono.Posix @@ -35,13 +26,13 @@ REF_FRIENDFACE = $(LINK_SYSTEM) $(LINK_GTK) $(LINK_MONO_POSIX) LINK_FRIENDFACE = -r:$(DIR_BIN)/FriendFace.dll LINK_FRIENDFACE_DEPS = $(REF_FRIENDFACE) $(LINK_FRIENDFACE) -REF_SPARKLELIB = $(LINK_SYSTEM) $(LINK_GTK) $(LINK_MONO_POSIX) $(LINK_SMARTIRC4NET) +REF_SPARKLELIB = $(LINK_SYSTEM) $(LINK_MONO_POSIX) $(LINK_SMARTIRC4NET) LINK_SPARKLELIB = -r:$(DIR_BIN)/SparkleLib.dll LINK_SPARKLELIB_DEPS = $(REF_SPARKLELIB) $(LINK_SPARKLELIB) -REF_SPARKLESHARE = $(LINK_DBUS) $(LINK_NOTIFY_SHARP_DEPS) $(LINK_SPARKLELIB_DEPS) +REF_SPARKLESHARE = $(LINK_DBUS) $(LINK_GTK) $(LINK_NOTIFY_SHARP_DEPS) $(LINK_SPARKLELIB_DEPS) -REF_SPARKLEDIFF = $(LINK_FRIENDFACE_DEPS) $(LINK_SPARKLELIB_DEPS) +REF_SPARKLEDIFF = $(LINK_FRIENDFACE_DEPS) $(LINK_GTK) $(LINK_SPARKLELIB_DEPS) # Cute hack to replace a space with something colon:= :