[f-spot] Move glitz-sharp to lib/

[Ruben Vermeersch <rubenv src gnome org>]

commit 42fdd9768f174591a972df4407c9fa86d88119eb
Author: Ruben Vermeersch <ruben savanne be>
Date:   Wed Jul 15 15:35:12 2009 +0200

    Move glitz-sharp to lib/

 Makefile.am                                        |    2 --
 Makefile.include                                   |    2 +-
 configure.ac                                       |    4 ++--
 lib/Makefile.am                                    |    1 +
 {glitz-sharp => lib/glitz-sharp}/.gitignore        |    0
 {glitz-sharp => lib/glitz-sharp}/COPYING           |    0
 {glitz-sharp => lib/glitz-sharp}/Makefile.am       |    0
 {glitz-sharp => lib/glitz-sharp}/src/.gitignore    |    0
 {glitz-sharp => lib/glitz-sharp}/src/Buffer.cs     |    0
 {glitz-sharp => lib/glitz-sharp}/src/Context.cs    |    0
 {glitz-sharp => lib/glitz-sharp}/src/Demo.cs       |    0
 {glitz-sharp => lib/glitz-sharp}/src/Drawable.cs   |    0
 {glitz-sharp => lib/glitz-sharp}/src/Glitz.cs      |    0
 .../glitz-sharp}/src/GlitzSurface.cs               |    0
 {glitz-sharp => lib/glitz-sharp}/src/Makefile.am   |    0
 {glitz-sharp => lib/glitz-sharp}/src/Surface.cs    |    0
 .../glitz-sharp}/src/TextureObject.cs              |    0
 src/f-spot.in                                      |    2 +-
 18 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index a2bd8cf..197cc02 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,6 @@ SUBDIRS = 		\
 	gtk-sharp-beans	\
 	semweb		\
 	docs		\
-	glitz-sharp	\
 	gnome-keyring-sharp \
 	icons		\
 	libjpegtran	\
@@ -31,7 +30,6 @@ DIST_SUBDIRS = 		\
 	dbus-sharp-glib	\
 	dpap-sharp	\
 	docs		\
-	glitz-sharp	\
 	gnome-keyring-sharp \
 	icons		\
 	libjpegtran	\
diff --git a/Makefile.include b/Makefile.include
index 5c7a0a2..6852480 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -8,7 +8,7 @@ DIR_ADDINS_GUI = $(top_builddir)/mono-addins/Mono.Addins.Gui
 DIR_ADDINS_SETUP = $(top_builddir)/mono-addins/Mono.Addins.Setup
 DIR_DOCS = $(top_builddir)/docs
 DIR_EXTENSIONS = $(top_builddir)/extensions
-DIR_GLITZ = $(top_builddir)/glitz-sharp/src
+DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
 DIR_GPHOTO2 = $(top_builddir)/libgphoto2-sharp
 DIR_ICONS = $(top_builddir)/icons
 DIR_JPEGTRAN = $(top_builddir)/libjpegtran
