From fd34b1779ed2ee23e8483aedbaf350d357847e5f Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@hocevar.net>
Date: Fri, 31 Oct 2008 00:21:04 +0000
Subject: [PATCH] caca-sharp: improve install and uninstall rules, add a strong
 name key to allow third-party applications to link with caca-sharp, and tune
 a few things here and there.

---
 caca-sharp/Makefile.am    |  38 ++++++++++++++++++++++++++------------
 caca-sharp/caca-sharp.snk | Bin 0 -> 596 bytes
 2 files changed, 26 insertions(+), 12 deletions(-)
 create mode 100644 caca-sharp/caca-sharp.snk

diff --git a/caca-sharp/Makefile.am b/caca-sharp/Makefile.am
index babf863..3dc0d55 100644
--- a/caca-sharp/Makefile.am
+++ b/caca-sharp/Makefile.am
@@ -1,6 +1,11 @@
 # $Id: $
 
-cacadir = $(libdir)/caca-sharp
+# We need to install the .config file ourselves because of a gacutil
+# bug (https://bugzilla.novell.com/show_bug.cgi?id=363341)
+monodir = $(libdir)/mono/caca-sharp-0.0
+if USE_CSHARP
+noinst_DATA = caca-sharp.dll caca-sharp.dll.config test.exe
+endif
 
 caca_sources = \
 	$(srcdir)/AssemblyInfo.cs \
@@ -15,23 +20,32 @@ caca_sources = \
 test_sources = \
 	$(srcdir)/test.cs
 
-if USE_CSHARP
-caca_DATA = caca-sharp.dll caca-sharp.dll.config
-noinst_DATA = test.exe
-endif
-
 EXTRA_DIST = $(caca_sources) $(test_sources) \
-             caca-sharp.dll.config.in \
-             caca-sharp.csproj test-csharp.csproj
+	caca-sharp.snk caca-sharp.pc.in caca-sharp.dll.config.in \
+	caca-sharp.csproj test-csharp.csproj
 
 caca-sharp.dll: $(caca_sources)
-	gmcs -unsafe $(caca_sources) -out:$@ -target:library \
-	  -r:System.Drawing.dll
+	$(GMCS) -debug -unsafe $(caca_sources) -out:$@ -target:library \
+	  -keyfile:$(srcdir)/caca-sharp.snk -r:System.Drawing.dll
 
 test.exe: $(test_sources) caca-sharp.dll
-	gmcs $(test_sources) -out:$@ -lib:./ \
+	$(GMCS) -debug $(test_sources) -out:$@ -lib:./ \
 	  -r:System.Drawing.dll -r:./caca-sharp.dll
 
+if USE_CSHARP
+install-data-local:
+	MONO_SHARED_DIR=$$HOME $(GACUTIL) -i caca-sharp.dll \
+	  -package caca-sharp-0.0 -f -root $(DESTDIR)$(libdir)
+	$(mkinstalldirs) $(DESTDIR)$(monodir)
+	sed -e 's@target="[^"]*/@target="@' < caca-sharp.dll.config > $(DESTDIR)$(monodir)/caca-sharp.dll.config
+
+uninstall-local:
+	MONO_SHARED_DIR=$$HOME $(GACUTIL) -u caca-sharp.dll, Version=0.0 \
+	  -package caca-sharp-0.0 || true
+	rm -f $(DESTDIR)$(monodir)/caca-sharp.dll.config
+	rmdir $(DESTDIR)$(monodir) 2>/dev/null || true
+endif
+
 clean-local:
-	rm -f *.exe *.dll
+	rm -f *.exe *.dll *.mdb
 
diff --git a/caca-sharp/caca-sharp.snk b/caca-sharp/caca-sharp.snk
new file mode 100644
index 0000000000000000000000000000000000000000..347833054b40f5629f13bbfd1b7155aaedce0367
GIT binary patch
literal 596
zcmV-a0;~N80ssI2Bme+XQ$aES1ONaL0002hw-UB@TF|&GbpJ5dw%i~Olc|mjZyS`g
z2p#se|E*_w=uoDG(NyhEET%@cp|NF6GMnoLyeq6}wY9Me6VbB+U?F>^WfR56u1!LI
zme2VS@F>eFqL*WLRDLi=`L=ihFm#K<+j#rv#AG4$^Ca46X;{wPr0OB)^QvrgO&N~)
zvb>kTI9z~lpdU4#Ib0R}F_K+See9g7;BZgO64ioiPgCG}<x~S6QNjYXHH|Az!Eg_k
zJVsuUx2>Sd<Z$)9#)d~*jt@FL=DI{3Z$+cOgDZ!esm*i*0%^+|NYs>n>uNs4Xt>dh
zznF`?RL7idmdZR+n>xwxcWPurMmCgL<F^YjHvw_iqZGcuplYcsW3W9P7KHBba+{>O
zZ20))?@HW4?Eh&a;kZ0&`X_*un#d7^-GuTt^Jyz!C{QcOR$g`ak8*8|r6S$7o9sdO
z#YPic`gjOzJ+_8D{hDT_r~+_v5Cb6y%SwN5$owBrD|gru5V_F0a}hfz{4Q5a$w7xJ
zlOYXCo#+$)4U0D9D1=<5KOZ8fBv_I$0Y7dQ%j@m@?M#Kv`6F_NiPY)}y3eEHe*N+x
zYl%X(&*e99;ZF8%=2Nt^3S)LN<qe=ua41#j0X3!{HhC4A`QjnR8M*RmrsFcbLa26I
z=M^-IQQCjXQ${W)#o1(N2{%>KQh=nN%s>!6M-qtessndG{A0$xyfWM06L=bH{u|Le
i{J;@CyJvUYwHHLtqWRcGk=T2G+uZ4aS4Pf+U2h?Jp(7js

literal 0
HcmV?d00001