diff options
-rw-r--r-- | ChangeLog | 14 | ||||
-rw-r--r-- | mono/AssemblyInfo.cs.in | 2 | ||||
-rw-r--r-- | mono/Makefile.am | 79 | ||||
-rw-r--r-- | mono/example/Makefile.am | 5 | ||||
-rw-r--r-- | test/Makefile.am | 2 |
5 files changed, 59 insertions, 43 deletions
@@ -1,3 +1,17 @@ +2004-09-20 Jon Trowbridge <trow@ximian.com> + + Patch from Nat Friedman <nat@novell.com> + + * mono/Makefile.am: A number of small build fixes to allow "make + distcheck" to succeed. + + * mono/example/Makefile.am: "make distcheck" fixes. + + * mono/AssemblyInfo.cs.in: When signing the assembly, look for the + key in @srcdir@. + + * test/Makefile.am: "make distcheck" fixes. + 2004-09-17 Olivier Andrieu <oliv__a@users.sourceforge.net> * dbus/dbus-sysdeps.c (_dbus_user_at_console): fix memleak in OOM. diff --git a/mono/AssemblyInfo.cs.in b/mono/AssemblyInfo.cs.in index 6241b8c7..ae231892 100644 --- a/mono/AssemblyInfo.cs.in +++ b/mono/AssemblyInfo.cs.in @@ -3,4 +3,4 @@ using System.Runtime.CompilerServices; [assembly:AssemblyVersion("@VERSION@")] [assembly:AssemblyDelaySign(false)] -[assembly:AssemblyKeyFile("dbus-sharp.snk")] +[assembly:AssemblyKeyFile("@srcdir@/dbus-sharp.snk")] diff --git a/mono/Makefile.am b/mono/Makefile.am index 1d19ec01..1d681ee0 100644 --- a/mono/Makefile.am +++ b/mono/Makefile.am @@ -5,49 +5,50 @@ SUBDIRS=. doc example TARGET=$(ASSEMBLY) NOINST_EXES=test-dbus-sharp.exe ASSEMBLY_NAME=dbus-sharp +GACUTIL=gacutil -DBUS_SHARP_FILES= \ - Arguments.cs \ - Bus.cs \ - BusDriver.cs \ - Connection.cs \ - Custom.cs \ - DBusException.cs \ - Error.cs \ - ErrorMessage.cs \ - Handler.cs \ - InterfaceAttribute.cs \ - InterfaceProxy.cs \ - Introspector.cs \ - Message.cs \ - MethodAttribute.cs \ - MethodCall.cs \ - MethodReturn.cs \ - ProxyBuilder.cs \ - Server.cs \ - Service.cs \ - Signal.cs \ - SignalAttribute.cs \ - DBusType/IDBusType.cs \ - DBusType/Array.cs \ - DBusType/Boolean.cs \ - DBusType/Byte.cs \ - DBusType/Custom.cs \ - DBusType/Dict.cs \ - DBusType/Double.cs \ - DBusType/Int32.cs \ - DBusType/Int64.cs \ - DBusType/Nil.cs \ - DBusType/ObjectPath.cs \ - DBusType/String.cs \ - DBusType/UInt32.cs \ - DBusType/UInt64.cs +DBUS_SHARP_FILES= \ + $(srcdir)/Arguments.cs \ + $(srcdir)/Bus.cs \ + $(srcdir)/BusDriver.cs \ + $(srcdir)/Connection.cs \ + $(srcdir)/Custom.cs \ + $(srcdir)/DBusException.cs \ + $(srcdir)/Error.cs \ + $(srcdir)/ErrorMessage.cs \ + $(srcdir)/Handler.cs \ + $(srcdir)/InterfaceAttribute.cs \ + $(srcdir)/InterfaceProxy.cs \ + $(srcdir)/Introspector.cs \ + $(srcdir)/Message.cs \ + $(srcdir)/MethodAttribute.cs \ + $(srcdir)/MethodCall.cs \ + $(srcdir)/MethodReturn.cs \ + $(srcdir)/ProxyBuilder.cs \ + $(srcdir)/Server.cs \ + $(srcdir)/Service.cs \ + $(srcdir)/Signal.cs \ + $(srcdir)/SignalAttribute.cs \ + $(srcdir)/DBusType/IDBusType.cs \ + $(srcdir)/DBusType/Array.cs \ + $(srcdir)/DBusType/Boolean.cs \ + $(srcdir)/DBusType/Byte.cs \ + $(srcdir)/DBusType/Custom.cs \ + $(srcdir)/DBusType/Dict.cs \ + $(srcdir)/DBusType/Double.cs \ + $(srcdir)/DBusType/Int32.cs \ + $(srcdir)/DBusType/Int64.cs \ + $(srcdir)/DBusType/Nil.cs \ + $(srcdir)/DBusType/ObjectPath.cs \ + $(srcdir)/DBusType/String.cs \ + $(srcdir)/DBusType/UInt32.cs \ + $(srcdir)/DBusType/UInt64.cs TEST_DBUS_SHARP_FILES=Test.cs ASSEMBLY=$(ASSEMBLY_NAME).dll -DISTCLEANFILES=AssemblyInfo.cs $(ASSEMBLY).config +DISTCLEANFILES=AssemblyInfo.cs $(ASSEMBLY).config $(ASSEMBLY) all-am: $(TARGET) @@ -63,13 +64,13 @@ clean: install-data-local: @if test -n '$(TARGET)'; then \ echo "$(GACUTIL) /i $(ASSEMBLY) /f /package dbus-sharp /gacdir $(DESTDIR)$(libdir)"; \ - $(GACUTIL) /i $(ASSEMBLY) /f /package dbus-sharp /gacdir $(DESTDIR)$(libdir) || exit 1; \ + $(GACUTIL) /i $(ASSEMBLY) /f /package dbus-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir) || exit 1; \ fi uninstall-local: @if test -n '$(TARGET)'; then \ echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package dbus-sharp /gacdir $(DESTDIR)$(libdir)"; \ - $(GACUTIL) /u $(ASSEMBLY_NAME) /package dbus-sharp /gacdir $(DESTDIR)$(libdir) || exit 1; \ + $(GACUTIL) /u $(ASSEMBLY_NAME) /package dbus-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir) || exit 1; \ fi EXTRA_DIST= \ diff --git a/mono/example/Makefile.am b/mono/example/Makefile.am index 65a466a6..d5a29127 100644 --- a/mono/example/Makefile.am +++ b/mono/example/Makefile.am @@ -1,14 +1,15 @@ DESTDIR= NOINST_EXES=echo-server.exe echo-client.exe +DISTCLEANFILES=$(NOINST_EXES) all: $(NOINST_EXES) echo-server.exe: EchoServer.cs Echoer.cs - $(CSC) --target exe -L .. -r:../dbus-sharp.dll -pkg:gtk-sharp -o echo-server.exe EchoServer.cs Echoer.cs + $(CSC) --target exe -L .. -r:../dbus-sharp.dll -pkg:gtk-sharp -o echo-server.exe $(srcdir)/EchoServer.cs $(srcdir)/Echoer.cs echo-client.exe: EchoClient.cs Echoer.cs - $(CSC) --target exe -L .. -r:../dbus-sharp.dll -o echo-client.exe EchoClient.cs Echoer.cs + $(CSC) --target exe -L .. -r:../dbus-sharp.dll -o echo-client.exe $(srcdir)/EchoClient.cs $(srcdir)/Echoer.cs clean: rm -f $(NOINST_EXES) diff --git a/test/Makefile.am b/test/Makefile.am index 86cd93d8..0579e7f8 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -84,7 +84,7 @@ dist-hook: FILES=`(cd $(srcdir) && $(FIND_TESTS) -o -name "*.in" -a -not -name Makefile.in)` ; \ for F in $$FILES; do \ echo '-- Disting file '$$F ; \ - cp $(srcdir)/$$F $(distdir)/$$F || exit 1 ; \ + cp -f $(srcdir)/$$F $(distdir)/$$F || exit 1 ; \ done ## copy tests to builddir so that generated tests and static tests |