fixing the Makefiles, making it build

diff --git a/bindings/managed/Makefile.include b/bindings/managed/Makefile.include
index 0eeb96c3137349865c3215ffd47a2f03d5e5ddc9..dbf725418d7ac2bbca9f154e123dbe8b7ed623e4 100644 (file)
--- 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 220c43f21d4da7612d7f482b0535325398abddd5..5aa74982581b01cdea64cb3d534fcb6186873910 100644 (file)
--- 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 4dc51feb0295003e2f9274309b212fc0a9e666e1..27754aa0ea18e990358766bcaed09aaaad6e80c5 100644 (file)
--- 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 e42afb733c3ccda147499afcc5a965e748bc3874..f592db8b072791c142e0f7c826b532e7816f2503 100644 (file)
--- 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
 ])