From 4d95679e67a11b6a748d0df192e410457229b83c Mon Sep 17 00:00:00 2001 From: Martin Szulecki Date: Wed, 28 Jan 2015 20:54:25 +0100 Subject: Move pkg-config file into src directory --- Makefile.am | 3 --- configure.ac | 2 +- libimobiledevice-1.0.pc.in | 12 ------------ src/Makefile.am | 3 +++ src/libimobiledevice-1.0.pc.in | 12 ++++++++++++ 5 files changed, 16 insertions(+), 16 deletions(-) delete mode 100644 libimobiledevice-1.0.pc.in create mode 100644 src/libimobiledevice-1.0.pc.in diff --git a/Makefile.am b/Makefile.am index fdd273f..c7d69cc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,9 +2,6 @@ AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I m4 SUBDIRS = common src include $(CYTHON_SUB) tools docs -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libimobiledevice-1.0.pc - EXTRA_DIST = docs docs/html: $(top_builddir)/doxygen.cfg $(top_srcdir)/src/*.c $(top_srcdir)/src/*.h $(top_srcdir)/include/libimobiledevice/*.h diff --git a/configure.ac b/configure.ac index 44e1e09..44daa65 100644 --- a/configure.ac +++ b/configure.ac @@ -209,11 +209,11 @@ AC_OUTPUT([ Makefile common/Makefile src/Makefile +src/libimobiledevice-1.0.pc include/Makefile tools/Makefile cython/Makefile docs/Makefile -libimobiledevice-1.0.pc doxygen.cfg ]) diff --git a/libimobiledevice-1.0.pc.in b/libimobiledevice-1.0.pc.in deleted file mode 100644 index dfcdd8a..0000000 --- a/libimobiledevice-1.0.pc.in +++ /dev/null @@ -1,12 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: @PACKAGE_NAME@ -Description: A library to communicate with services running on Apple iOS devices. -Version: @PACKAGE_VERSION@ -Libs: -L${libdir} -limobiledevice -Cflags: -I${includedir} -Requires: libplist >= @LIBPLIST_VERSION@ -Requires.private: libusbmuxd >= @LIBUSBMUXD_VERSION@ @ssl_requires@ \ No newline at end of file diff --git a/src/Makefile.am b/src/Makefile.am index e45437b..da60386 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -34,3 +34,6 @@ if WIN32 libimobiledevice_la_LDFLAGS += -avoid-version libimobiledevice_la_LIBADD += -lole32 -lws2_32 endif + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = libimobiledevice-1.0.pc diff --git a/src/libimobiledevice-1.0.pc.in b/src/libimobiledevice-1.0.pc.in new file mode 100644 index 0000000..dfcdd8a --- /dev/null +++ b/src/libimobiledevice-1.0.pc.in @@ -0,0 +1,12 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: @PACKAGE_NAME@ +Description: A library to communicate with services running on Apple iOS devices. +Version: @PACKAGE_VERSION@ +Libs: -L${libdir} -limobiledevice +Cflags: -I${includedir} +Requires: libplist >= @LIBPLIST_VERSION@ +Requires.private: libusbmuxd >= @LIBUSBMUXD_VERSION@ @ssl_requires@ \ No newline at end of file -- cgit v1.1-32-gdbae