capuchin r72 - in trunk: . dbus-sharp examples src/capuchin src/libcapuchin
- From: sebp svn gnome org
- To: svn-commits-list gnome org
- Subject: capuchin r72 - in trunk: . dbus-sharp examples src/capuchin src/libcapuchin
- Date: Sun, 16 Mar 2008 17:36:40 +0000 (GMT)
Author: sebp
Date: Sun Mar 16 17:36:40 2008
New Revision: 72
URL: http://svn.gnome.org/viewvc/capuchin?rev=72&view=rev
Log:
Removed internal dbus-sharp copy
Removed:
trunk/dbus-sharp/
Modified:
trunk/Makefile.am
trunk/configure.ac
trunk/examples/Makefile.am
trunk/src/capuchin/Makefile.am
trunk/src/libcapuchin/Makefile.am
Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am (original)
+++ trunk/Makefile.am Sun Mar 16 17:36:40 2008
@@ -1,8 +1,4 @@
-SUBDIRS = data
-if ENABLE_INTERNAL_NDESKDBUS
-SUBDIRS += dbus-sharp
-endif
-SUBDIRS += src
+SUBDIRS = data src
if WITH_EXAMPLES
SUBDIRS += examples
endif
Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Sun Mar 16 17:36:40 2008
@@ -56,29 +56,9 @@
dnl ****************************************************************************
dnl * ndesk-dbus
dnl ****************************************************************************
-AC_ARG_ENABLE([internal-dbus], AC_HELP_STRING([--enable-internal-dbus], [Use internal ndesk-dbus library (default: auto)]),
-enable_internal_ndeskdbus=$enableval, enable_internal_ndeskdbus=auto)
-
NDESKDBUS_REQUIRED_VERSION=0.5.2
PKG_CHECK_MODULES(NDESKDBUS, ndesk-dbus-1.0 >= $NDESKDBUS_REQUIRED_VERSION, has_ndeskdbus=yes, has_ndeskdbus=no)
-if test "x$has_ndeskdbus" = "xno"; then
- if test "x$enable_internal_ndeskdbus" = "xno"; then
- AC_MSG_ERROR([Could not find ndesk-dbus library])
- fi
- enable_internal_ndeskdbus="yes"
- NDESKDBUS_LIBS="dbus-sharp/NDesk.DBus.dll"
-else
- if test "x$enable_internal_ndeskdbus" = "xyes"; then
- enable_internal_ndeskdbus="yes"
- NDESKDBUS_LIBS= "dbus-sharp/NDesk.DBus.dll"
- else
- enable_internal_ndeskdbus="no"
- fi
-fi
-AM_CONDITIONAL(ENABLE_INTERNAL_NDESKDBUS, test "x$enable_internal_ndeskdbus" = "xyes")
-AC_SUBST(NDESKDBUS_LIBS)
-
dnl ****************************************************************************
dnl * Check for DBUS Services directory
dnl ****************************************************************************
@@ -91,7 +71,6 @@
AC_OUTPUT([
Makefile
data/Makefile
-dbus-sharp/Makefile
examples/Makefile
capuchin-sharp.pc
src/Makefile
@@ -112,5 +91,4 @@
Mono C# Compiler: ${GMCS}
Mono Runtime: ${MONO}
- Use internal D-Bus library: ${enable_internal_ndeskdbus}
"
Modified: trunk/examples/Makefile.am
==============================================================================
--- trunk/examples/Makefile.am (original)
+++ trunk/examples/Makefile.am Sun Mar 16 17:36:40 2008
@@ -12,13 +12,8 @@
REFERENCES = \
-r:$(top_srcdir)/src/libcapuchin/capuchin-sharp.dll \
- $(GTKSHARP_LIBS)
-
-if ENABLE_INTERNAL_NDESKDBUS
-REFERENCES += -r:$(top_srcdir)/$(NDESKDBUS_LIBS)
-else
-REFERENCES += $(NDESKDBUS_LIBS)
-endif
+ $(GTKSHARP_LIBS) \
+ $(NDESKDBUS_LIBS)
testapp.exe: $(testapp_csharp_build_sources) $(resources)
$(GMCS) $(REFERENCES) $(embedded) -out:$@ $(testapp_csharp_build_sources)
Modified: trunk/src/capuchin/Makefile.am
==============================================================================
--- trunk/src/capuchin/Makefile.am (original)
+++ trunk/src/capuchin/Makefile.am Sun Mar 16 17:36:40 2008
@@ -14,13 +14,8 @@
REFERENCES = \
-r:../libcapuchin/capuchin-sharp.dll \
-r:Mono.GetOptions \
- $(GTKSHARP_LIBS)
-
-if ENABLE_INTERNAL_NDESKDBUS
-REFERENCES += -r:$(top_srcdir)/$(NDESKDBUS_LIBS)
-else
-REFERENCES += $(NDESKDBUS_LIBS)
-endif
+ $(GTKSHARP_LIBS) \
+ $(NDESKDBUS_LIBS)
capuchin.exe: $(capuchin_build_sources) $(resources)
$(GMCS) $(REFERENCES) $(embedded) -out:$@ $(capuchin_build_sources)
Modified: trunk/src/libcapuchin/Makefile.am
==============================================================================
--- trunk/src/libcapuchin/Makefile.am (original)
+++ trunk/src/libcapuchin/Makefile.am Sun Mar 16 17:36:40 2008
@@ -43,13 +43,8 @@
-r:System.Xml \
-r:ICSharpCode.SharpZipLib \
-r:Mono.Posix \
- $(GNOMEVFSSHARP_LIBS)
-
-if ENABLE_INTERNAL_NDESKDBUS
-REFERENCES += -r:$(top_srcdir)/$(NDESKDBUS_LIBS)
-else
-REFERENCES += $(NDESKDBUS_LIBS)
-endif
+ $(GNOMEVFSSHARP_LIBS) \
+ $(NDESKDBUS_LIBS)
libcapuchin_build_sources = $(addprefix $(srcdir)/, $(libcapuchin_sources))
libcapuchin_build_sources += $(libcapuchin_generated_sources)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]