From 415f4170c6ce3f4efbef7ebaf97e33ee48f442f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= Date: Sun, 6 May 2018 03:19:45 +0200 Subject: [PATCH] Take advantage of the new autoconf macros. --- lib/cipher/Makefile.am | 5 ++++- lib/cpe/Makefile.am | 5 ++++- lib/digest/Makefile.am | 5 ++++- lib/enc/Makefile.am | 5 ++++- lib/hash/Makefile.am | 5 ++++- lib/mac/Makefile.am | 8 ++++++-- lib/mpi/Makefile.am | 5 ++++- lib/oath/Makefile.am | 17 ++++++++++++----- lib/rand/Makefile.am | 5 ++++- lib/test/Makefile.am | 5 ++++- 10 files changed, 50 insertions(+), 15 deletions(-) diff --git a/lib/cipher/Makefile.am b/lib/cipher/Makefile.am index 890d6b4..072d383 100644 --- a/lib/cipher/Makefile.am +++ b/lib/cipher/Makefile.am @@ -11,7 +11,10 @@ libcryb_cipher_la_SOURCES = \ \ cryb_cipher.c +libcryb_cipher_la_CFLAGS = \ + $(CRYB_CORE_CFLAGS) + libcryb_cipher_la_LIBADD = \ - $(top_builddir)/lib/core/libcryb-core.la + $(CRYB_CORE_LIBS) pkgconfig_DATA = cryb-cipher.pc diff --git a/lib/cpe/Makefile.am b/lib/cpe/Makefile.am index 3ee0456..50a9426 100644 --- a/lib/cpe/Makefile.am +++ b/lib/cpe/Makefile.am @@ -15,7 +15,10 @@ libcryb_cpe_la_SOURCES = \ \ cryb_cpe.c +libcryb_cpe_la_CFLAGS = \ + $(CRYB_CORE_CFLAGS) + libcryb_cpe_la_LIBADD = \ - $(top_builddir)/lib/core/libcryb-core.la + $(CRYB_CORE_LIBS) pkgconfig_DATA = cryb-cpe.pc diff --git a/lib/digest/Makefile.am b/lib/digest/Makefile.am index 44f01c0..a0d4c25 100644 --- a/lib/digest/Makefile.am +++ b/lib/digest/Makefile.am @@ -21,7 +21,10 @@ dist_man3_MANS = \ cryb_sha384.3 \ cryb_sha512.3 +libcryb_digest_la_CFLAGS = \ + $(CRYB_CORE_CFLAGS) + libcryb_digest_la_LIBADD = \ - $(top_builddir)/lib/core/libcryb-core.la + $(CRYB_CORE_LIBS) pkgconfig_DATA = cryb-digest.pc diff --git a/lib/enc/Makefile.am b/lib/enc/Makefile.am index 000bb40..d4dee2e 100644 --- a/lib/enc/Makefile.am +++ b/lib/enc/Makefile.am @@ -15,7 +15,10 @@ libcryb_enc_la_SOURCES = \ dist_man3_MANS = \ cryb_percent.3 +libcryb_enc_la_CFLAGS = \ + $(CRYB_CORE_CFLAGS) + libcryb_enc_la_LIBADD = \ - $(top_builddir)/lib/core/libcryb-core.la + $(CRYB_CORE_LIBS) pkgconfig_DATA = cryb-enc.pc diff --git a/lib/hash/Makefile.am b/lib/hash/Makefile.am index 3dac803..fd2d207 100644 --- a/lib/hash/Makefile.am +++ b/lib/hash/Makefile.am @@ -19,7 +19,10 @@ dist_man3_MANS = \ \ cryb_hash.3 +libcryb_hash_la_CFLAGS = \ + $(CRYB_CORE_CFLAGS) + libcryb_hash_la_LIBADD = \ - $(top_builddir)/lib/core/libcryb-core.la + $(CRYB_CORE_LIBS) pkgconfig_DATA = cryb-hash.pc diff --git a/lib/mac/Makefile.am b/lib/mac/Makefile.am index f3dd8ae..46e6700 100644 --- a/lib/mac/Makefile.am +++ b/lib/mac/Makefile.am @@ -11,8 +11,12 @@ libcryb_mac_la_SOURCES = \ \ cryb_mac.c +libcryb_mac_la_CFLAGS = \ + $(CRYB_DIGEST_CFLAGS) \ + $(CRYB_CORE_CFLAGS) + libcryb_mac_la_LIBADD = \ - $(top_builddir)/lib/core/libcryb-core.la \ - $(top_builddir)/lib/digest/libcryb-digest.la + $(CRYB_DIGEST_LIBS) \ + $(CRYB_CORE_LIBS) pkgconfig_DATA = cryb-mac.pc diff --git a/lib/mpi/Makefile.am b/lib/mpi/Makefile.am index 6ae83b7..18cc2b2 100644 --- a/lib/mpi/Makefile.am +++ b/lib/mpi/Makefile.am @@ -43,7 +43,10 @@ libcryb_mpi_la_SOURCES = \ noinst_HEADERS = \ cryb_mpi_impl.h +libcryb_mpi_la_CFLAGS = \ + $(CRYB_CORE_CFLAGS) + libcryb_mpi_la_LIBADD = \ - $(top_builddir)/lib/core/libcryb-core.la + $(CRYB_CORE_LIBS) pkgconfig_DATA = cryb-mpi.pc diff --git a/lib/oath/Makefile.am b/lib/oath/Makefile.am index 8be52ad..dec66d5 100644 --- a/lib/oath/Makefile.am +++ b/lib/oath/Makefile.am @@ -15,11 +15,18 @@ libcryb_oath_la_SOURCES = \ \ 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 = \ - $(top_builddir)/lib/digest/libcryb-digest.la \ - $(top_builddir)/lib/enc/libcryb-enc.la \ - $(top_builddir)/lib/mac/libcryb-mac.la \ - $(top_builddir)/lib/rand/libcryb-rand.la \ - $(top_builddir)/lib/core/libcryb-core.la + $(CRYB_DIGEST_LIBS) \ + $(CRYB_ENC_LIBS) \ + $(CRYB_MAC_LIBS) \ + $(CRYB_RAND_LIBS) \ + $(CRYB_CORE_LIBS) pkgconfig_DATA = cryb-oath.pc diff --git a/lib/rand/Makefile.am b/lib/rand/Makefile.am index 6057ee7..e53a403 100644 --- a/lib/rand/Makefile.am +++ b/lib/rand/Makefile.am @@ -7,7 +7,10 @@ libcryb_rand_la_SOURCES = \ \ cryb_rand.c +libcryb_rand_la_CFLAGS = \ + $(CRYB_CORE_CFLAGS) + libcryb_rand_la_LIBADD = \ - $(top_builddir)/lib/core/libcryb-core.la + $(CRYB_CORE_LIBS) pkgconfig_DATA = cryb-rand.pc diff --git a/lib/test/Makefile.am b/lib/test/Makefile.am index cd87804..b4172ae 100644 --- a/lib/test/Makefile.am +++ b/lib/test/Makefile.am @@ -10,7 +10,10 @@ libcryb_test_la_SOURCES = \ \ cryb_test.c +libcryb_test_la_CFLAGS = \ + $(CRYB_CORE_CFLAGS) + libcryb_test_la_LIBADD = \ - $(top_builddir)/lib/core/libcryb-core.la + $(CRYB_CORE_LIBS) pkgconfig_DATA = cryb-test.pc