Start using pkg-config / pkgconf.

This commit is contained in:
Dag-Erling Smørgrav 2017-03-07 00:50:17 +01:00
parent 5476b36e9a
commit fbf69f31cb
24 changed files with 159 additions and 1 deletions

1
.gitignore vendored
View file

@ -20,6 +20,7 @@
*.lo *.lo
*.log *.log
*.o *.o
*.pc
*.trs *.trs
Makefile Makefile
Makefile.in Makefile.in

View file

@ -39,6 +39,10 @@ AC_TYPE_UINTPTR_T
LT_PREREQ([2.2.6]) LT_PREREQ([2.2.6])
LT_INIT() LT_INIT()
# pkg-config
PKG_PROG_PKG_CONFIG
PKG_INSTALLDIR
# other programs # other programs
AC_PROG_INSTALL AC_PROG_INSTALL
@ -217,7 +221,7 @@ AM_CONDITIONAL([CRYB_HASH], [test x"$enable_cryb_hash" = x"yes"])
# Message authentication codes # Message authentication codes
elements="$elements mac" elements="$elements mac"
requires="$requires mac:core" requires="$requires mac:core mac:digest"
AC_ARG_ENABLE([cryb-mac], AC_ARG_ENABLE([cryb-mac],
AC_HELP_STRING([--enable-cryb-mac], AC_HELP_STRING([--enable-cryb-mac],
[build the message authentication code library]), [build the message authentication code library]),
@ -291,17 +295,28 @@ AC_CONFIG_FILES([
include/cryb/Makefile include/cryb/Makefile
lib/Makefile lib/Makefile
lib/cipher/Makefile lib/cipher/Makefile
lib/cipher/cryb-cipher.pc
lib/core/Makefile lib/core/Makefile
lib/core/cryb-core.pc
lib/cpe/Makefile lib/cpe/Makefile
lib/cpe/cryb-cpe.pc
lib/digest/Makefile lib/digest/Makefile
lib/digest/cryb-digest.pc
lib/enc/Makefile lib/enc/Makefile
lib/enc/cryb-enc.pc
lib/hash/Makefile lib/hash/Makefile
lib/hash/cryb-hash.pc
lib/mac/Makefile lib/mac/Makefile
lib/mac/cryb-mac.pc
lib/mpi/Makefile lib/mpi/Makefile
lib/mpi/cryb-mpi.pc
lib/oath/Makefile lib/oath/Makefile
lib/oath/cryb-oath.pc
lib/rand/Makefile lib/rand/Makefile
lib/rand/cryb-rand.pc
lib/rsaref/Makefile lib/rsaref/Makefile
lib/test/Makefile lib/test/Makefile
lib/test/cryb-test.pc
t/Makefile t/Makefile
]) ])
AC_CONFIG_FILES([mkpkgng], [chmod +x mkpkgng]) AC_CONFIG_FILES([mkpkgng], [chmod +x mkpkgng])

View file

@ -10,3 +10,5 @@ libcryb_cipher_la_SOURCES = \
libcryb_cipher_la_LIBADD = \ libcryb_cipher_la_LIBADD = \
$(top_builddir)/lib/core/libcryb-core.la $(top_builddir)/lib/core/libcryb-core.la
pkgconfig_DATA = cryb-cipher.pc

View file

@ -0,0 +1,11 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
includedir=@includedir@
libdir=@libdir@
Name: cryb-cipher
Description: Cryb.to encryption algorithms
Version: @PACKAGE_VERSION@
Cflags: -I${includedir}
Libs: -L${libdir} -lcryb-cipher
Requires.private: cryb-core

View file

@ -21,3 +21,5 @@ EXTRA_DIST = cryb_string_impl.c
dist_man3_MANS = \ dist_man3_MANS = \
cryb_strlcat.3 \ cryb_strlcat.3 \
cryb_strlcpy.3 cryb_strlcpy.3
pkgconfig_DATA = cryb-core.pc

10
lib/core/cryb-core.pc.in Normal file
View file

@ -0,0 +1,10 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
includedir=@includedir@
libdir=@libdir@
Name: cryb-core
Description: Cryb.to core utilities
Version: @PACKAGE_VERSION@
Cflags: -I${includedir}
Libs: -L${libdir} -lcryb-core

View file

@ -17,3 +17,5 @@ libcryb_cpe_la_SOURCES = \
libcryb_cpe_la_LIBADD = \ libcryb_cpe_la_LIBADD = \
$(top_builddir)/lib/core/libcryb-core.la $(top_builddir)/lib/core/libcryb-core.la
pkgconfig_DATA = cryb-cpe.pc

11
lib/cpe/cryb-cpe.pc.in Normal file
View file

@ -0,0 +1,11 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
includedir=@includedir@
libdir=@libdir@
Name: cryb-cpe
Description: Cryb.to CPE manipulation
Version: @PACKAGE_VERSION@
Cflags: -I${includedir}
Libs: -L${libdir} -lcryb-cpe
Requires.private: cryb-core

View file

@ -23,3 +23,5 @@ dist_man3_MANS = \
libcryb_digest_la_LIBADD = \ libcryb_digest_la_LIBADD = \
$(top_builddir)/lib/core/libcryb-core.la $(top_builddir)/lib/core/libcryb-core.la
pkgconfig_DATA = cryb-digest.pc

View file

@ -0,0 +1,11 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
includedir=@includedir@
libdir=@libdir@
Name: cryb-digest
Description: Cryb.to cryptographic hash primitives
Version: @PACKAGE_VERSION@
Cflags: -I${includedir}
Libs: -L${libdir} -lcryb-digest
Requires.private: cryb-core

