[f-spot] Move gtk-sharp-beans to lib/

[Ruben Vermeersch <rubenv src gnome org>]

commit 7472f75c6db4ea3a01d53bcde11164b5a962d555
Author: Ruben Vermeersch <ruben savanne be>
Date:   Fri Jul 17 23:36:14 2009 +0200

    Move gtk-sharp-beans to lib/

 Makefile.am                                        |    4 +---
 Makefile.include                                   |    2 +-
 configure.ac                                       |    4 ++--
 lib/Makefile.am                                    |    1 +
 .../gtk-sharp-beans}/.gitignore                    |    0
 .../gtk-sharp-beans}/AssemblyInfo.cs               |    0
 .../gtk-sharp-beans}/Builder.custom                |    0
 {gtk-sharp-beans => lib/gtk-sharp-beans}/Dialog.cs |    0
 .../gtk-sharp-beans}/Drawable.cs                   |    0
 {gtk-sharp-beans => lib/gtk-sharp-beans}/Format.cs |    0
 {gtk-sharp-beans => lib/gtk-sharp-beans}/Global.cs |    0
 .../gtk-sharp-beans}/Gtk.metadata                  |    0
 {gtk-sharp-beans => lib/gtk-sharp-beans}/Image.cs  |    0
 .../gtk-sharp-beans}/Makefile.am                   |    2 +-
 .../gtk-sharp-beans}/PixbufFormat.cs               |    0
 .../gtk-sharp-beans}/PixbufLoader.cs               |    0
 .../gtk-sharp-beans}/Priority.cs                   |    0
 .../gtk-sharp-beans}/Sources.cs                    |    0
 .../gtk-sharp-beans}/Timeout.cs                    |    0
 {gtk-sharp-beans => lib/gtk-sharp-beans}/Widget.cs |    0
 .../gtk-sharp-beans}/gtk-api.raw                   |    0
 .../gtk-sharp-beans}/gtk-sharp-beans.dll.config    |    0
 {gtk-sharp-beans => lib/gtk-sharp-beans}/snk       |  Bin 596 -> 596 bytes
 src/f-spot.in                                      |    2 +-
 tests/src/Makefile.am                              |    2 +-
 25 files changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index cc180b7..19e1800 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,9 @@
 SUBDIRS = 		\
 	$(subdirs)	\
+	gio-sharp	\
 	lib 		\
 	$(DIR_DBUS)	\
 	$(DIR_DBUS_GLIB)\
-	gio-sharp	\
-	gtk-sharp-beans	\
 	docs		\
 	icons		\
 	tools		\
@@ -16,7 +15,6 @@ SUBDIRS = 		\
 DIST_SUBDIRS = 		\
 	lib 		\
 	gio-sharp	\
-	gtk-sharp-beans	\
 	dbus-sharp	\
 	dbus-sharp-glib	\
 	dpap-sharp	\
diff --git a/Makefile.include b/Makefile.include
index 4718574..fadcbb0 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -21,7 +21,7 @@ DIR_TAO_GLU = $(top_builddir)/lib/Tao/Tao.OpenGl.Glu
 DIR_TAO_EXTENSIONLOADER = $(top_builddir)/lib/Tao/Tao.OpenGl.ExtensionLoader
 DIR_TAO_GLPOSTPROCESS = $(top_builddir)/lib/Tao/Tao.GlPostProcess
 DIR_GIOSHARP = $(top_builddir)/gio-sharp/gio
-DIR_GTKSHARPBEANS = $(top_builddir)/gtk-sharp-beans
+DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
 
 ## Links
 
diff --git a/configure.ac b/configure.ac
index 82b60ee..9ba2918 100644
--- a/configure.ac
+++ b/configure.ac
@@ -286,10 +286,11 @@ lib/GKeyFile/Makefile
 lib/glitz-sharp/Makefile
 lib/glitz-sharp/src/Makefile
 lib/gnome-keyring-sharp/Makefile
+lib/gtk-sharp-beans/Makefile
 lib/libfspot/Makefile
 lib/libfspotraw/Makefile
-lib/libjpegtran/Makefile
 lib/libgphoto2-sharp/Makefile
+lib/libjpegtran/Makefile
 lib/Makefile
 lib/mono-addins/Makefile
 lib/mono-addins/Mono.Addins.Gui/Makefile
