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

[Ruben Vermeersch <rubenv src gnome org>]

commit e030bae64f826fdb803109be7b0f78f75d6b1d55
Author: Ruben Vermeersch <ruben savanne be>
Date:   Fri Jul 17 17:30:13 2009 +0200

    Move libgphoto2-sharp to lib/

 Makefile.am                                        |    2 --
 Makefile.include                                   |    2 +-
 configure.ac                                       |    2 +-
 lib/Makefile.am                                    |    4 ++++
 .../libgphoto2-sharp}/.gitignore                   |    0
 {libgphoto2-sharp => lib/libgphoto2-sharp}/AUTHORS |    0
 .../libgphoto2-sharp}/AssemblyInfo.cs              |    0
 {libgphoto2-sharp => lib/libgphoto2-sharp}/COPYING |    0
 .../libgphoto2-sharp}/Camera.cs                    |    0
 .../libgphoto2-sharp}/CameraAbilitiesList.cs       |    0
 .../libgphoto2-sharp}/CameraFile.cs                |    0
 .../libgphoto2-sharp}/CameraFilesystem.cs          |    0
 .../libgphoto2-sharp}/CameraList.cs                |    0
 .../libgphoto2-sharp}/CameraWidget.cs              |    0
 .../libgphoto2-sharp}/Context.cs                   |    0
 .../libgphoto2-sharp}/ErrorCodes.cs                |    0
 .../libgphoto2-sharp}/Makefile.am                  |    0
 .../libgphoto2-sharp}/Object.cs                    |    0
 {libgphoto2-sharp => lib/libgphoto2-sharp}/Port.cs |    0
 .../libgphoto2-sharp}/PortInfo.cs                  |    0
 .../libgphoto2-sharp}/PortInfoList.cs              |    0
 .../libgphoto2-sharp}/libgphoto2-sharp.dll.config  |    0
 src/f-spot.in                                      |    2 +-
 23 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 5619d13..09b75dc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,6 @@ SUBDIRS = 		\
 	docs		\
 	gnome-keyring-sharp \
 	icons		\
-	libgphoto2-sharp \
 	tools		\
 	po		\
 	src		\
@@ -25,7 +24,6 @@ DIST_SUBDIRS = 		\
 	docs		\
 	gnome-keyring-sharp \
 	icons		\
-	libgphoto2-sharp \
 	tools		\
 	po		\
 	src		\
diff --git a/Makefile.include b/Makefile.include
index fb18d2c..745a9ad 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -9,7 +9,7 @@ DIR_ADDINS_SETUP = $(top_builddir)/lib/mono-addins/Mono.Addins.Setup
 DIR_DOCS = $(top_builddir)/docs
 DIR_EXTENSIONS = $(top_builddir)/extensions
 DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
-DIR_GPHOTO2 = $(top_builddir)/libgphoto2-sharp
+DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
 DIR_ICONS = $(top_builddir)/icons
 DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
 DIR_KEYRING = $(top_builddir)/gnome-keyring-sharp
diff --git a/configure.ac b/configure.ac
index 8c09deb..347992e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -288,6 +288,7 @@ lib/glitz-sharp/src/Makefile
 lib/libfspot/Makefile
 lib/libfspotraw/Makefile
 lib/libjpegtran/Makefile
+lib/libgphoto2-sharp/Makefile
 lib/Makefile
 lib/mono-addins/Makefile
 lib/mono-addins/Mono.Addins.Gui/Makefile
@@ -310,7 +311,6 @@ dpap-sharp/DPAPBrowser/Makefile
 docs/Makefile
 gnome-keyring-sharp/Makefile
 icons/Makefile
-libgphoto2-sharp/Makefile
 tools/Makefile
 po/Makefile.in
 src/Core/Defines.cs
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 591f806..0333d8c 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,8 +1,12 @@
+# Note the list below is sorted by alphabet, with the exception of libjpegtran,
+# it needs to be built before libfspot.
+
 SUBDIRS = 				\
 	GKeyFile 			\
 	glitz-sharp			\
 	libjpegtran			\
 	libfspot			\
+	libgphoto2-sharp	\
 	mono-addins			\
 	semweb				\
 	Tao
