capuchin r53 - in trunk: examples src/capuchin src/libcapuchin

[sebp svn gnome org]

Author: sebp
Date: Fri Mar  7 18:38:46 2008
New Revision: 53
URL: http://svn.gnome.org/viewvc/capuchin?rev=53&view=rev

Log:
Fixed build error when not using internal ndesk dbus

Modified:
   trunk/examples/Makefile.am
   trunk/src/capuchin/Makefile.am
   trunk/src/libcapuchin/Makefile.am

Modified: trunk/examples/Makefile.am
==============================================================================
--- trunk/examples/Makefile.am	(original)
+++ trunk/examples/Makefile.am	Fri Mar  7 18:38:46 2008
@@ -12,9 +12,14 @@
 
 REFERENCES = \
     -r:$(top_srcdir)/src/libcapuchin/capuchin-sharp.dll \
-    -r:$(top_srcdir)/$(NDESKDBUS_LIBS) \
     $(GTKSHARP_LIBS)
 
+if ENABLE_INTERNAL_NDESKDBUS
+REFERENCES += -r:$(top_srcdir)/$(NDESKDBUS_LIBS)
+else
+REFERENCES += $(NDESKDBUS_LIBS)
+endif
+
 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	Fri Mar  7 18:38:46 2008
@@ -14,9 +14,14 @@
 REFERENCES = \
     -r:../libcapuchin/capuchin-sharp.dll \
     -r:Mono.GetOptions \
-    -r:$(top_srcdir)/$(NDESKDBUS_LIBS) \
     $(GTKSHARP_LIBS)
 
+if ENABLE_INTERNAL_NDESKDBUS
+REFERENCES += -r:$(top_srcdir)/$(NDESKDBUS_LIBS)
+else
+REFERENCES += $(NDESKDBUS_LIBS)
+endif
+
 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	Fri Mar  7 18:38:46 2008
@@ -37,9 +37,14 @@
 	-r:System.Xml \
 	-r:ICSharpCode.SharpZipLib \
 	-r:Mono.Posix \
-	-r:$(top_srcdir)/$(NDESKDBUS_LIBS) \
 	$(GNOMEVFSSHARP_LIBS)
 
+if ENABLE_INTERNAL_NDESKDBUS
+REFERENCES += -r:$(top_srcdir)/$(NDESKDBUS_LIBS)
+else
+REFERENCES += $(NDESKDBUS_LIBS)
+endif
+
 libcapuchin_build_sources = $(addprefix $(srcdir)/, $(libcapuchin_sources))
 libcapuchin_build_sources += $(libcapuchin_generated_sources)