@@ -354,5 +355,4 @@ f-spot-import.desktop.in
 gio-sharp/Makefile
 gio-sharp/gio/Makefile
 gio-sharp/generator/Makefile
-gtk-sharp-beans/Makefile
 )
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 628a0f2..13bbc97 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -5,6 +5,7 @@ SUBDIRS = 				\
 	GKeyFile 			\
 	glitz-sharp			\
 	gnome-keyring-sharp	\
+	gtk-sharp-beans		\
 	libjpegtran			\
 	libfspot			\
 	libgphoto2-sharp	\
diff --git a/gtk-sharp-beans/.gitignore b/lib/gtk-sharp-beans/.gitignore
similarity index 100%
rename from gtk-sharp-beans/.gitignore
rename to lib/gtk-sharp-beans/.gitignore
diff --git a/gtk-sharp-beans/AssemblyInfo.cs b/lib/gtk-sharp-beans/AssemblyInfo.cs
similarity index 100%
rename from gtk-sharp-beans/AssemblyInfo.cs
rename to lib/gtk-sharp-beans/AssemblyInfo.cs
diff --git a/gtk-sharp-beans/Builder.custom b/lib/gtk-sharp-beans/Builder.custom
similarity index 100%
rename from gtk-sharp-beans/Builder.custom
rename to lib/gtk-sharp-beans/Builder.custom
diff --git a/gtk-sharp-beans/Dialog.cs b/lib/gtk-sharp-beans/Dialog.cs
similarity index 100%
rename from gtk-sharp-beans/Dialog.cs
rename to lib/gtk-sharp-beans/Dialog.cs
diff --git a/gtk-sharp-beans/Drawable.cs b/lib/gtk-sharp-beans/Drawable.cs
similarity index 100%
rename from gtk-sharp-beans/Drawable.cs
rename to lib/gtk-sharp-beans/Drawable.cs
diff --git a/gtk-sharp-beans/Format.cs b/lib/gtk-sharp-beans/Format.cs
similarity index 100%
rename from gtk-sharp-beans/Format.cs
rename to lib/gtk-sharp-beans/Format.cs
diff --git a/gtk-sharp-beans/Global.cs b/lib/gtk-sharp-beans/Global.cs
similarity index 100%
rename from gtk-sharp-beans/Global.cs
rename to lib/gtk-sharp-beans/Global.cs
diff --git a/gtk-sharp-beans/Gtk.metadata b/lib/gtk-sharp-beans/Gtk.metadata
similarity index 100%
rename from gtk-sharp-beans/Gtk.metadata
rename to lib/gtk-sharp-beans/Gtk.metadata
diff --git a/gtk-sharp-beans/Image.cs b/lib/gtk-sharp-beans/Image.cs
similarity index 100%
rename from gtk-sharp-beans/Image.cs
rename to lib/gtk-sharp-beans/Image.cs
diff --git a/gtk-sharp-beans/Makefile.am b/lib/gtk-sharp-beans/Makefile.am
similarity index 97%
rename from gtk-sharp-beans/Makefile.am
rename to lib/gtk-sharp-beans/Makefile.am
index 265e89a..cd7906b 100644
--- a/gtk-sharp-beans/Makefile.am
+++ b/lib/gtk-sharp-beans/Makefile.am
@@ -1,4 +1,4 @@
-include ../Makefile.include
+include $(top_srcdir)/Makefile.include
 
 SRCS =					\
 	$(srcdir)/Dialog.cs		\
