dbus/mono AssemblyInfo.cs.in, NONE, 1.1 dbus-sharp.dll.config.in, NONE, 1.1 dbus-sharp.snk, NONE, 1.1 Makefile.am, 1.7, 1.8

[Owen Fraser-Green]

Update of /cvs/dbus/dbus/mono
In directory pdx:/tmp/cvs-serv14045/mono

Modified Files:
	Makefile.am 
Added Files:
	AssemblyInfo.cs.in dbus-sharp.dll.config.in dbus-sharp.snk 
Log Message:
Various mono related changes to facilitate GAC support.


--- NEW FILE: AssemblyInfo.cs.in ---
using System.Reflection;
using System.Runtime.CompilerServices;
 
[assembly:AssemblyVersion("@VERSION@")]
[assembly:AssemblyDelaySign(false)]
[assembly:AssemblyKeyFile("dbus-sharp.snk")]

--- NEW FILE: dbus-sharp.dll.config.in ---
<configuration>
  <dllmap dll="dbus-1" target="libdbus-1 at LIB_PREFIX@.0 at LIB_SUFFIX@"/>
  <dllmap dll="dbus-glib-1" target="libdbus-glib-1 at LIB_PREFIX@.0 at LIB_SUFFIX@"/>
</configuration>

--- NEW FILE: dbus-sharp.snk ---

…\ŠÉÁòBþòÖgôRǼ"˜X¦~À´Øîd»á$Þæ~¼‘ú?ˆxyöãm^³Óû/^h®UäQÞ£ø{‰a
jôœHÎé!””¬kw²7|‹ÞZ)”åHÕ¥³ÑøÕê^N"–å}<>òÙx$÷)aѯ»yª·È8Ž|ìŽ\2¸…wEAtççÄ\1û!JÓi­¦ÀøoKVt”ºÃ’âËXˆ«øR®Tr©Bþ¿}(]ÌÚx™Úe
Index: Makefile.am
===================================================================
RCS file: /cvs/dbus/dbus/mono/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- a/Makefile.am	15 May 2004 11:37:59 -0000	1.7
+++ b/Makefile.am	15 May 2004 19:31:12 -0000	1.8
@@ -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 @@
 
 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