From 26815082880b0392a4d3476a6b0d00a5cb23d2c4 Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@hocevar.net>
Date: Mon, 26 Nov 2007 01:04:25 +0000
Subject: [PATCH]   * Install CLI bindings to $(libdir)/cucul-sharp and
 $(libdir)/caca-sharp.

---
 configure.ac       |  3 ++-
 csharp/Makefile.am | 29 ++++++++++++++++++-----------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/configure.ac b/configure.ac
index af83090..5f267d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -334,7 +334,8 @@ AM_CONDITIONAL(USE_CXX, test "${ac_cv_my_have_cxx}" = "yes")
 ac_cv_my_have_csharp="no"
 if test "${enable_csharp}" != "no"; then
   AC_PATH_PROG(GMCS, gmcs, no)
-  if test "${GMCS}" != "no"; then
+  AC_PATH_PROG(GACUTIL, gacutil, no)
+  if test "${GMCS}" != "no" -a "${GACUTIL}" != "no"; then
     ac_cv_my_have_csharp="yes"
     CACA_BINDINGS="${CACA_BINDINGS} C#"
   fi
diff --git a/csharp/Makefile.am b/csharp/Makefile.am
index 7362a93..9bad13e 100644
--- a/csharp/Makefile.am
+++ b/csharp/Makefile.am
@@ -1,24 +1,31 @@
 # $Id: $
 
+cuculdir = $(libdir)/cucul-sharp
+cacadir = $(libdir)/caca-sharp
+
+cucul_sources = AssemblyInfo.cs Cucul.cs
+caca_sources = AssemblyInfo.cs Caca.cs
+
 if USE_CSHARP
-noinst_DATA = cucul-sharp.dll caca-sharp.dll test.exe
+cucul_DATA = cucul-sharp.dll cucul-sharp.dll.config
+caca_DATA = caca-sharp.dll caca-sharp.dll.config
+noinst_DATA = test.exe
 endif
 
-EXTRA_DIST = AssemblyInfo.cs \
-             Cucul.cs \
-             Caca.cs \
-             cucul-sharp.dll.config \
-             caca-sharp.dll.config \
+EXTRA_DIST = $(cucul_sources) cucul-sharp.dll.config \
+             $(caca_sources) caca-sharp.dll.config \
              test.cs
 
-cucul-sharp.dll: AssemblyInfo.cs Cucul.cs
-	gmcs $^ -out:$@ -target:library  -unsafe
+cucul-sharp.dll: $(cucul_sources)
+	gmcs $(cucul_sources) -out:$@ -target:library  -unsafe
 
-caca-sharp.dll: AssemblyInfo.cs Caca.cs
-	gmcs $^ -out:$@ -target:library -r:./cucul-sharp.dll -lib:./ -unsafe
+caca-sharp.dll: $(caca_sources) cucul-sharp.dll
+	gmcs $(caca_sources) -out:$@ -target:library \
+	     -r:./cucul-sharp.dll -lib:./ -unsafe
 
 test.exe: test.cs caca-sharp.dll cucul-sharp.dll
-	gmcs test.cs -out:$@ -r:./cucul-sharp.dll -r:./caca-sharp.dll -lib:./ -unsafe
+	gmcs test.cs -out:$@ \
+	     -r:./cucul-sharp.dll -r:./caca-sharp.dll -lib:./ -unsafe
 
 clean-local:
 	rm -f *.exe *.dll