diff --git a/libgphoto2-sharp/.gitignore b/lib/libgphoto2-sharp/.gitignore
similarity index 100%
rename from libgphoto2-sharp/.gitignore
rename to lib/libgphoto2-sharp/.gitignore
diff --git a/libgphoto2-sharp/AUTHORS b/lib/libgphoto2-sharp/AUTHORS
similarity index 100%
rename from libgphoto2-sharp/AUTHORS
rename to lib/libgphoto2-sharp/AUTHORS
diff --git a/libgphoto2-sharp/AssemblyInfo.cs b/lib/libgphoto2-sharp/AssemblyInfo.cs
similarity index 100%
rename from libgphoto2-sharp/AssemblyInfo.cs
rename to lib/libgphoto2-sharp/AssemblyInfo.cs
diff --git a/libgphoto2-sharp/COPYING b/lib/libgphoto2-sharp/COPYING
similarity index 100%
rename from libgphoto2-sharp/COPYING
rename to lib/libgphoto2-sharp/COPYING
diff --git a/libgphoto2-sharp/Camera.cs b/lib/libgphoto2-sharp/Camera.cs
similarity index 100%
rename from libgphoto2-sharp/Camera.cs
rename to lib/libgphoto2-sharp/Camera.cs
diff --git a/libgphoto2-sharp/CameraAbilitiesList.cs b/lib/libgphoto2-sharp/CameraAbilitiesList.cs
similarity index 100%
rename from libgphoto2-sharp/CameraAbilitiesList.cs
rename to lib/libgphoto2-sharp/CameraAbilitiesList.cs
diff --git a/libgphoto2-sharp/CameraFile.cs b/lib/libgphoto2-sharp/CameraFile.cs
similarity index 100%
rename from libgphoto2-sharp/CameraFile.cs
rename to lib/libgphoto2-sharp/CameraFile.cs
diff --git a/libgphoto2-sharp/CameraFilesystem.cs b/lib/libgphoto2-sharp/CameraFilesystem.cs
similarity index 100%
rename from libgphoto2-sharp/CameraFilesystem.cs
rename to lib/libgphoto2-sharp/CameraFilesystem.cs
diff --git a/libgphoto2-sharp/CameraList.cs b/lib/libgphoto2-sharp/CameraList.cs
similarity index 100%
rename from libgphoto2-sharp/CameraList.cs
rename to lib/libgphoto2-sharp/CameraList.cs
diff --git a/libgphoto2-sharp/CameraWidget.cs b/lib/libgphoto2-sharp/CameraWidget.cs
similarity index 100%
rename from libgphoto2-sharp/CameraWidget.cs
rename to lib/libgphoto2-sharp/CameraWidget.cs
diff --git a/libgphoto2-sharp/Context.cs b/lib/libgphoto2-sharp/Context.cs
similarity index 100%
rename from libgphoto2-sharp/Context.cs
rename to lib/libgphoto2-sharp/Context.cs
diff --git a/libgphoto2-sharp/ErrorCodes.cs b/lib/libgphoto2-sharp/ErrorCodes.cs
similarity index 100%
rename from libgphoto2-sharp/ErrorCodes.cs
rename to lib/libgphoto2-sharp/ErrorCodes.cs
diff --git a/libgphoto2-sharp/Makefile.am b/lib/libgphoto2-sharp/Makefile.am
similarity index 100%
rename from libgphoto2-sharp/Makefile.am
rename to lib/libgphoto2-sharp/Makefile.am
diff --git a/libgphoto2-sharp/Object.cs b/lib/libgphoto2-sharp/Object.cs
similarity index 100%
rename from libgphoto2-sharp/Object.cs
rename to lib/libgphoto2-sharp/Object.cs
diff --git a/libgphoto2-sharp/Port.cs b/lib/libgphoto2-sharp/Port.cs
similarity index 100%
rename from libgphoto2-sharp/Port.cs
rename to lib/libgphoto2-sharp/Port.cs
diff --git a/libgphoto2-sharp/PortInfo.cs b/lib/libgphoto2-sharp/PortInfo.cs
similarity index 100%
rename from libgphoto2-sharp/PortInfo.cs
rename to lib/libgphoto2-sharp/PortInfo.cs
diff --git a/libgphoto2-sharp/PortInfoList.cs b/lib/libgphoto2-sharp/PortInfoList.cs
similarity index 100%
rename from libgphoto2-sharp/PortInfoList.cs
rename to lib/libgphoto2-sharp/PortInfoList.cs
diff --git a/libgphoto2-sharp/libgphoto2-sharp.dll.config b/lib/libgphoto2-sharp/libgphoto2-sharp.dll.config
similarity index 100%
rename from libgphoto2-sharp/libgphoto2-sharp.dll.config
rename to lib/libgphoto2-sharp/libgphoto2-sharp.dll.config
diff --git a/src/f-spot.in b/src/f-spot.in
index 9a1ddc4..022dbc1 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:../google-sharp:../gnome-keyring-sharp:../FlickrNet:../SmugMugNet:../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:../google-sharp:../gnome-keyring-sharp:../FlickrNet:../SmugMugNet:../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
 	    ;;
     esac
 done