From 60563619921981bbc76ffc4647f89542d3b3f107 Mon Sep 17 00:00:00 2001 From: Nikias Bassen Date: Mon, 8 Jun 2020 23:39:25 +0200 Subject: Move pkg-config file into src dir and rename it to include major version as standard recommends --- Makefile.am | 3 --- configure.ac | 2 +- libusbmuxd.pc.in | 11 ----------- src/Makefile.am | 3 +++ src/libusbmuxd-2.0.pc.in | 11 +++++++++++ 5 files changed, 15 insertions(+), 15 deletions(-) delete mode 100644 libusbmuxd.pc.in create mode 100644 src/libusbmuxd-2.0.pc.in diff --git a/Makefile.am b/Makefile.am index b36d76e..3344ac0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,6 +4,3 @@ SUBDIRS = common src include tools docs EXTRA_DIST = \ README.md - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libusbmuxd.pc diff --git a/configure.ac b/configure.ac index cd47c01..f66b890 100644 --- a/configure.ac +++ b/configure.ac @@ -127,7 +127,7 @@ src/Makefile include/Makefile tools/Makefile docs/Makefile -libusbmuxd.pc +src/libusbmuxd-2.0.pc ]) echo " diff --git a/libusbmuxd.pc.in b/libusbmuxd.pc.in deleted file mode 100644 index 3385bc9..0000000 --- a/libusbmuxd.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: @PACKAGE_NAME@ -Description: A library to communicate with the usbmux daemon -Version: @PACKAGE_VERSION@ -Libs: -L${libdir} -lusbmuxd -Cflags: -I${includedir} -Requires.private: libplist >= @LIBPLIST_VERSION@ \ No newline at end of file diff --git a/src/Makefile.am b/src/Makefile.am index 38b137b..90057aa 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -12,3 +12,6 @@ if WIN32 libusbmuxd_la_LDFLAGS += -avoid-version -static-libgcc libusbmuxd_la_LIBADD += -lws2_32 endif + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = libusbmuxd-2.0.pc diff --git a/src/libusbmuxd-2.0.pc.in b/src/libusbmuxd-2.0.pc.in new file mode 100644 index 0000000..3385bc9 --- /dev/null +++ b/src/libusbmuxd-2.0.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: @PACKAGE_NAME@ +Description: A library to communicate with the usbmux daemon +Version: @PACKAGE_VERSION@ +Libs: -L${libdir} -lusbmuxd +Cflags: -I${includedir} +Requires.private: libplist >= @LIBPLIST_VERSION@ \ No newline at end of file -- cgit v1.1-32-gdbae