Take advantage of the new autoconf macros.

This commit is contained in:
Dag-Erling Smørgrav 2018-05-06 03:19:45 +02:00
parent dc8984d0a0
commit 415f4170c6
10 changed files with 50 additions and 15 deletions

View file

@ -11,7 +11,10 @@ libcryb_cipher_la_SOURCES = \
\ \
cryb_cipher.c cryb_cipher.c
libcryb_cipher_la_CFLAGS = \
$(CRYB_CORE_CFLAGS)
libcryb_cipher_la_LIBADD = \ libcryb_cipher_la_LIBADD = \
$(top_builddir)/lib/core/libcryb-core.la $(CRYB_CORE_LIBS)
pkgconfig_DATA = cryb-cipher.pc pkgconfig_DATA = cryb-cipher.pc

View file

@ -15,7 +15,10 @@ libcryb_cpe_la_SOURCES = \
\ \
cryb_cpe.c cryb_cpe.c
libcryb_cpe_la_CFLAGS = \
$(CRYB_CORE_CFLAGS)
libcryb_cpe_la_LIBADD = \ libcryb_cpe_la_LIBADD = \
$(top_builddir)/lib/core/libcryb-core.la $(CRYB_CORE_LIBS)
pkgconfig_DATA = cryb-cpe.pc pkgconfig_DATA = cryb-cpe.pc

View file

@ -21,7 +21,10 @@ dist_man3_MANS = \
cryb_sha384.3 \ cryb_sha384.3 \
cryb_sha512.3 cryb_sha512.3
libcryb_digest_la_CFLAGS = \
$(CRYB_CORE_CFLAGS)
libcryb_digest_la_LIBADD = \ libcryb_digest_la_LIBADD = \
$(top_builddir)/lib/core/libcryb-core.la $(CRYB_CORE_LIBS)
pkgconfig_DATA = cryb-digest.pc pkgconfig_DATA = cryb-digest.pc

View file

@ -15,7 +15,10 @@ libcryb_enc_la_SOURCES = \
dist_man3_MANS = \ dist_man3_MANS = \
cryb_percent.3 cryb_percent.3
libcryb_enc_la_CFLAGS = \
$(CRYB_CORE_CFLAGS)
libcryb_enc_la_LIBADD = \ libcryb_enc_la_LIBADD = \
$(top_builddir)/lib/core/libcryb-core.la $(CRYB_CORE_LIBS)
pkgconfig_DATA = cryb-enc.pc pkgconfig_DATA = cryb-enc.pc

View file

@ -19,7 +19,10 @@ dist_man3_MANS = \
\ \
cryb_hash.3 cryb_hash.3
libcryb_hash_la_CFLAGS = \
$(CRYB_CORE_CFLAGS)
libcryb_hash_la_LIBADD = \ libcryb_hash_la_LIBADD = \
$(top_builddir)/lib/core/libcryb-core.la $(CRYB_CORE_LIBS)
pkgconfig_DATA = cryb-hash.pc pkgconfig_DATA = cryb-hash.pc

View file

@ -11,8 +11,12 @@ libcryb_mac_la_SOURCES = \
\ \
cryb_mac.c cryb_mac.c
libcryb_mac_la_CFLAGS = \
$(CRYB_DIGEST_CFLAGS) \
$(CRYB_CORE_CFLAGS)
libcryb_mac_la_LIBADD = \ libcryb_mac_la_LIBADD = \
$(top_builddir)/lib/core/libcryb-core.la \ $(CRYB_DIGEST_LIBS) \
$(top_builddir)/lib/digest/libcryb-digest.la $(CRYB_CORE_LIBS)
pkgconfig_DATA = cryb-mac.pc pkgconfig_DATA = cryb-mac.pc

View file

@ -43,7 +43,10 @@ libcryb_mpi_la_SOURCES = \
noinst_HEADERS = \ noinst_HEADERS = \
cryb_mpi_impl.h cryb_mpi_impl.h
libcryb_mpi_la_CFLAGS = \
$(CRYB_CORE_CFLAGS)
libcryb_mpi_la_LIBADD = \ libcryb_mpi_la_LIBADD = \
$(top_builddir)/lib/core/libcryb-core.la $(CRYB_CORE_LIBS)
pkgconfig_DATA = cryb-mpi.pc pkgconfig_DATA = cryb-mpi.pc

View file

@ -15,11 +15,18 @@ libcryb_oath_la_SOURCES = \
\ \
cryb_oath.c cryb_oath.c
libcryb_oath_la_CFLAGS = \
$(CRYB_DIGEST_CFLAGS) \
$(CRYB_ENC_CFLAGS) \
$(CRYB_MAC_CFLAGS) \
$(CRYB_RAND_CFLAGS) \
$(CRYB_CORE_CFLAGS)
libcryb_oath_la_LIBADD = \ libcryb_oath_la_LIBADD = \
$(top_builddir)/lib/digest/libcryb-digest.la \ $(CRYB_DIGEST_LIBS) \
$(top_builddir)/lib/enc/libcryb-enc.la \ $(CRYB_ENC_LIBS) \
$(top_builddir)/lib/mac/libcryb-mac.la \ $(CRYB_MAC_LIBS) \
$(top_builddir)/lib/rand/libcryb-rand.la \ $(CRYB_RAND_LIBS) \
$(top_builddir)/lib/core/libcryb-core.la $(CRYB_CORE_LIBS)
pkgconfig_DATA = cryb-oath.pc pkgconfig_DATA = cryb-oath.pc

View file

@ -7,7 +7,10 @@ libcryb_rand_la_SOURCES = \
\ \
cryb_rand.c cryb_rand.c
libcryb_rand_la_CFLAGS = \
$(CRYB_CORE_CFLAGS)
libcryb_rand_la_LIBADD = \ libcryb_rand_la_LIBADD = \
$(top_builddir)/lib/core/libcryb-core.la $(CRYB_CORE_LIBS)
pkgconfig_DATA = cryb-rand.pc pkgconfig_DATA = cryb-rand.pc

View file

@ -10,7 +10,10 @@ libcryb_test_la_SOURCES = \
\ \
cryb_test.c cryb_test.c
libcryb_test_la_CFLAGS = \
$(CRYB_CORE_CFLAGS)
libcryb_test_la_LIBADD = \ libcryb_test_la_LIBADD = \
$(top_builddir)/lib/core/libcryb-core.la $(CRYB_CORE_LIBS)
pkgconfig_DATA = cryb-test.pc pkgconfig_DATA = cryb-test.pc