beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Attempt to merge the smartirc4net references into single build reference

Browse source
This commit is contained in:
Alex Hudson 2011-06-13 13:27:48 +01:00
parent cc8a1d6860
commit a5cf9d3bed
4 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Makefile.am
View file

@ -1,14 +1,15 @@
SUBDIRS = \ SUBDIRS = \
build \ build \
help \ help \
${SPARKLE_SMARTIRC4NETDIR} \ SmartIrc4net \
SparkleLib \ SparkleLib \
SparkleShare \ SparkleShare \
data \ data \
po po
EXTRA_DIST = gnome-doc-utils.make \ EXTRA_DIST = \
LICENSE gnome-doc-utils.make \
LICENSE
DISTCLEANFILES = \ DISTCLEANFILES = \
intltool-extract \ intltool-extract \

7
SparkleLib/Makefile.am
View file

@ -1,8 +1,11 @@
ASSEMBLY = SparkleLib ASSEMBLY = SparkleLib
TARGET = library TARGET = library
LINK = $(REF_SPARKLELIB) if HAVE_SMARTIRC4NET
LINK = $(REF_SPARKLELIB) $(LINK_SMARTIRC4NET_SYSTEM)
else
LINK = $(REF_SPARKLELIB) $(LINK_SMARTIRC4NET_LOCAL)
endif
SOURCES = \ SOURCES = \
Defines.cs \ Defines.cs \

4
build/build.environment.mk
View file

@ -15,7 +15,7 @@ LINK_GTK = $(GTKSHARP_LIBS)
LINK_GNOME = $(GNOME_SHARP_LIBS) LINK_GNOME = $(GNOME_SHARP_LIBS)
LINK_DBUS = $(NDESK_DBUS_LIBS) $(NDESK_DBUS_GLIB_LIBS) LINK_DBUS = $(NDESK_DBUS_LIBS) $(NDESK_DBUS_GLIB_LIBS)
LINK_DBUS_NO_GLIB = $(NDESK_DBUS_LIBS) LINK_DBUS_NO_GLIB = $(NDESK_DBUS_LIBS)
LINK_SMARTIRC4NET = $(SMARTIRC4NET_LIBS) LINK_SMARTIRC4NET_SYSTEM = $(SMARTIRC4NET_LIBS)
LINK_SMARTIRC4NET_LOCAL = -r:$(abs_top_builddir)/$(SMARTIRC4NET_ASSEMBLY) LINK_SMARTIRC4NET_LOCAL = -r:$(abs_top_builddir)/$(SMARTIRC4NET_ASSEMBLY)
REF_NOTIFY_SHARP = $(LINK_SYSTEM) $(LINK_DBUS) $(GTKSHARP_LIBS) $(GLIBSHARP_LIBS) REF_NOTIFY_SHARP = $(LINK_SYSTEM) $(LINK_DBUS) $(GTKSHARP_LIBS) $(GLIBSHARP_LIBS)
@ -26,7 +26,7 @@ REF_FRIENDFACE = $(LINK_SYSTEM) $(LINK_GTK) $(LINK_MONO_POSIX)
LINK_FRIENDFACE = -r:$(DIR_BIN)/FriendFace.dll LINK_FRIENDFACE = -r:$(DIR_BIN)/FriendFace.dll
LINK_FRIENDFACE_DEPS = $(REF_FRIENDFACE) $(LINK_FRIENDFACE) LINK_FRIENDFACE_DEPS = $(REF_FRIENDFACE) $(LINK_FRIENDFACE)
REF_SPARKLELIB = $(LINK_SYSTEM) $(LINK_MONO_POSIX) $(LINK_SMARTIRC4NET) $(LINK_SMARTIRC4NET_LOCAL) REF_SPARKLELIB = $(LINK_SYSTEM) $(LINK_MONO_POSIX)
LINK_SPARKLELIB = -r:$(DIR_BIN)/SparkleLib.dll LINK_SPARKLELIB = -r:$(DIR_BIN)/SparkleLib.dll
LINK_SPARKLELIB_DEPS = $(REF_SPARKLELIB) $(LINK_SPARKLELIB) LINK_SPARKLELIB_DEPS = $(REF_SPARKLELIB) $(LINK_SPARKLELIB)

7
configure.ac
View file

@ -79,15 +79,16 @@ dnl package checks, common for all configs
SPARKLESHARE_CHECK_GTK_SHARP SPARKLESHARE_CHECK_GTK_SHARP
SPARKLESHARE_SMARTIRC4NET
PKG_CHECK_MODULES([SMARTIRC4NET], [smartirc4net], PKG_CHECK_MODULES([SMARTIRC4NET], [smartirc4net],
SPARKLE_SMARTIRC4NETDIR="" SMARTIRC4NET_ASSEMBLY=""
AC_SUBST(SMARTIRC4NET_ASSEMBLY)
, ,
SPARKLESHARE_SMARTIRC4NET
SMARTIRC4NET_LIBS="" SMARTIRC4NET_LIBS=""
AC_SUBST(SMARTIRC4NET_LIBS) AC_SUBST(SMARTIRC4NET_LIBS)
SPARKLE_SMARTIRC4NETDIR="SmartIrc4net"
AC_SUBST(SPARKLE_SMARTIRC4NETDIR) AC_SUBST(SPARKLE_SMARTIRC4NETDIR)
) )
AM_CONDITIONAL(HAVE_SMARTIRC4NET, test x$SPARKLE_SMARTIRC4NETDIR = x)
dnl check for webkit-sharp dnl check for webkit-sharp
PKG_CHECK_MODULES(WEBKIT_SHARP, webkit-sharp-1.0, have_webkit_sharp=yes, have_webkit_sharp=no) PKG_CHECK_MODULES(WEBKIT_SHARP, webkit-sharp-1.0, have_webkit_sharp=yes, have_webkit_sharp=no)