breaking the darn thing?

diff --git a/Makefile.am b/Makefile.am
index 2a8835328ccb91e1ffbadefa667b9e236a6c60ea..d14aeabc8d1f3f6490911fb8af8f03300f25042f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = \
-       champlain        \
-       champlain-gtk    \
+       champlain-cil    \
+       champlain-gtk-cil    \
        examples
 
-DIST_SUBDIRS = champlain champlain-gtk examples
+DIST_SUBDIRS = champlain-cil champlain-gtk-cil examples

diff --git a/champlain-gtk/AssemblyInfo.cs.in b/champlain-cil/AssemblyInfo.cs.in
similarity index 100%
rename from champlain-gtk/AssemblyInfo.cs.in
rename to champlain-cil/AssemblyInfo.cs.in

diff --git a/champlain/Makefile.am b/champlain-cil/Makefile.am
similarity index 100%
rename from champlain/Makefile.am
rename to champlain-cil/Makefile.am

diff --git a/champlain/champlain-api.raw b/champlain-cil/champlain-api.raw
similarity index 100%
rename from champlain/champlain-api.raw
rename to champlain-cil/champlain-api.raw

diff --git a/champlain/champlain-sharp.dll.config.in b/champlain-cil/champlain-sharp.dll.config.in
similarity index 100%
rename from champlain/champlain-sharp.dll.config.in
rename to champlain-cil/champlain-sharp.dll.config.in

diff --git a/champlain/champlain-sharp.pc.in b/champlain-cil/champlain-sharp.pc.in
similarity index 100%
rename from champlain/champlain-sharp.pc.in
rename to champlain-cil/champlain-sharp.pc.in

diff --git a/champlain/champlain-sources.xml b/champlain-cil/champlain-sources.xml
similarity index 100%
rename from champlain/champlain-sources.xml
rename to champlain-cil/champlain-sources.xml

diff --git a/champlain/champlain.metadata b/champlain-cil/champlain.metadata
similarity index 100%
rename from champlain/champlain.metadata
rename to champlain-cil/champlain.metadata

diff --git a/champlain/AssemblyInfo.cs.in b/champlain-gtk-cil/AssemblyInfo.cs.in
similarity index 100%
rename from champlain/AssemblyInfo.cs.in
rename to champlain-gtk-cil/AssemblyInfo.cs.in

diff --git a/champlain-gtk/Makefile.am b/champlain-gtk-cil/Makefile.am
similarity index 100%
rename from champlain-gtk/Makefile.am
rename to champlain-gtk-cil/Makefile.am

diff --git a/champlain-gtk/champlain-gtk-api.raw b/champlain-gtk-cil/champlain-gtk-api.raw
similarity index 100%
rename from champlain-gtk/champlain-gtk-api.raw
rename to champlain-gtk-cil/champlain-gtk-api.raw

diff --git a/champlain-gtk/champlain-gtk-sharp.dll.config.in b/champlain-gtk-cil/champlain-gtk-sharp.dll.config.in
similarity index 100%
rename from champlain-gtk/champlain-gtk-sharp.dll.config.in
rename to champlain-gtk-cil/champlain-gtk-sharp.dll.config.in

diff --git a/champlain-gtk/champlain-gtk-sharp.pc.in b/champlain-gtk-cil/champlain-gtk-sharp.pc.in
similarity index 100%
rename from champlain-gtk/champlain-gtk-sharp.pc.in
rename to champlain-gtk-cil/champlain-gtk-sharp.pc.in

diff --git a/champlain-gtk/champlain-gtk-sources.xml b/champlain-gtk-cil/champlain-gtk-sources.xml
similarity index 100%
rename from champlain-gtk/champlain-gtk-sources.xml
rename to champlain-gtk-cil/champlain-gtk-sources.xml

diff --git a/champlain-gtk/champlain-gtk.metadata b/champlain-gtk-cil/champlain-gtk.metadata
similarity index 100%
rename from champlain-gtk/champlain-gtk.metadata
rename to champlain-gtk-cil/champlain-gtk.metadata

diff --git a/configure.ac b/configure.ac
index 294647bd36acd1610d032fce2086c200935b2f3d..17957fc284122dbddc45351524d94235493819e4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -80,14 +80,14 @@ AC_SUBST(CHAMPLAIN_APIVERSION)
 
 AC_OUTPUT([
        Makefile
-       champlain/champlain-sharp.pc
-       champlain/Makefile
-       champlain/AssemblyInfo.cs
-       champlain/champlain-sharp.dll.config
-       champlain-gtk/champlain-gtk-sharp.pc
-       champlain-gtk/Makefile
-       champlain-gtk/AssemblyInfo.cs
-       champlain-gtk/champlain-gtk-sharp.dll.config
+       champlain-cil/champlain-sharp.pc
+       champlain-cil/Makefile
+       champlain-cil/AssemblyInfo.cs
+       champlain-cil/champlain-sharp.dll.config
+       champlain-gtk-cil/champlain-gtk-sharp.pc
+       champlain-gtk-cil/Makefile
+       champlain-gtk-cil/AssemblyInfo.cs
+       champlain-gtk-cil/champlain-gtk-sharp.dll.config
        examples/Makefile
 ])
 

diff --git a/examples/Makefile.am b/examples/Makefile.am
index 9b610ae38efba013012c4f49591afb5411036443..4dc51feb0295003e2f9274309b212fc0a9e666e1 100644 (file)
--- a/examples/Makefile.am
+++ b/examples/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/champlain-sharp.dll
-       cp $(top_builddir)/champlain/champlain-sharp.dll* .
+champlain-sharp.dll: $(top_builddir)/champlain-cil/champlain-sharp.dll
+       cp $(top_builddir)/champlain-cil/champlain-sharp.dll* .
 
-champlain-gtk-sharp.dll: $(top_builddir)/champlain-gtk/champlain-gtk-sharp.dll
-       cp $(top_builddir)/champlain-gtk/champlain-gtk-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* .
 
 EXTRA_DIST=$(SAMPLES)
 CLEANFILES= *.exe *.mdb *.pdb *.dll *.config