From 1199c9b5a7e8ef67efb7c57098ece155190b6ce3 Mon Sep 17 00:00:00 2001 From: Thomas Jarosch Date: Sun, 24 Jun 2012 11:56:08 +0200 Subject: [PATCH] Rename and adapt pkgconfig files for libftdi1 --- CMakeLists.txt | 6 +++--- libftdi.pc.in | 13 ------------- libftdi1.pc.in | 13 +++++++++++++ libftdipp.pc.in | 11 ----------- libftdipp1.pc.in | 11 +++++++++++ 5 files changed, 27 insertions(+), 27 deletions(-) delete mode 100644 libftdi.pc.in create mode 100644 libftdi1.pc.in delete mode 100644 libftdipp.pc.in create mode 100644 libftdipp1.pc.in diff --git a/CMakeLists.txt b/CMakeLists.txt index bc6a1ce..562686d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -169,9 +169,9 @@ if(${WIN32}) endif(${WIN32}) configure_file(${CMAKE_SOURCE_DIR}/libftdi1.spec.in ${CMAKE_BINARY_DIR}/libftdi1.spec @ONLY) -configure_file(${CMAKE_SOURCE_DIR}/libftdi.pc.in ${CMAKE_BINARY_DIR}/libftdi.pc @ONLY) -configure_file(${CMAKE_SOURCE_DIR}/libftdipp.pc.in ${CMAKE_BINARY_DIR}/libftdipp.pc @ONLY) -install(FILES ${CMAKE_BINARY_DIR}/libftdi.pc ${CMAKE_BINARY_DIR}/libftdipp.pc +configure_file(${CMAKE_SOURCE_DIR}/libftdi1.pc.in ${CMAKE_BINARY_DIR}/libftdi1.pc @ONLY) +configure_file(${CMAKE_SOURCE_DIR}/libftdipp1.pc.in ${CMAKE_BINARY_DIR}/libftdipp1.pc @ONLY) +install(FILES ${CMAKE_BINARY_DIR}/libftdi1.pc ${CMAKE_BINARY_DIR}/libftdipp1.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig) if(${UNIX}) diff --git a/libftdi.pc.in b/libftdi.pc.in deleted file mode 100644 index f8aaaeb..0000000 --- a/libftdi.pc.in +++ /dev/null @@ -1,13 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ -libusb_libs=@LIBUSB_1_0_LIBS@ -libusb_cflags=@LIBUSB_1_0_CFLAGS@ - -Name: libftdi -Description: Library to program and control the FTDI USB controller -Requires: libusb-1.0 -Version: @VERSION@ -Libs: -L${libdir} -lftdi ${libusb_libs} -Cflags: -I${includedir} ${libusb_cflags} diff --git a/libftdi1.pc.in b/libftdi1.pc.in new file mode 100644 index 0000000..300f38c --- /dev/null +++ b/libftdi1.pc.in @@ -0,0 +1,13 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ +libusb_libs=@LIBUSB_1_0_LIBS@ +libusb_cflags=@LIBUSB_1_0_CFLAGS@ + +Name: libftdi1 +Description: Library to program and control the FTDI USB controller +Requires: libusb-1.0 +Version: @VERSION@ +Libs: -L${libdir} -lftdi1 ${libusb_libs} +Cflags: -I${includedir} ${libusb_cflags} diff --git a/libftdipp.pc.in b/libftdipp.pc.in deleted file mode 100644 index ee81fef..0000000 --- a/libftdipp.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: libftdipp -Description: C++ wrapper for libftdi -Requires: libftdi -Version: @VERSION@ -Libs: -L${libdir} -lftdipp -Cflags: -I${includedir} diff --git a/libftdipp1.pc.in b/libftdipp1.pc.in new file mode 100644 index 0000000..8158f38 --- /dev/null +++ b/libftdipp1.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: libftdipp1 +Description: C++ wrapper for libftdi1 +Requires: libftdi1 +Version: @VERSION@ +Libs: -L${libdir} -lftdipp1 +Cflags: -I${includedir} -- 1.7.1