diff --git a/configure.ac b/configure.ac
index 1454dc0..47b18c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -284,6 +284,8 @@ AC_OUTPUT(
 Makefile
 lib/Makefile
 lib/libfspotraw/Makefile
+lib/glitz-sharp/Makefile
+lib/glitz-sharp/src/Makefile
 dbus-sharp/Makefile
 dbus-sharp-glib/Makefile
 dpap-sharp/Makefile
@@ -312,8 +314,6 @@ src/Cms.dll.config
 src/FSpot.Widgets.dll.config
 src/Makefile
 GKeyFile/Makefile
-glitz-sharp/Makefile
-glitz-sharp/src/Makefile
 Tao/Makefile
 Tao/Tao.OpenGl/Makefile
 Tao/Tao.OpenGl.Glu/Makefile
diff --git a/lib/Makefile.am b/lib/Makefile.am
index ce37526..39cf07e 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,2 +1,3 @@
 SUBDIRS = 				\
+	glitz-sharp 		\
 	libfspotraw
diff --git a/glitz-sharp/.gitignore b/lib/glitz-sharp/.gitignore
similarity index 100%
rename from glitz-sharp/.gitignore
rename to lib/glitz-sharp/.gitignore
diff --git a/glitz-sharp/COPYING b/lib/glitz-sharp/COPYING
similarity index 100%
rename from glitz-sharp/COPYING
rename to lib/glitz-sharp/COPYING
diff --git a/glitz-sharp/Makefile.am b/lib/glitz-sharp/Makefile.am
similarity index 100%
rename from glitz-sharp/Makefile.am
rename to lib/glitz-sharp/Makefile.am
diff --git a/glitz-sharp/src/.gitignore b/lib/glitz-sharp/src/.gitignore
similarity index 100%
rename from glitz-sharp/src/.gitignore
rename to lib/glitz-sharp/src/.gitignore
diff --git a/glitz-sharp/src/Buffer.cs b/lib/glitz-sharp/src/Buffer.cs
similarity index 100%
rename from glitz-sharp/src/Buffer.cs
rename to lib/glitz-sharp/src/Buffer.cs
diff --git a/glitz-sharp/src/Context.cs b/lib/glitz-sharp/src/Context.cs
similarity index 100%
rename from glitz-sharp/src/Context.cs
rename to lib/glitz-sharp/src/Context.cs
diff --git a/glitz-sharp/src/Demo.cs b/lib/glitz-sharp/src/Demo.cs
similarity index 100%
rename from glitz-sharp/src/Demo.cs
rename to lib/glitz-sharp/src/Demo.cs
diff --git a/glitz-sharp/src/Drawable.cs b/lib/glitz-sharp/src/Drawable.cs
similarity index 100%
rename from glitz-sharp/src/Drawable.cs
rename to lib/glitz-sharp/src/Drawable.cs
diff --git a/glitz-sharp/src/Glitz.cs b/lib/glitz-sharp/src/Glitz.cs
similarity index 100%
rename from glitz-sharp/src/Glitz.cs
rename to lib/glitz-sharp/src/Glitz.cs
diff --git a/glitz-sharp/src/GlitzSurface.cs b/lib/glitz-sharp/src/GlitzSurface.cs
similarity index 100%
rename from glitz-sharp/src/GlitzSurface.cs
rename to lib/glitz-sharp/src/GlitzSurface.cs
diff --git a/glitz-sharp/src/Makefile.am b/lib/glitz-sharp/src/Makefile.am
similarity index 100%
rename from glitz-sharp/src/Makefile.am
rename to lib/glitz-sharp/src/Makefile.am
diff --git a/glitz-sharp/src/Surface.cs b/lib/glitz-sharp/src/Surface.cs
similarity index 100%
rename from glitz-sharp/src/Surface.cs
rename to lib/glitz-sharp/src/Surface.cs
diff --git a/glitz-sharp/src/TextureObject.cs b/lib/glitz-sharp/src/TextureObject.cs
similarity index 100%
rename from glitz-sharp/src/TextureObject.cs
rename to lib/glitz-sharp/src/TextureObject.cs
diff --git a/src/f-spot.in b/src/f-spot.in
index 0717cf6..6bd1259 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@../Tao/Tao.OpenGl:../Tao/Tao.OpenGl.Glu:../Tao/Tao.OpenGl.ExtensionLoader:../google-sharp:../gnome-keyring-sharp:../FlickrNet:../SmugMugNet:../libgphoto2-sharp:../semweb:../glitz-sharp/src/:../mono-addins/Mono.Addins:../mono-addins/Mono.Addins.Setup:../mono-addins/Mono.Addins.Gui:../gio-sharp/gio:../gtk-sharp-beans:$MONO_PATH
+	    export MONO_PATH= PATH_DBUS@../Tao/Tao.OpenGl:../Tao/Tao.OpenGl.Glu:../Tao/Tao.OpenGl.ExtensionLoader:../google-sharp:../gnome-keyring-sharp:../FlickrNet:../SmugMugNet:../libgphoto2-sharp:../semweb:../lib/glitz-sharp/src/:../mono-addins/Mono.Addins:../mono-addins/Mono.Addins.Setup:../mono-addins/Mono.Addins.Gui:../gio-sharp/gio:../gtk-sharp-beans:$MONO_PATH
 	    ;;
     esac
 done