From 801a72a39b9a41ab0d3aa018a740d1a813b5420c Mon Sep 17 00:00:00 2001 From: Martin Szulecki Date: Thu, 29 Jan 2015 00:05:40 +0100 Subject: Move pkg-config file into src directory --- Makefile.am | 3 --- configure.ac | 4 ++-- libplist++.pc.in | 11 ----------- libplist.pc.in | 11 ----------- src/Makefile.am | 3 +++ src/libplist++.pc.in | 11 +++++++++++ src/libplist.pc.in | 11 +++++++++++ 7 files changed, 27 insertions(+), 27 deletions(-) delete mode 100644 libplist++.pc.in delete mode 100644 libplist.pc.in create mode 100644 src/libplist++.pc.in create mode 100644 src/libplist.pc.in diff --git a/Makefile.am b/Makefile.am index 9158682..8ac4acf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,9 +2,6 @@ AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I m4 SUBDIRS = libcnary src include tools $(CYTHON_SUB) test -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libplist.pc libplist++.pc - docs/html: $(top_builddir)/doxygen.cfg $(top_srcdir)/include/plist/*.h rm -rf docs doxygen doxygen.cfg diff --git a/configure.ac b/configure.ac index dcad0f0..8394997 100644 --- a/configure.ac +++ b/configure.ac @@ -126,12 +126,12 @@ AC_OUTPUT([ Makefile libcnary/Makefile src/Makefile +src/libplist.pc +src/libplist++.pc include/Makefile tools/Makefile cython/Makefile test/Makefile -libplist.pc -libplist++.pc doxygen.cfg ]) diff --git a/libplist++.pc.in b/libplist++.pc.in deleted file mode 100644 index cea869c..0000000 --- a/libplist++.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: @PACKAGE_NAME@++ -Description: C++ binding for @PACKAGE_NAME@ -Version: @PACKAGE_VERSION@ -Libs: -L${libdir} -lplist++ -Cflags: -I${includedir} -Requires: libplist >= @PACKAGE_VERSION@ diff --git a/libplist.pc.in b/libplist.pc.in deleted file mode 100644 index fc97247..0000000 --- a/libplist.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 handle Apple Property Lists whereas they are binary or XML -Version: @PACKAGE_VERSION@ -Libs: -L${libdir} -lplist -Cflags: -I${includedir} -Requires.private: libxml-2.0 >= @LIBXML2_VERSION@ diff --git a/src/Makefile.am b/src/Makefile.am index 0a16b24..83b975c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -45,3 +45,6 @@ if WIN32 libplist_la_LDFLAGS += -avoid-version libplist___la_LDFLAGS += -avoid-version endif + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = libplist.pc libplist++.pc diff --git a/src/libplist++.pc.in b/src/libplist++.pc.in new file mode 100644 index 0000000..cea869c --- /dev/null +++ b/src/libplist++.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: @PACKAGE_NAME@++ +Description: C++ binding for @PACKAGE_NAME@ +Version: @PACKAGE_VERSION@ +Libs: -L${libdir} -lplist++ +Cflags: -I${includedir} +Requires: libplist >= @PACKAGE_VERSION@ diff --git a/src/libplist.pc.in b/src/libplist.pc.in new file mode 100644 index 0000000..fc97247 --- /dev/null +++ b/src/libplist.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: @PACKAGE_NAME@ +Description: A library to handle Apple Property Lists whereas they are binary or XML +Version: @PACKAGE_VERSION@ +Libs: -L${libdir} -lplist +Cflags: -I${includedir} +Requires.private: libxml-2.0 >= @LIBXML2_VERSION@ -- cgit v1.1-32-gdbae