summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Martin Szulecki2015-01-29 00:05:40 +0100
committerGravatar Martin Szulecki2015-01-29 00:05:40 +0100
commit801a72a39b9a41ab0d3aa018a740d1a813b5420c (patch)
treef53673288374ae51ff047df60b681f2f7b4213bd
parent6f8cfb23d03787cae2f834a8979b4545dc0fe063 (diff)
downloadlibplist-801a72a39b9a41ab0d3aa018a740d1a813b5420c.tar.gz
libplist-801a72a39b9a41ab0d3aa018a740d1a813b5420c.tar.bz2
Move pkg-config file into src directory
-rw-r--r--Makefile.am3
-rw-r--r--configure.ac4
-rw-r--r--src/Makefile.am3
-rw-r--r--src/libplist++.pc.in (renamed from libplist++.pc.in)0
-rw-r--r--src/libplist.pc.in (renamed from libplist.pc.in)0
5 files changed, 5 insertions, 5 deletions
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/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/libplist++.pc.in b/src/libplist++.pc.in
index cea869c..cea869c 100644
--- a/libplist++.pc.in
+++ b/src/libplist++.pc.in
diff --git a/libplist.pc.in b/src/libplist.pc.in
index fc97247..fc97247 100644
--- a/libplist.pc.in
+++ b/src/libplist.pc.in