View file

@ -17,3 +17,5 @@ dist_man3_MANS = \
libcryb_enc_la_LIBADD = \ libcryb_enc_la_LIBADD = \
$(top_builddir)/lib/core/libcryb-core.la $(top_builddir)/lib/core/libcryb-core.la
pkgconfig_DATA = cryb-enc.pc

11
lib/enc/cryb-enc.pc.in Normal file
View file

@ -0,0 +1,11 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
includedir=@includedir@
libdir=@libdir@
Name: cryb-enc
Description: Cryb.to non-cryptographic encoding primitives
Version: @PACKAGE_VERSION@
Cflags: -I${includedir}
Libs: -L${libdir} -lcryb-enc
Requires.private: cryb-core

View file

@ -21,3 +21,5 @@ dist_man3_MANS = \
libcryb_hash_la_LIBADD = \ libcryb_hash_la_LIBADD = \
$(top_builddir)/lib/core/libcryb-core.la $(top_builddir)/lib/core/libcryb-core.la
pkgconfig_DATA = cryb-hash.pc

11
lib/hash/cryb-hash.pc.in Normal file
View file

@ -0,0 +1,11 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
includedir=@includedir@
libdir=@libdir@
Name: cryb-hash
Description: Cryb.to non-cryptographic hash algorithms
Version: @PACKAGE_VERSION@
Cflags: -I${includedir}
Libs: -L${libdir} -lcryb-hash
Requires.private: cryb-core

View file

@ -14,3 +14,5 @@ libcryb_mac_la_SOURCES = \
libcryb_mac_la_LIBADD = \ libcryb_mac_la_LIBADD = \
$(top_builddir)/lib/core/libcryb-core.la \ $(top_builddir)/lib/core/libcryb-core.la \
$(top_builddir)/lib/digest/libcryb-digest.la $(top_builddir)/lib/digest/libcryb-digest.la
pkgconfig_DATA = cryb-mac.pc

11
lib/mac/cryb-mac.pc.in Normal file
View file

@ -0,0 +1,11 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
includedir=@includedir@
libdir=@libdir@
Name: cryb-mac
Description: Cryb.to message authentication codes
Version: @PACKAGE_VERSION@
Cflags: -I${includedir}
Libs: -L${libdir} -lcryb-mac
Requires.private: cryb-core cryb-digest

View file

@ -30,3 +30,5 @@ noinst_HEADERS = \
libcryb_mpi_la_LIBADD = \ libcryb_mpi_la_LIBADD = \
$(top_builddir)/lib/core/libcryb-core.la $(top_builddir)/lib/core/libcryb-core.la
pkgconfig_DATA = cryb-mpi.pc

11
lib/mpi/cryb-mpi.pc.in Normal file
View file

@ -0,0 +1,11 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
includedir=@includedir@
libdir=@libdir@
Name: cryb-mpi
Description: Cryb.to multiple-precision integer arithmetic
Version: @PACKAGE_VERSION@
Cflags: -I${includedir}
Libs: -L${libdir} -lcryb-mpi
Requires.private: cryb-core

View file

@ -21,3 +21,5 @@ libcryb_oath_la_LIBADD = \
$(top_builddir)/lib/mac/libcryb-mac.la \ $(top_builddir)/lib/mac/libcryb-mac.la \
$(top_builddir)/lib/rand/libcryb-rand.la \ $(top_builddir)/lib/rand/libcryb-rand.la \
$(top_builddir)/lib/core/libcryb-core.la $(top_builddir)/lib/core/libcryb-core.la
pkgconfig_DATA = cryb-oath.pc

11
lib/oath/cryb-oath.pc.in Normal file
View file

@ -0,0 +1,11 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
includedir=@includedir@
libdir=@libdir@
Name: cryb-oath
Description: Cryb.to Open Authentication primitives
Version: @PACKAGE_VERSION@
Cflags: -I${includedir}
Libs: -L${libdir} -lcryb-oath
Requires.private: cryb-core cryb-digest cryb-enc cryb-mac cryb-rand

View file

@ -9,3 +9,5 @@ libcryb_rand_la_SOURCES = \
libcryb_rand_la_LIBADD = \ libcryb_rand_la_LIBADD = \
$(top_builddir)/lib/core/libcryb-core.la $(top_builddir)/lib/core/libcryb-core.la
pkgconfig_DATA = cryb-rand.pc

11
lib/rand/cryb-rand.pc.in Normal file
View file

@ -0,0 +1,11 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
includedir=@includedir@
libdir=@libdir@
Name: cryb-rand
Description: Cryb.to random number generators
Version: @PACKAGE_VERSION@
Cflags: -I${includedir}
Libs: -L${libdir} -lcryb-rand
Requires.private: cryb-core

View file

@ -12,3 +12,5 @@ libcryb_test_la_SOURCES = \
libcryb_test_la_LIBADD = \ libcryb_test_la_LIBADD = \
$(top_builddir)/lib/core/libcryb-core.la $(top_builddir)/lib/core/libcryb-core.la
pkgconfig_DATA = cryb-test.pc

11
lib/test/cryb-test.pc.in Normal file
View file

@ -0,0 +1,11 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
includedir=@includedir@
libdir=@libdir@
Name: cryb-test
Description: Cryb.to automated test framework
Version: @PACKAGE_VERSION@
Cflags: -I${includedir}
Libs: -L${libdir} -lcryb-test
Requires.private: cryb-core