[gthumb] renamed the exiv2 extension as exiv2_tools to avoid confusion



commit d8624d13e6b7ad69d256ee5b8db8980a7554be5e
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Thu Feb 4 12:39:38 2010 +0100

    renamed the exiv2 extension as exiv2_tools to avoid confusion
    
    renamed extension to avoid confusion with the libexiv2 library

 configure.ac                                       |    6 +++---
 extensions/Makefile.am                             |    2 +-
 extensions/{exiv2 => exiv2_tools}/Makefile.am      |   14 +++++++-------
 extensions/{exiv2 => exiv2_tools}/data/Makefile.am |    0
 .../{exiv2 => exiv2_tools}/data/ui/Makefile.am     |    0
 .../data/ui/edit-exiv2-page.ui                     |    0
 extensions/{exiv2 => exiv2_tools}/exiv2-utils.cpp  |    0
 extensions/{exiv2 => exiv2_tools}/exiv2-utils.h    |    0
 .../exiv2_tools.extension.in.in}                   |    0
 .../{exiv2 => exiv2_tools}/gth-edit-exiv2-page.c   |    0
 .../{exiv2 => exiv2_tools}/gth-edit-exiv2-page.h   |    0
 .../gth-metadata-provider-exiv2.c                  |    0
 .../gth-metadata-provider-exiv2.h                  |    0
 extensions/{exiv2 => exiv2_tools}/main.c           |    0
 extensions/importer/gth-import-task.c              |    2 +-
 gthumb/gth-main.c                                  |    2 +-
 16 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 95ef661..5c0da41 100644
--- a/configure.ac
+++ b/configure.ac
@@ -396,9 +396,9 @@ extensions/desktop_background/Makefile
 extensions/edit_metadata/Makefile
 extensions/edit_metadata/data/Makefile
 extensions/edit_metadata/data/ui/Makefile
-extensions/exiv2/Makefile
-extensions/exiv2/data/Makefile
-extensions/exiv2/data/ui/Makefile
+extensions/exiv2_tools/Makefile
+extensions/exiv2_tools/data/Makefile
+extensions/exiv2_tools/data/ui/Makefile
 extensions/file_manager/Makefile
 extensions/file_tools/Makefile
 extensions/file_tools/data/Makefile
diff --git a/extensions/Makefile.am b/extensions/Makefile.am
index 80c141a..2a04178 100644
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -4,7 +4,7 @@ SUBDIRS = 			\
 	comments		\
 	desktop_background	\
 	edit_metadata		\
-	exiv2			\
+	exiv2_tools		\
 	file_manager		\
 	file_tools		\
 	file_viewer		\
diff --git a/extensions/exiv2/Makefile.am b/extensions/exiv2_tools/Makefile.am
similarity index 64%
rename from extensions/exiv2/Makefile.am
rename to extensions/exiv2_tools/Makefile.am
index 004c1ee..a64ff81 100644
--- a/extensions/exiv2/Makefile.am
+++ b/extensions/exiv2_tools/Makefile.am
@@ -3,9 +3,9 @@ if ENABLE_EXIV2
 SUBDIRS = data
 
 extensiondir = $(pkglibdir)/extensions
-extension_LTLIBRARIES = libexiv2.la
+extension_LTLIBRARIES = libexiv2_tools.la
 
-libexiv2_la_SOURCES = 			\
+libexiv2_tools_la_SOURCES = 			\
 	exiv2-utils.h			\
 	exiv2-utils.cpp			\
 	gth-edit-exiv2-page.c		\
@@ -14,13 +14,13 @@ libexiv2_la_SOURCES = 			\
 	gth-metadata-provider-exiv2.h	\
 	main.c
 
