From: Stephane Delcroix <stephane@delcroix.org>
Date: Fri, 13 Feb 2009 20:58:16 +0000 (+0100)
Subject: fixing the Makefiles, making it build
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed11560149af081de32007ccefe93766864000e1;p=libchamplain

fixing the Makefiles, making it build
---

diff --git a/bindings/managed/Makefile.include b/bindings/managed/Makefile.include
index 0eeb96c..dbf7254 100644
--- a/bindings/managed/Makefile.include
+++ b/bindings/managed/Makefile.include
@@ -27,7 +27,7 @@ $(CHAMPLAIN_FIXED_API):
 	$(GAPI_CODEGEN) --outdir=./generated --customdir=. $(api_includes) --generate $(CHAMPLAIN_FIXED_API)
 
 champlain-sharp.snk:
-	cp $(top_builddir)/champlain-sharp.snk .
+	cp $(top_builddir)/bindings/managed/champlain-sharp.snk .
 
 $(ASSEMBLY): $(CHAMPLAIN_FIXED_API) $(sources) champlain-sharp.snk
 	@rm -f $(ASSEMBLY).mdb
diff --git a/bindings/managed/champlain-gtk/Makefile.am b/bindings/managed/champlain-gtk/Makefile.am
index 220c43f..5aa7498 100644
--- a/bindings/managed/champlain-gtk/Makefile.am
+++ b/bindings/managed/champlain-gtk/Makefile.am
@@ -9,8 +9,8 @@ ASSEMBLY = champlain-gtk-sharp.dll
 TARGET = $(ASSEMBLY) $(ASSEMBLY).config
 
 custom_extradist= champlain-gtk-sharp.pc.in champlain-gtk-sharp.dll.config.in
-custom_api_includes=../champlain-cil/champlain-api.xml
-custom_references=-r:../champlain-cil/champlain-sharp.dll
+custom_api_includes=../champlain/champlain-api.xml
+custom_references=-r:../champlain/champlain-sharp.dll
 
 sources =
 #	$(srcdir)/Timeout.cs
diff --git a/bindings/managed/samples/Makefile.am b/bindings/managed/samples/Makefile.am
index 4dc51fe..27754aa 100644
--- a/bindings/managed/samples/Makefile.am
+++ b/bindings/managed/samples/Makefile.am
@@ -17,11 +17,11 @@ noinst_SCRIPTS=$(SAMPLES:.cs=.exe)
 %.exe: %.cs $(assemblies)
 	$(MCS) $(MCSFLAGS) $(GTKSHARP_LIBS) -out:$@ $<
 
-champlain-sharp.dll: $(top_builddir)/champlain-cil/champlain-sharp.dll
-	cp $(top_builddir)/champlain-cil/champlain-sharp.dll* .
+champlain-sharp.dll: $(top_builddir)/bindings/managed/champlain/champlain-sharp.dll
+	cp $(top_builddir)/bindings/managed/champlain/champlain-sharp.dll* .
 
-champlain-gtk-sharp.dll: $(top_builddir)/champlain-gtk-cil/champlain-gtk-sharp.dll
-	cp $(top_builddir)/champlain-gtk-cil/champlain-gtk-sharp.dll* .
+champlain-gtk-sharp.dll: $(top_builddir)/bindings/managed/champlain-gtk/champlain-gtk-sharp.dll
+	cp $(top_builddir)/bindings/managed/champlain-gtk/champlain-gtk-sharp.dll* .
 
 EXTRA_DIST=$(SAMPLES)
 CLEANFILES= *.exe *.mdb *.pdb *.dll *.config
diff --git a/configure.ac b/configure.ac
index e42afb7..f592db8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -119,7 +119,14 @@ if test x$enable_managed = xyes; then
 AC_CONFIG_FILES([
 	bindings/managed/Makefile
 	bindings/managed/champlain/Makefile
+	bindings/managed/champlain/AssemblyInfo.cs
+	bindings/managed/champlain/champlain-sharp.pc
+	bindings/managed/champlain/champlain-sharp.dll.config
 	bindings/managed/champlain-gtk/Makefile
+	bindings/managed/champlain-gtk/AssemblyInfo.cs
+	bindings/managed/champlain-gtk/champlain-gtk-sharp.pc
+	bindings/managed/champlain-gtk/champlain-gtk-sharp.dll.config
+	bindings/managed/samples/Makefile
 ])