[f-spot] Move libjpegtran to lib/

[Ruben Vermeersch <rubenv src gnome org>]

commit 1457294640d01ec8d02f4ea730227ede4df53cd5
Author: Ruben Vermeersch <ruben savanne be>
Date:   Fri Jul 17 16:57:25 2009 +0200

    Move libjpegtran to lib/

 Makefile.am                                    |    2 --
 Makefile.include                               |    2 +-
 configure.ac                                   |    2 +-
 lib/Makefile.am                                |    2 +-
 lib/libfspot/Makefile.am                       |    4 ++--
 {libjpegtran => lib/libjpegtran}/.gitignore    |    0
 {libjpegtran => lib/libjpegtran}/Makefile.am   |    0
 {libjpegtran => lib/libjpegtran}/README        |    0
 {libjpegtran => lib/libjpegtran}/jpeg-data.c   |    0
 {libjpegtran => lib/libjpegtran}/jpeg-data.h   |    0
 {libjpegtran => lib/libjpegtran}/jpeg-marker.c |    0
 {libjpegtran => lib/libjpegtran}/jpeg-marker.h |    0
 {libjpegtran => lib/libjpegtran}/jpegtran.c    |    0
 {libjpegtran => lib/libjpegtran}/jpegtran.h    |    0
 {libjpegtran => lib/libjpegtran}/transupp.c    |    0
 {libjpegtran => lib/libjpegtran}/transupp.h    |    0
 16 files changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index f2cf13d..5619d13 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,6 @@ SUBDIRS = 		\
 	docs		\
 	gnome-keyring-sharp \
 	icons		\
-	libjpegtran	\
 	libgphoto2-sharp \
 	tools		\
 	po		\
@@ -26,7 +25,6 @@ DIST_SUBDIRS = 		\
 	docs		\
 	gnome-keyring-sharp \
 	icons		\
-	libjpegtran	\
 	libgphoto2-sharp \
 	tools		\
 	po		\
diff --git a/Makefile.include b/Makefile.include
index 679a06e..fb18d2c 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -11,7 +11,7 @@ DIR_EXTENSIONS = $(top_builddir)/extensions
 DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
 DIR_GPHOTO2 = $(top_builddir)/libgphoto2-sharp
 DIR_ICONS = $(top_builddir)/icons
-DIR_JPEGTRAN = $(top_builddir)/libjpegtran
+DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
 DIR_KEYRING = $(top_builddir)/gnome-keyring-sharp
 DIR_LIBFSPOT = $(top_builddir)/lib/libfspot
 DIR_SEMWEB = $(top_builddir)/lib/semweb
diff --git a/configure.ac b/configure.ac
index 0477ae0..8c09deb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -287,6 +287,7 @@ lib/glitz-sharp/Makefile
 lib/glitz-sharp/src/Makefile
 lib/libfspot/Makefile
 lib/libfspotraw/Makefile
+lib/libjpegtran/Makefile
 lib/Makefile
 lib/mono-addins/Makefile
 lib/mono-addins/Mono.Addins.Gui/Makefile
@@ -309,7 +310,6 @@ dpap-sharp/DPAPBrowser/Makefile
 docs/Makefile
 gnome-keyring-sharp/Makefile
 icons/Makefile
-libjpegtran/Makefile
 libgphoto2-sharp/Makefile
 tools/Makefile
 po/Makefile.in
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 59d32be..591f806 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,8 +1,8 @@
 SUBDIRS = 				\
 	GKeyFile 			\
 	glitz-sharp			\
+	libjpegtran			\
 	libfspot			\
-	libfspotraw			\
 	mono-addins			\
 	semweb				\
 	Tao
diff --git a/lib/libfspot/Makefile.am b/lib/libfspot/Makefile.am
index 8d5c329..c7e8c99 100644
--- a/lib/libfspot/Makefile.am
+++ b/lib/libfspot/Makefile.am
@@ -1,5 +1,5 @@
 INCLUDES =							\
-	-I $(top_srcdir)					\
+	-I $(top_srcdir) -I $(top_srcdir)/lib/		\
 	-DLIBEOG_ETTORE_CHANGES=1				\
         -DG_LOG_DOMAIN=\"libf\"					\
 	-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED		\
@@ -34,7 +34,7 @@ libfspot_la_LIBADD = 					\
 	$(LCMS_LIBS)					\
 	$(EXIF_LIBS)					\
 	$(GIO_LIBS)					\
-	$(top_builddir)/libjpegtran/libfspotjpegtran.la	
+	$(top_builddir)/lib/libjpegtran/libfspotjpegtran.la	
 
 
 # GLib marshalling cruft
diff --git a/libjpegtran/.gitignore b/lib/libjpegtran/.gitignore
similarity index 100%
rename from libjpegtran/.gitignore
rename to lib/libjpegtran/.gitignore
diff --git a/libjpegtran/Makefile.am b/lib/libjpegtran/Makefile.am
similarity index 100%
rename from libjpegtran/Makefile.am
rename to lib/libjpegtran/Makefile.am
diff --git a/libjpegtran/README b/lib/libjpegtran/README
similarity index 100%
rename from libjpegtran/README
rename to lib/libjpegtran/README
diff --git a/libjpegtran/jpeg-data.c b/lib/libjpegtran/jpeg-data.c
similarity index 100%
rename from libjpegtran/jpeg-data.c
rename to lib/libjpegtran/jpeg-data.c
diff --git a/libjpegtran/jpeg-data.h b/lib/libjpegtran/jpeg-data.h
similarity index 100%
rename from libjpegtran/jpeg-data.h
rename to lib/libjpegtran/jpeg-data.h
diff --git a/libjpegtran/jpeg-marker.c b/lib/libjpegtran/jpeg-marker.c
similarity index 100%
rename from libjpegtran/jpeg-marker.c
rename to lib/libjpegtran/jpeg-marker.c
diff --git a/libjpegtran/jpeg-marker.h b/lib/libjpegtran/jpeg-marker.h
similarity index 100%
rename from libjpegtran/jpeg-marker.h
rename to lib/libjpegtran/jpeg-marker.h
diff --git a/libjpegtran/jpegtran.c b/lib/libjpegtran/jpegtran.c
similarity index 100%
rename from libjpegtran/jpegtran.c
rename to lib/libjpegtran/jpegtran.c
diff --git a/libjpegtran/jpegtran.h b/lib/libjpegtran/jpegtran.h
similarity index 100%
rename from libjpegtran/jpegtran.h
rename to lib/libjpegtran/jpegtran.h
diff --git a/libjpegtran/transupp.c b/lib/libjpegtran/transupp.c
similarity index 100%
rename from libjpegtran/transupp.c
rename to lib/libjpegtran/transupp.c
diff --git a/libjpegtran/transupp.h b/lib/libjpegtran/transupp.h
similarity index 100%
rename from libjpegtran/transupp.h
rename to lib/libjpegtran/transupp.h