From 7f24d0ec98605c085ae030fec7a1d87ec675cad4 Mon Sep 17 00:00:00 2001 From: Martin Szulecki Date: Mon, 8 Jun 2020 15:12:54 +0200 Subject: Move pkg-config file into src directory as the standard recommends --- Makefile.am | 3 --- configure.ac | 2 +- libirecovery.pc.in | 11 ----------- src/Makefile.am | 3 +++ src/libirecovery.pc.in | 11 +++++++++++ 5 files changed, 15 insertions(+), 15 deletions(-) delete mode 100644 libirecovery.pc.in create mode 100644 src/libirecovery.pc.in diff --git a/Makefile.am b/Makefile.am index 0ddd6f7..6810a46 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,3 @@ AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I m4 SUBDIRS = src include tools udev - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libirecovery.pc diff --git a/configure.ac b/configure.ac index 8a41541..962fecf 100644 --- a/configure.ac +++ b/configure.ac @@ -183,9 +183,9 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) AC_OUTPUT([ Makefile src/Makefile +src/libirecovery.pc include/Makefile tools/Makefile -libirecovery.pc udev/Makefile ]) diff --git a/libirecovery.pc.in b/libirecovery.pc.in deleted file mode 100644 index 11ac86a..0000000 --- a/libirecovery.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 iBoot/iBSS on iOS devices via USB -Version: @PACKAGE_VERSION@ -Libs: -L${libdir} -lirecovery -Cflags: -I${includedir} -Requires.private: @LIBUSB_REQUIRED@ diff --git a/src/Makefile.am b/src/Makefile.am index 265c91a..e5dc9c1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,3 +19,6 @@ libirecovery_la_SOURCES = libirecovery.c \ if WIN32 libirecovery_la_LDFLAGS += -avoid-version endif + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = libirecovery.pc diff --git a/src/libirecovery.pc.in b/src/libirecovery.pc.in new file mode 100644 index 0000000..11ac86a --- /dev/null +++ b/src/libirecovery.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 iBoot/iBSS on iOS devices via USB +Version: @PACKAGE_VERSION@ +Libs: -L${libdir} -lirecovery +Cflags: -I${includedir} +Requires.private: @LIBUSB_REQUIRED@ -- cgit v1.1-32-gdbae