Various mono related changes to facilitate GAC support.

5 files changed, 38 insertions, 12 deletions

diff --git a/mono/AssemblyInfo.cs.in b/mono/AssemblyInfo.cs.in
new file mode 100644
index 00000000..6241b8c7
--- /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 498d5367..4b61816b 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 00000000..d40afcda
--- /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/dbus-sharp.snk b/mono/dbus-sharp.snk
new file mode 100644
index 00000000..b28b3935
--- /dev/null
+++ b/mono/dbus-sharp.snk
diff --git a/mono/example/Makefile.am b/mono/example/Makefile.am
index 2355bf31..e7fd9b6a 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)