Removed deprecated exiv2-config script.

README

@@ -87,8 +87,7 @@ Hacking
 
 A pkg-config .pc file is installed together with the library.
 Application developers can use pkg-config(1) to obtain correct compile
-and link time flags for the Exiv2 library. (The exiv2-config script is
-still included in the distribution but should be considered deprecated.)
+and link time flags for the Exiv2 library.
 
 If you downloaded Exiv2 directly from the subversion repository, and
 you want to build it using the GNU configure script, then you need to

config/Makefile

@@ -26,7 +26,7 @@ mostlyclean clean:
 	rm -f *~ *.bak *#
 
 distclean: clean
-	rm -f config.h ../src/exv_conf.h config.mk exiv2-config exiv2.pc
+	rm -f config.h ../src/exv_conf.h config.mk exiv2.pc
 
 # This removes almost everything, including the configure script!
 maintainer-clean: distclean

config/configure.ac

@@ -112,7 +112,6 @@ fi
 # Create output files.
 # ---------------------------------------------------------------------------
 AC_CONFIG_FILES([./config/config.mk])
-AC_CONFIG_FILES([./config/exiv2-config], [chmod +x ./config/exiv2-config])
 AC_CONFIG_FILES([./config/exiv2.pc])
 AC_CONFIG_FILES([./po/Makefile.in])
 AC_OUTPUT

config/exiv2-config.in

@@ -1,93 +0,0 @@
-#! /bin/sh
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-includedir=@includedir@
-libdir=@libdir@
-
-usage()
-{
-    cat <<EOF
-Exiv2-config provides compile time settings for applications which use
-exiv2. Call this script from the application build commands to get the
-correct parameters to compile and link with exiv2.
-
-Usage: exiv2-config [OPTION]
-
-Known values for OPTION are:
-
-  --prefix=DIR		change exiv2 prefix [default $prefix]
-  --exec-prefix=DIR	change exiv2 exec prefix [default $exec_prefix]
-  --libs		print library linking information
-  --libtool-libs	print linking information for use with libtool
-  --cflags		print pre-processor and compiler flags
-  --help		display this help and exit
-  --version		output version information
-EOF
-
-    exit $1
-}
-
-if test $# -eq 0; then
-    usage 1
-fi
-
-cflags=false
-libs=false
-
-while test $# -gt 0; do
-    case "$1" in
-    -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-    *) optarg= ;;
-    esac
-
-    case "$1" in
-    --prefix=*)
-	prefix=$optarg
-	includedir=$prefix/include
-	libdir=$prefix/lib
-	;;
-
-    --prefix)
-	echo $prefix
-	;;
-
-    --exec-prefix=*)
-      exec_prefix=$optarg
-      libdir=$exec_prefix/lib
-      ;;
-
-    --exec-prefix)
-      echo $exec_prefix
-      ;;
-
-    --version)
-	echo @PACKAGE_VERSION@
-	exit 0
-	;;
-
-    --help)
-	usage 0
-	;;
-
-    --cflags)
-       	echo -I$includedir
-       	;;
-
-    --libtool-libs)
-	echo $libdir/libexiv2.la
-        ;;
-
-    --libs)
-       	echo -L$libdir -lexiv2 @LDFLAGS@ @LTLIBINTL@ @LTLIBICONV@ @LIBS@
-       	;;
-
-    *)
-	usage
-	exit 1
-	;;
-    esac
-    shift
-done
-
-exit 0

src/Makefile

@@ -270,7 +270,6 @@ install-lib: lib install-header
 	$(INSTALL_DIRS) $(DESTDIR)$(libdir)
 	@$(LIBTOOL) --mode=install $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(libdir)/$(LIBRARY)
 	$(INSTALL_DIRS) $(DESTDIR)$(bindir)
-	$(INSTALL_PROGRAM) $(top_srcdir)/config/exiv2-config $(DESTDIR)$(bindir)/exiv2-config
 	$(INSTALL_DIRS) $(DESTDIR)$(libdir)/pkgconfig
 	$(INSTALL_DATA) $(top_srcdir)/config/exiv2.pc $(DESTDIR)$(libdir)/pkgconfig/exiv2.pc
 
@@ -291,8 +290,6 @@ uninstall-header:
 uninstall-lib: uninstall-header
 	$(RM) $(DESTDIR)$(libdir)/pkgconfig/exiv2.pc
 	-rmdir $(DESTDIR)$(libdir)/pkgconfig
-	$(RM) $(DESTDIR)$(bindir)/exiv2-config
-	-rmdir $(DESTDIR)$(bindir)
 	@$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/$(LIBRARY)
 	-rmdir $(DESTDIR)$(libdir)