--- Makefile.am 2006-03-03 18:52:46.000000000 -0800 +++ Makefile.am 2013-09-02 09:49:31.000000000 -0700 @@ -10,18 +10,18 @@ AM_CFLAGS = -Werror configincludedir = $(pkglibdir)/include -bin_SCRIPTS = libusb-config +bin_SCRIPTS = libusb-legacy-config -libusb-config: libusb-config.in +libusb-legacy-config: libusb-legacy-config.in -EXTRA_DIST = LICENSE libusb.spec.in libusb.spec libusb-config.in README.in README \ +EXTRA_DIST = LICENSE libusb.spec.in libusb.spec libusb-legacy-config.in README.in README \ INSTALL.libusb.in INSTALL.libusb Doxyfile apidocs/header.html \ - apidocs/footer.html apidocs/doxygen.css apidocs/doxygen.png libusb.pc.in -EXTRA_libusb_la_SOURCE = linux.c linux.h bsd.c darwin.c + apidocs/footer.html apidocs/doxygen.css apidocs/doxygen.png libusb-legacy.pc.in +EXTRA_libusb_legacy_la_SOURCE = linux.c linux.h bsd.c darwin.c -lib_LTLIBRARIES = libusb.la libusbpp.la +lib_LTLIBRARIES = libusb-legacy.la libusbpp-legacy.la -pkgconfig_DATA = libusb.pc +pkgconfig_DATA = libusb-legacy.pc if LINUX_API OS_SUPPORT = linux.c linux.h @@ -46,27 +46,27 @@ AM_CFLAGS += $(AM_CFLAGS_EXT) AM_CPPFLAGS = -I. AM_CXXFLAGS = -libusb_la_SOURCES = usb.c usbi.h error.c error.h descriptors.c $(OS_SUPPORT) -libusbpp_la_SOURCES = usbpp.cpp usbpp.h +libusb_legacy_la_SOURCES = usb.c usbi.h error.c error.h descriptors.c $(OS_SUPPORT) +libusbpp_legacy_la_SOURCES = usbpp.cpp usbpp.h -libusbpp_la_DEPENDENCIES = libusb.la +libusbpp_legacy_la_DEPENDENCIES = libusb-legacy.la # Do not add usb.h to *_SOURCES, regardless of dependencies. # It would be added to the dist tarball, which it shouldn't be. nodist_include_HEADERS = usb.h include_HEADERS = usbpp.h -libusb_la_LDFLAGS = \ +libusb_legacy_la_LDFLAGS = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -release $(LT_RELEASE) \ -export-dynamic \ $(LDADDS) $(PREBIND_FLAGS) -libusbpp_la_LDFLAGS = \ +libusbpp_legacy_la_LDFLAGS = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -release $(LT_RELEASE) \ -export-dynamic \ - $(LDADDS) -lusb $(PREBIND_FLAGSPP) + $(LDADDS) -lusb-legacy $(PREBIND_FLAGSPP) .PHONY: files release snapshot --- configure.in 2006-03-03 18:53:04.000000000 -0800 +++ configure.in 2013-09-02 09:47:06.000000000 -0700 @@ -250,14 +250,14 @@ AC_CONFIG_FILES([ Makefile doc/Makefile libusb.spec - libusb-config - libusb.pc + libusb-legacy-config + libusb-legacy.pc tests/Makefile README INSTALL.libusb usb.h Doxyfile ]) -AC_CONFIG_COMMANDS([default],[[chmod +x libusb-config]],[[]]) +AC_CONFIG_COMMANDS([default],[[chmod +x libusb-legacy-config]],[[]]) AC_OUTPUT --- libusb-config.in 2004-01-27 14:36:37.000000000 -0800 +++ libusb-config.in 1969-12-31 16:00:00.000000000 -0800 @@ -1,79 +0,0 @@ -#!/bin/sh - -prefix=@prefix@ -exec_prefix=@exec_prefix@ -exec_prefix_set=no - -usage() -{ - cat <&2 -fi - -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 - if test $exec_prefix_set = no ; then - exec_prefix=$optarg - fi - ;; - --prefix) - echo_prefix=yes - ;; - --exec-prefix=*) - exec_prefix=$optarg - exec_prefix_set=yes - ;; - --exec-prefix) - echo_exec_prefix=yes - ;; - --version) - echo @LIBUSB_VERSION@ - exit 0 - ;; - --cflags) - if test "@includedir@" != /usr/include ; then - includes="-I@includedir@" - fi - echo_cflags=yes - ;; - --libs) - echo_libs=yes - ;; - *) - usage 1 1>&2 - ;; - esac - shift -done - -if test "$echo_prefix" = "yes"; then - echo $prefix -fi -if test "$echo_exec_prefix" = "yes"; then - echo $exec_prefix -fi -if test "$echo_cflags" = "yes"; then - echo $includes -fi -if test "$echo_libs" = "yes"; then - echo -L@libdir@ -lusb @OSLIBS@ -fi --- libusb-legacy-config.in 1969-12-31 16:00:00.000000000 -0800 +++ libusb-legacy-config.in 2013-09-02 09:47:06.000000000 -0700 @@ -0,0 +1,79 @@ +#!/bin/sh + +prefix=@prefix@ +exec_prefix=@exec_prefix@ +exec_prefix_set=no + +usage() +{ + cat <&2 +fi + +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 + if test $exec_prefix_set = no ; then + exec_prefix=$optarg + fi + ;; + --prefix) + echo_prefix=yes + ;; + --exec-prefix=*) + exec_prefix=$optarg + exec_prefix_set=yes + ;; + --exec-prefix) + echo_exec_prefix=yes + ;; + --version) + echo @LIBUSB_VERSION@ + exit 0 + ;; + --cflags) + if test "@includedir@" != /usr/include ; then + includes="-I@includedir@" + fi + echo_cflags=yes + ;; + --libs) + echo_libs=yes + ;; + *) + usage 1 1>&2 + ;; + esac + shift +done + +if test "$echo_prefix" = "yes"; then + echo $prefix +fi +if test "$echo_exec_prefix" = "yes"; then + echo $exec_prefix +fi +if test "$echo_cflags" = "yes"; then + echo $includes +fi +if test "$echo_libs" = "yes"; then + echo -L@libdir@ -lusb-legacy @OSLIBS@ +fi --- libusb-legacy.pc.in 1969-12-31 16:00:00.000000000 -0800 +++ libusb-legacy.pc.in 2013-09-02 09:47:03.000000000 -0700 @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: libusb-legacy +Description: USB access library +Version: @VERSION@ +Libs: -L${libdir} -lusb-legacy +Cflags: -I${includedir} + --- libusb.pc.in 2005-02-14 12:46:42.000000000 -0800 +++ libusb.pc.in 1969-12-31 16:00:00.000000000 -0800 @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: libusb -Description: USB access library -Version: @VERSION@ -Libs: -L${libdir} -lusb -Cflags: -I${includedir} - --- tests/Makefile.am 2006-01-19 15:25:05.000000000 -0800 +++ tests/Makefile.am 2013-09-02 09:47:05.000000000 -0700 @@ -8,28 +8,28 @@ endif noinst_PROGRAMS = testlibusb descriptor_test id_test find_hubs find_mice \ get_resolution hub_strings $(OS_SPECIFIC) -testlibusb_LDADD = $(top_builddir)/libusb.la @OSLIBS@ +testlibusb_LDADD = $(top_builddir)/libusb-legacy.la @OSLIBS@ descriptor_test_SOURCES = descriptor_test.cpp -descriptor_test_LDADD = $(top_builddir)/libusbpp.la @OSLIBS@ +descriptor_test_LDADD = $(top_builddir)/libusbpp-legacy.la @OSLIBS@ id_test_SOURCES = id_test.cpp -id_test_LDADD = $(top_builddir)/libusbpp.la @OSLIBS@ +id_test_LDADD = $(top_builddir)/libusbpp-legacy.la @OSLIBS@ find_hubs_SOURCES = find_hubs.cpp -find_hubs_LDADD = $(top_builddir)/libusbpp.la @OSLIBS@ +find_hubs_LDADD = $(top_builddir)/libusbpp-legacy.la @OSLIBS@ find_mice_SOURCES = find_mice.cpp -find_mice_LDADD = $(top_builddir)/libusbpp.la @OSLIBS@ +find_mice_LDADD = $(top_builddir)/libusbpp-legacy.la @OSLIBS@ get_resolution_SOURCES = get_resolution.cpp -get_resolution_LDADD = $(top_builddir)/libusbpp.la @OSLIBS@ +get_resolution_LDADD = $(top_builddir)/libusbpp-legacy.la @OSLIBS@ hub_strings_SOURCES = hub_strings.cpp -hub_strings_LDADD = $(top_builddir)/libusbpp.la @OSLIBS@ +hub_strings_LDADD = $(top_builddir)/libusbpp-legacy.la @OSLIBS@ driver_name_SOURCES = driver_name.cpp -driver_name_LDADD = $(top_builddir)/libusbpp.la @OSLIBS@ +driver_name_LDADD = $(top_builddir)/libusbpp-legacy.la @OSLIBS@ TESTS = testlibusb descriptor_test id_test find_hubs find_mice \ get_resolution hub_strings $(OS_SPECIFIC)