diff options
| author | Owen Fraser-Green <owen@discobabe.net> | 2004-05-15 19:31:12 +0000 |
|---|---|---|
| committer | John Palmieri <johnp@remedyz.boston.redhat.com> | 2006-06-28 08:15:37 -0400 |
| commit | dc5b6ac32fbb020d0e9ee167a7c121ce16c99101 (patch) | |
| tree | 38a8471eecf00b743d5370a6b26882107f4ae2b1 | |
| parent | b0c9b874f538156ce745a1170da15dd1dcb1a8ab (diff) | |
Various mono related changes to facilitate GAC support.
| -rw-r--r-- | mono/AssemblyInfo.cs.in | 6 | ||||
| -rw-r--r-- | mono/Makefile.am | 36 | ||||
| -rw-r--r-- | mono/dbus-sharp.dll.config.in | 4 | ||||
| -rw-r--r-- | mono/example/Makefile.am | 4 |
4 files changed, 38 insertions, 12 deletions
diff --git a/mono/AssemblyInfo.cs.in b/mono/AssemblyInfo.cs.in new file mode 100644 index 0000000..6241b8c --- /dev/null +++ b/mono/AssemblyInfo.cs.in @@ -0,0 +1,6 @@ +using System.Reflection; +using System.Runtime.CompilerServices; + +[assembly:AssemblyVersion("@VERSION@")] +[assembly:AssemblyDelaySign(false)] +[assembly:AssemblyKeyFile("dbus-sharp.snk")] diff --git a/mono/Makefile.am b/mono/Makefile.am index 498d536..4b61816 100644 --- a/mono/Makefile.am +++ b/mono/Makefile.am @@ -1,9 +1,10 @@ DESTDIR= -SUBDIRS=doc +SUBDIRS=. doc example -DLLS=dbus-sharp.dll +TARGET=$(ASSEMBLY) NOINST_EXES=test-dbus-sharp.exe +ASSEMBLY_NAME=dbus-sharp DBUS_SHARP_FILES= \ Arguments.cs \ @@ -43,20 +44,35 @@ DBUS_SHARP_FILES= \ TEST_DBUS_SHARP_FILES=Test.cs -all: $(DLLS) +ASSEMBLY=$(ASSEMBLY_NAME).dll + +DISTCLEANFILES=AssemblyInfo.cs $(ASSEMBLY).config + +all-am: $(TARGET) dbus-sharp.dll: $(DBUS_SHARP_FILES) - $(MCS) $(MCSFLAGS) --unsafe --target library -o dbus-sharp.dll $(DBUS_SHARP_FILES) + $(CSC) --unsafe --target library -o dbus-sharp.dll $(DBUS_SHARP_FILES) AssemblyInfo.cs test-dbus-sharp.exe: $(TEST_DBUS_SHARP_FILES) - $(MCS) $(MCSFLAGS) --unsafe --target exe -L . -r dbus-sharp.dll -r gtk-sharp.dll -o test-dbus-sharp.exe $(TEST_DBUS_SHARP_FILES) + $(CSC) --unsafe --target exe -L . -r dbus-sharp.dll -r gtk-sharp.dll -o test-dbus-sharp.exe $(TEST_DBUS_SHARP_FILES) clean: - rm -f $(DLLS) $(NOINST_EXES) + rm -f $(TARGET) $(NOINST_EXES) -install: all - ../mkinstalldirs $(DESTDIR)$(prefix)/lib && \ - cp $(DLLS) $(DESTDIR)$(prefix)/lib || exit 1 +install-data-local: + @if test -n '$(TARGET)'; then \ + echo "$(GACUTIL) /i $(ASSEMBLY) /f /package dbus-sharp /root $(DESTDIR)$(libdir)"; \ + $(GACUTIL) /i $(ASSEMBLY) /f /package dbus-sharp /root $(DESTDIR)$(libdir) || exit 1; \ + fi -EXTRA_DIST=$(DBUS_SHARP_FILES) +uninstall-local: + @if test -n '$(TARGET)'; then \ + echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package dbus-sharp /root $(DESTDIR)$(libdir)"; \ + $(GACUTIL) /u $(ASSEMBLY_NAME) /package dbus-sharp /root $(DESTDIR)$(libdir) || exit 1; \ + fi +EXTRA_DIST= \ + $(DBUS_SHARP_FILES) \ + AssemblyInfo.cs.in \ + $(ASSEMBLY).config.in \ + dbus-sharp.snk diff --git a/mono/dbus-sharp.dll.config.in b/mono/dbus-sharp.dll.config.in new file mode 100644 index 0000000..d40afcd --- /dev/null +++ b/mono/dbus-sharp.dll.config.in @@ -0,0 +1,4 @@ +<configuration> + <dllmap dll="dbus-1" target="libdbus-1@LIB_PREFIX@.0@LIB_SUFFIX@"/> + <dllmap dll="dbus-glib-1" target="libdbus-glib-1@LIB_PREFIX@.0@LIB_SUFFIX@"/> +</configuration> diff --git a/mono/example/Makefile.am b/mono/example/Makefile.am index 2355bf3..e7fd9b6 100644 --- a/mono/example/Makefile.am +++ b/mono/example/Makefile.am @@ -5,10 +5,10 @@ NOINST_EXES=echo-server.exe echo-client.exe all: $(NOINST_EXES) echo-server.exe: EchoServer.cs Echoer.cs - $(MCS) $(MCSFLAGS) --unsafe --target exe -L .. -r dbus-sharp.dll -r gtk-sharp -o echo-server.exe EchoServer.cs Echoer.cs + $(CSC) --target exe -L .. -r:../dbus-sharp.dll -r gtk-sharp -o echo-server.exe EchoServer.cs Echoer.cs echo-client.exe: EchoClient.cs Echoer.cs - $(MCS) $(MCSFLAGS) --unsafe --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 EchoClient.cs Echoer.cs clean: rm -f $(NOINST_EXES) |