From 70e4112457659662501cb554e977cfe3f0dc8a3c Mon Sep 17 00:00:00 2001 From: Chris Frey Date: Thu, 1 Oct 2009 17:46:28 -0400 Subject: [PATCH] Removed redundant library dependencies from autoconf build --- ChangeLog | 1 + gui/configure.ac | 2 +- opensync-plugin-0.4x/configure.ac | 2 +- opensync-plugin/configure.ac | 2 +- tools/Makefile.am | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4518858a..841512b3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ Release: version 0.17 - 2009/11/?? ------------------------------------------------------------------------------ 2009/10/01 + - removed redundant library dependencies from autoconf build - version bump: - configure.ac - src/Makefile.am diff --git a/gui/configure.ac b/gui/configure.ac index e08bc720..3b8433e8 100644 --- a/gui/configure.ac +++ b/gui/configure.ac @@ -38,7 +38,7 @@ AC_ARG_WITH(libz, AC_SUBST(LIBZ_CFLAGS) AC_SUBST(LIBZ_LIBS) -PKG_CHECK_MODULES([BARRY], [libbarry-0 libusb]) +PKG_CHECK_MODULES([BARRY], [libbarry-0]) PKG_CHECK_MODULES([GTKMM], [gtkmm-2.4 libglademm-2.4 gthread-2.0]) # Carry the special tree build environment variables from parent configure, diff --git a/opensync-plugin-0.4x/configure.ac b/opensync-plugin-0.4x/configure.ac index 54efd173..432b6c54 100644 --- a/opensync-plugin-0.4x/configure.ac +++ b/opensync-plugin-0.4x/configure.ac @@ -31,7 +31,7 @@ AM_CONDITIONAL([WITH_GCCVISIBILITY], [test "$HAVE_C_GCCVISIBILITY" = "1" -a "$HA AC_LANG([C++]) -PKG_CHECK_MODULES([BARRY], [libbarry-0 libusb]) +PKG_CHECK_MODULES([BARRY], [libbarry-0]) # Carry the special tree build environment variables from parent configure, # just in case user is doing a complete tree build with --enable-opensync-plugin diff --git a/opensync-plugin/configure.ac b/opensync-plugin/configure.ac index 5a62e6d4..2aa972cd 100644 --- a/opensync-plugin/configure.ac +++ b/opensync-plugin/configure.ac @@ -31,7 +31,7 @@ AM_CONDITIONAL([WITH_GCCVISIBILITY], [test "$HAVE_C_GCCVISIBILITY" = "1" -a "$HA AC_LANG([C++]) -PKG_CHECK_MODULES([BARRY], [libbarry-0 libusb]) +PKG_CHECK_MODULES([BARRY], [libbarry-0]) # Carry the special tree build environment variables from parent configure, # just in case user is doing a complete tree build with --enable-opensync-plugin diff --git a/tools/Makefile.am b/tools/Makefile.am index a47b4827..58817ada 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -53,7 +53,7 @@ bdptest_SOURCES = bdptest.cc bdptest_LDADD = ../src/libbarrydp.la bjdwp_SOURCES = bjdwp.cc -bjdwp_LDADD = ../src/libbarry.la ../src/libbarrydp.la ../src/libbarryjdwp.la +bjdwp_LDADD = ../src/libbarry.la ../src/libbarryjdwp.la upldif_SOURCES = upldif.cc upldif_LDADD = ../src/libbarry.la $(LIBUSB_LIBS) -lpthread -- 2.11.4.GIT