[f-spot] Move libfspot to lib/

[Ruben Vermeersch <rubenv src gnome org>]

commit 1a7009af78e97177277570d65497fece6811c8ab
Author: Ruben Vermeersch <ruben savanne be>
Date:   Fri Jul 17 16:41:12 2009 +0200

    Move libfspot to lib/

 Makefile.am                                   |    2 --
 Makefile.include                              |    2 +-
 configure.ac                                  |    3 ++-
 lib/Makefile.am                               |    7 ++++---
 {libfspot => lib/libfspot}/.gitignore         |    0
 {libfspot => lib/libfspot}/Makefile.am        |    0
 {libfspot => lib/libfspot}/f-image-surface.c  |    0
 {libfspot => lib/libfspot}/f-image-surface.h  |    0
 {libfspot => lib/libfspot}/f-jpeg-utils.c     |    0
 {libfspot => lib/libfspot}/f-jpeg-utils.h     |    0
 {libfspot => lib/libfspot}/f-marshal.list     |    0
 {libfspot => lib/libfspot}/f-pixbuf-save.c    |    0
 {libfspot => lib/libfspot}/f-pixbuf-unsharp.c |    0
 {libfspot => lib/libfspot}/f-pixbuf-utils.c   |    0
 {libfspot => lib/libfspot}/f-pixbuf-utils.h   |    0
 {libfspot => lib/libfspot}/f-screen-utils.c   |    0
 {libfspot => lib/libfspot}/f-utils.c          |    0
 {libfspot => lib/libfspot}/f-utils.h          |    0
 po/POTFILES.in                                |    2 +-
 19 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 320131e..f2cf13d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,6 @@ SUBDIRS = 		\
 	gnome-keyring-sharp \
 	icons		\
 	libjpegtran	\
-	libfspot	\
 	libgphoto2-sharp \
 	tools		\
 	po		\
@@ -28,7 +27,6 @@ DIST_SUBDIRS = 		\
 	gnome-keyring-sharp \
 	icons		\
 	libjpegtran	\
-	libfspot	\
 	libgphoto2-sharp \
 	tools		\
 	po		\
diff --git a/Makefile.include b/Makefile.include
index 8b75a03..679a06e 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -13,7 +13,7 @@ DIR_GPHOTO2 = $(top_builddir)/libgphoto2-sharp
 DIR_ICONS = $(top_builddir)/icons
 DIR_JPEGTRAN = $(top_builddir)/libjpegtran
 DIR_KEYRING = $(top_builddir)/gnome-keyring-sharp
-DIR_LIBFSPOT = $(top_builddir)/libfspot
+DIR_LIBFSPOT = $(top_builddir)/lib/libfspot
 DIR_SEMWEB = $(top_builddir)/lib/semweb
 DIR_SRC = $(top_builddir)/src
 DIR_TAO_OPENGL = $(top_builddir)/lib/Tao/Tao.OpenGl
diff --git a/configure.ac b/configure.ac
index 91fb70d..0477ae0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -285,6 +285,8 @@ Makefile
 lib/GKeyFile/Makefile
 lib/glitz-sharp/Makefile
 lib/glitz-sharp/src/Makefile
+lib/libfspot/Makefile
+lib/libfspotraw/Makefile
 lib/Makefile
 lib/mono-addins/Makefile
 lib/mono-addins/Mono.Addins.Gui/Makefile
@@ -308,7 +310,6 @@ docs/Makefile
 gnome-keyring-sharp/Makefile
 icons/Makefile
 libjpegtran/Makefile
-libfspot/Makefile
 libgphoto2-sharp/Makefile
 tools/Makefile
 po/Makefile.in
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 28003c6..59d32be 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,8 +1,9 @@
 SUBDIRS = 				\
 	GKeyFile 			\
-	glitz-sharp 		\
+	glitz-sharp			\
+	libfspot			\
+	libfspotraw			\
 	mono-addins			\
-	semweb 				\
+	semweb				\
 	Tao
 
-#	libfspotraw 		
diff --git a/libfspot/.gitignore b/lib/libfspot/.gitignore
similarity index 100%
rename from libfspot/.gitignore
rename to lib/libfspot/.gitignore
diff --git a/libfspot/Makefile.am b/lib/libfspot/Makefile.am
similarity index 100%
rename from libfspot/Makefile.am
rename to lib/libfspot/Makefile.am
diff --git a/libfspot/f-image-surface.c b/lib/libfspot/f-image-surface.c
similarity index 100%
rename from libfspot/f-image-surface.c
rename to lib/libfspot/f-image-surface.c
diff --git a/libfspot/f-image-surface.h b/lib/libfspot/f-image-surface.h
similarity index 100%
rename from libfspot/f-image-surface.h
rename to lib/libfspot/f-image-surface.h
diff --git a/libfspot/f-jpeg-utils.c b/lib/libfspot/f-jpeg-utils.c
similarity index 100%
rename from libfspot/f-jpeg-utils.c
rename to lib/libfspot/f-jpeg-utils.c
diff --git a/libfspot/f-jpeg-utils.h b/lib/libfspot/f-jpeg-utils.h
similarity index 100%
rename from libfspot/f-jpeg-utils.h
rename to lib/libfspot/f-jpeg-utils.h
diff --git a/libfspot/f-marshal.list b/lib/libfspot/f-marshal.list
similarity index 100%
rename from libfspot/f-marshal.list
rename to lib/libfspot/f-marshal.list
diff --git a/libfspot/f-pixbuf-save.c b/lib/libfspot/f-pixbuf-save.c
similarity index 100%
rename from libfspot/f-pixbuf-save.c
rename to lib/libfspot/f-pixbuf-save.c
diff --git a/libfspot/f-pixbuf-unsharp.c b/lib/libfspot/f-pixbuf-unsharp.c
similarity index 100%
rename from libfspot/f-pixbuf-unsharp.c
rename to lib/libfspot/f-pixbuf-unsharp.c
diff --git a/libfspot/f-pixbuf-utils.c b/lib/libfspot/f-pixbuf-utils.c
similarity index 100%
rename from libfspot/f-pixbuf-utils.c
rename to lib/libfspot/f-pixbuf-utils.c
diff --git a/libfspot/f-pixbuf-utils.h b/lib/libfspot/f-pixbuf-utils.h
similarity index 100%
rename from libfspot/f-pixbuf-utils.h
rename to lib/libfspot/f-pixbuf-utils.h
diff --git a/libfspot/f-screen-utils.c b/lib/libfspot/f-screen-utils.c
similarity index 100%
rename from libfspot/f-screen-utils.c
rename to lib/libfspot/f-screen-utils.c
diff --git a/libfspot/f-utils.c b/lib/libfspot/f-utils.c
similarity index 100%
rename from libfspot/f-utils.c
rename to lib/libfspot/f-utils.c
diff --git a/libfspot/f-utils.h b/lib/libfspot/f-utils.h
similarity index 100%
rename from libfspot/f-utils.h
rename to lib/libfspot/f-utils.h
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 11823e0..f0d7afe 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -40,7 +40,7 @@ extensions/Tools/MergeDb/PickFolderDialog.cs
 f-spot.desktop.in.in
 f-spot-import.desktop.in.in
 f-spot-view.desktop.in.in
-libfspot/f-jpeg-utils.c
+lib/libfspot/f-jpeg-utils.c
 lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInfoDialog.cs
 lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallDialog.cs
 lib/mono-addins/Mono.Addins.Gui/gtk-gui/Mono.Addins.Gui.AddinInstallerDialog.cs