-libexiv2_la_CPPFLAGS = $(GTHUMB_CFLAGS) $(EXIV2_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
-libexiv2_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
-libexiv2_la_LIBADD = $(GTHUMB_LIBS) $(EXIV2_LIBS) ../edit_metadata/libedit_metadata.la
-libexiv2_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
+libexiv2_tools_la_CPPFLAGS = $(GTHUMB_CFLAGS) $(EXIV2_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
+libexiv2_tools_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
+libexiv2_tools_la_LIBADD = $(GTHUMB_LIBS) $(EXIV2_LIBS) ../edit_metadata/libedit_metadata.la
+libexiv2_tools_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
 
 extensioninidir = $(extensiondir)
-extensionini_in_files = exiv2.extension.in.in
+extensionini_in_files = exiv2_tools.extension.in.in
 extensionini_DATA = $(extensionini_in_files:.extension.in.in=.extension)
 
 %.extension.in: %.extension.in.in $(extension_LTLIBRARIES)
diff --git a/extensions/exiv2/data/Makefile.am b/extensions/exiv2_tools/data/Makefile.am
similarity index 100%
rename from extensions/exiv2/data/Makefile.am
rename to extensions/exiv2_tools/data/Makefile.am
diff --git a/extensions/exiv2/data/ui/Makefile.am b/extensions/exiv2_tools/data/ui/Makefile.am
similarity index 100%
rename from extensions/exiv2/data/ui/Makefile.am
rename to extensions/exiv2_tools/data/ui/Makefile.am
diff --git a/extensions/exiv2/data/ui/edit-exiv2-page.ui b/extensions/exiv2_tools/data/ui/edit-exiv2-page.ui
similarity index 100%
rename from extensions/exiv2/data/ui/edit-exiv2-page.ui
rename to extensions/exiv2_tools/data/ui/edit-exiv2-page.ui
diff --git a/extensions/exiv2/exiv2-utils.cpp b/extensions/exiv2_tools/exiv2-utils.cpp
similarity index 100%
rename from extensions/exiv2/exiv2-utils.cpp
rename to extensions/exiv2_tools/exiv2-utils.cpp
diff --git a/extensions/exiv2/exiv2-utils.h b/extensions/exiv2_tools/exiv2-utils.h
similarity index 100%
rename from extensions/exiv2/exiv2-utils.h
rename to extensions/exiv2_tools/exiv2-utils.h
diff --git a/extensions/exiv2/exiv2.extension.in.in b/extensions/exiv2_tools/exiv2_tools.extension.in.in
similarity index 100%
rename from extensions/exiv2/exiv2.extension.in.in
rename to extensions/exiv2_tools/exiv2_tools.extension.in.in
diff --git a/extensions/exiv2/gth-edit-exiv2-page.c b/extensions/exiv2_tools/gth-edit-exiv2-page.c
similarity index 100%
rename from extensions/exiv2/gth-edit-exiv2-page.c
rename to extensions/exiv2_tools/gth-edit-exiv2-page.c
diff --git a/extensions/exiv2/gth-edit-exiv2-page.h b/extensions/exiv2_tools/gth-edit-exiv2-page.h
similarity index 100%
rename from extensions/exiv2/gth-edit-exiv2-page.h
rename to extensions/exiv2_tools/gth-edit-exiv2-page.h
diff --git a/extensions/exiv2/gth-metadata-provider-exiv2.c b/extensions/exiv2_tools/gth-metadata-provider-exiv2.c
similarity index 100%
rename from extensions/exiv2/gth-metadata-provider-exiv2.c
rename to extensions/exiv2_tools/gth-metadata-provider-exiv2.c
diff --git a/extensions/exiv2/gth-metadata-provider-exiv2.h b/extensions/exiv2_tools/gth-metadata-provider-exiv2.h
similarity index 100%
rename from extensions/exiv2/gth-metadata-provider-exiv2.h
rename to extensions/exiv2_tools/gth-metadata-provider-exiv2.h
diff --git a/extensions/exiv2/main.c b/extensions/exiv2_tools/main.c
similarity index 100%
rename from extensions/exiv2/main.c
rename to extensions/exiv2_tools/main.c
diff --git a/extensions/importer/gth-import-task.c b/extensions/importer/gth-import-task.c
index 5d41f8a..67097cc 100644
--- a/extensions/importer/gth-import-task.c
+++ b/extensions/importer/gth-import-task.c
@@ -22,7 +22,7 @@
 
 #include <config.h>
 #include <extensions/catalogs/gth-catalog.h>
-#include <extensions/exiv2/exiv2-utils.h>
+#include <extensions/exiv2_tools/exiv2-utils.h>
 #include <extensions/image_rotation/rotation-utils.h>
 #include "gth-import-task.h"
 #include "utils.h"
diff --git a/gthumb/gth-main.c b/gthumb/gth-main.c
index 7859771..2923a5b 100644
--- a/gthumb/gth-main.c
+++ b/gthumb/gth-main.c
@@ -1192,7 +1192,7 @@ gth_main_activate_extensions (void)
 						"catalogs",
 						"comments",
 						"desktop_background",
-						"exiv2",
+						"exiv2_tools",
 						"file_manager",
 						"file_tools",
 						"gstreamer",



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]