diff --git a/gtk-sharp-beans/PixbufFormat.cs b/lib/gtk-sharp-beans/PixbufFormat.cs
similarity index 100%
rename from gtk-sharp-beans/PixbufFormat.cs
rename to lib/gtk-sharp-beans/PixbufFormat.cs
diff --git a/gtk-sharp-beans/PixbufLoader.cs b/lib/gtk-sharp-beans/PixbufLoader.cs
similarity index 100%
rename from gtk-sharp-beans/PixbufLoader.cs
rename to lib/gtk-sharp-beans/PixbufLoader.cs
diff --git a/gtk-sharp-beans/Priority.cs b/lib/gtk-sharp-beans/Priority.cs
similarity index 100%
rename from gtk-sharp-beans/Priority.cs
rename to lib/gtk-sharp-beans/Priority.cs
diff --git a/gtk-sharp-beans/Sources.cs b/lib/gtk-sharp-beans/Sources.cs
similarity index 100%
rename from gtk-sharp-beans/Sources.cs
rename to lib/gtk-sharp-beans/Sources.cs
diff --git a/gtk-sharp-beans/Timeout.cs b/lib/gtk-sharp-beans/Timeout.cs
similarity index 100%
rename from gtk-sharp-beans/Timeout.cs
rename to lib/gtk-sharp-beans/Timeout.cs
diff --git a/gtk-sharp-beans/Widget.cs b/lib/gtk-sharp-beans/Widget.cs
similarity index 100%
rename from gtk-sharp-beans/Widget.cs
rename to lib/gtk-sharp-beans/Widget.cs
diff --git a/gtk-sharp-beans/gtk-api.raw b/lib/gtk-sharp-beans/gtk-api.raw
similarity index 100%
rename from gtk-sharp-beans/gtk-api.raw
rename to lib/gtk-sharp-beans/gtk-api.raw
diff --git a/gtk-sharp-beans/gtk-sharp-beans.dll.config b/lib/gtk-sharp-beans/gtk-sharp-beans.dll.config
similarity index 100%
rename from gtk-sharp-beans/gtk-sharp-beans.dll.config
rename to lib/gtk-sharp-beans/gtk-sharp-beans.dll.config
diff --git a/gtk-sharp-beans/snk b/lib/gtk-sharp-beans/snk
similarity index 100%
rename from gtk-sharp-beans/snk
rename to lib/gtk-sharp-beans/snk
diff --git a/src/f-spot.in b/src/f-spot.in
index 96ac608..4382653 100644
--- a/src/f-spot.in
+++ b/src/f-spot.in
@@ -60,7 +60,7 @@ for arg in "$@"; do
 	x--uninstalled)
 	    echo "*** Running uninstalled f-spot ***"
 	    EXE_TO_RUN="./f-spot.exe"
-	    export MONO_PATH= PATH_DBUS@../lib/Tao/Tao.OpenGl:../lib/Tao/Tao.OpenGl.Glu:../lib/Tao/Tao.OpenGl.ExtensionLoader:../lib/gnome-keyring-sharp:../lib/libgphoto2-sharp:../lib/semweb:../lib/glitz-sharp/src/:../lib/mono-addins/Mono.Addins:../lib/mono-addins/Mono.Addins.Setup:../lib/mono-addins/Mono.Addins.Gui:../gio-sharp/gio:../gtk-sharp-beans:$MONO_PATH
+	    export MONO_PATH= PATH_DBUS@../lib/Tao/Tao.OpenGl:../lib/Tao/Tao.OpenGl.Glu:../lib/Tao/Tao.OpenGl.ExtensionLoader:../lib/gnome-keyring-sharp:../lib/libgphoto2-sharp:../lib/semweb:../lib/glitz-sharp/src/:../lib/mono-addins/Mono.Addins:../lib/mono-addins/Mono.Addins.Setup:../lib/mono-addins/Mono.Addins.Gui:../gio-sharp/gio:../lib/gtk-sharp-beans:$MONO_PATH
 	    ;;
     esac
 done
diff --git a/tests/src/Makefile.am b/tests/src/Makefile.am
index cfe8d6b..604e8b1 100644
--- a/tests/src/Makefile.am
+++ b/tests/src/Makefile.am
@@ -46,7 +46,7 @@ FSpot.Tests.dll: $(SOURCES)
 	gmcs $(MCSFLAGS) $(PKGS) $(REFS) $(SOURCES) $(RESOURCES) -out:FSpot.Tests.dll
 
 test: FSpot.Tests.dll
-	export MONO_PATH=$(top_srcdir)/src:$(top_srcdir)/gio-sharp/gio/:$(top_srcdir)/lib/semweb:$(top_srcdir)/gtk-sharp-beans; nunit-console -noshadow -nologo $(TEST_ASSEMBLIES) 
+	export MONO_PATH=$(top_srcdir)/src:$(top_srcdir)/gio-sharp/gio/:$(top_srcdir)/lib/semweb:$(top_srcdir)/lib/gtk-sharp-beans; nunit-console -noshadow -nologo $(TEST_ASSEMBLIES) 
 
 CLEANFILES =			\
 	FSpot.Tests.dll.mdb	\