Commit 07527fb5 authored by Harris Hancock's avatar Harris Hancock

autotools: Install new .pc files

Includes a small refactor to eliminate the need to maintain two copies of
the list of .pc files. (Note: there's actually a third copy of the list in
CMakeLists.txt.)
parent bb1db868
...@@ -114,7 +114,7 @@ includekjcompatdir = $(includekjdir)/compat ...@@ -114,7 +114,7 @@ includekjcompatdir = $(includekjdir)/compat
dist_includecapnp_DATA = $(public_capnpc_inputs) dist_includecapnp_DATA = $(public_capnpc_inputs)
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = capnp.pc capnp-rpc.pc capnp-json.pc kj.pc kj-async.pc pkgconfig_DATA = $(CAPNP_PKG_CONFIG_FILES)
noinst_HEADERS = \ noinst_HEADERS = \
src/kj/miniposix.h src/kj/miniposix.h
......
...@@ -105,5 +105,16 @@ AC_SUBST([STDLIB_FLAG]) ...@@ -105,5 +105,16 @@ AC_SUBST([STDLIB_FLAG])
LIBS="$PTHREAD_LIBS $LIBS" LIBS="$PTHREAD_LIBS $LIBS"
CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS" CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
AC_CONFIG_FILES([Makefile capnp.pc capnp-rpc.pc capnp-json.pc kj.pc kj-async.pc]) AC_DEFUN([CAPNP_PKG_CONFIG_FILES], [ \
pkgconfig/capnp.pc \
pkgconfig/capnp-rpc.pc \
pkgconfig/capnp-json.pc \
pkgconfig/kj.pc \
pkgconfig/kj-async.pc \
pkgconfig/kj-http.pc \
pkgconfig/kj-test.pc \
])
[CAPNP_PKG_CONFIG_FILES]="CAPNP_PKG_CONFIG_FILES"
AC_SUBST([CAPNP_PKG_CONFIG_FILES])
AC_CONFIG_FILES([Makefile] CAPNP_PKG_CONFIG_FILES)
AC_OUTPUT AC_OUTPUT
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment