summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@gnome.org>2017-05-24 14:04:49 +0100
committerEmmanuele Bassi <ebassi@gnome.org>2017-05-24 14:18:55 +0100
commitf30d14953e2bf8182c6229339abb23a0bcb899d6 (patch)
treeaf6be752b4d0fcad2e9b7c01a1999fdd5f9d5136
parent9d75b1df59aeace18dd62f898abd85cf2b5c22da (diff)
downloadat-spi2-core-f30d14953e2bf8182c6229339abb23a0bcb899d6.tar.gz
Drop uninstalled pkg-config file
The use of uninstalled pkg-config files has always been dubious to begin with. Builds using a separate prefix should modify the PKG_CONFIG_PATH, instead of pointing to build directories.
-rw-r--r--Makefile.am6
-rw-r--r--atspi-2-uninstalled.pc.in6
-rw-r--r--configure.ac1
3 files changed, 2 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am
index b67d0d36..48c87df3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,19 +5,17 @@ INTROSPECTION_GIRS =
INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
-SUBDIRS=po dbind xml atspi bus registryd doc test
+SUBDIRS = po dbind xml atspi bus registryd doc test
-ACLOCAL_AMFLAGS=-I m4 ${ACLOCAL_FLAGS}
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
EXTRA_DIST = \
- atspi-2-uninstalled.pc.in \
atspi-2.pc.in
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = atspi-2.pc
DISTCLEANFILES = \
- atspi-2-uninstalled.pc \
atspi-2.pc
MAINTAINERCLEANFILES = \
diff --git a/atspi-2-uninstalled.pc.in b/atspi-2-uninstalled.pc.in
deleted file mode 100644
index 6b635503..00000000
--- a/atspi-2-uninstalled.pc.in
+++ /dev/null
@@ -1,6 +0,0 @@
-Name: atspi
-Description: Accessibility Technology software library
-Requires: dbus-1
-Version: @VERSION@
-Libs: ${pc_top_builddir}/${pcfiledir}/atspi/libatspi.la
-Cflags: -I${pc_top_builddir}/${pcfiledir}
diff --git a/configure.ac b/configure.ac
index f77cec7a..684c7832 100644
--- a/configure.ac
+++ b/configure.ac
@@ -185,7 +185,6 @@ AC_CONFIG_FILES([
doc/libatspi/version.xml
test/Makefile
atspi-2.pc
- atspi-2-uninstalled.pc
])
AC_OUTPUT