build: define GNUTLS_BUILDING_LIB while compiling sources in lib/

Signed-off-by: Daiki Ueno <ueno@gnu.org>

diff --git a/lib/Makefile.am b/lib/Makefile.am
index cfb510352c3ece858f53baf0d083e70308bcf7ec..9a75bc2ca7057601857fbfd65372d2a0088894f7 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -37,7 +37,7 @@ localedir = $(datadir)/locale
 
 include $(top_srcdir)/lib/common.mk
 
-AM_CPPFLAGS =                                  \
+AM_CPPFLAGS +=                                 \
        -DLOCALEDIR=\"$(localedir)\"            \
        -I$(srcdir)/../gl                       \
        -I$(builddir)/../gl                     \

diff --git a/lib/accelerated/Makefile.am b/lib/accelerated/Makefile.am
index a7f8e5a7320bae27e7afd02dcc1d8c9d6f8cd472..490713490c939b13df380fb0bb735860177bb94c 100644 (file)
--- a/lib/accelerated/Makefile.am
+++ b/lib/accelerated/Makefile.am
@@ -21,7 +21,7 @@
 include $(top_srcdir)/lib/common.mk
 
 SUBDIRS = 
-AM_CPPFLAGS = \
+AM_CPPFLAGS += \
        -I$(srcdir)/../../gl            \
        -I$(builddir)/../../gl          \
        -I$(srcdir)/../includes         \

diff --git a/lib/accelerated/aarch64/Makefile.am b/lib/accelerated/aarch64/Makefile.am
index aa2cc3043141916facfc7090e2e70eedb46a31fb..0afe5d0c539b52d0eb7fbc731da49c5310c2289a 100644 (file)
--- a/lib/accelerated/aarch64/Makefile.am
+++ b/lib/accelerated/aarch64/Makefile.am
@@ -22,7 +22,7 @@ AM_LIBTOOLFLAGS=--tag=CC
 
 include $(top_srcdir)/lib/common.mk
 
-AM_CPPFLAGS = -I$(srcdir)/../../../gl          \
+AM_CPPFLAGS += -I$(srcdir)/../../../gl         \
        -I$(builddir)/../../../gl               \
        -I$(srcdir)/../../includes      \
        -I$(builddir)/../../includes    \

diff --git a/lib/accelerated/x86/Makefile.am b/lib/accelerated/x86/Makefile.am
index 58698af30079adcc6b2d68e26a7a1cdb8fc4e8d3..2d44dbd4104ce9cdf5c023dba27b438c0db44f96 100644 (file)
--- a/lib/accelerated/x86/Makefile.am
+++ b/lib/accelerated/x86/Makefile.am
@@ -22,7 +22,7 @@ AM_LIBTOOLFLAGS=--tag=CC
 
 include $(top_srcdir)/lib/common.mk
 
-AM_CPPFLAGS = -I$(srcdir)/../../../gl          \
+AM_CPPFLAGS += -I$(srcdir)/../../../gl         \
        -I$(builddir)/../../../gl               \
        -I$(srcdir)/../../includes      \
        -I$(builddir)/../../includes    \

diff --git a/lib/algorithms/Makefile.am b/lib/algorithms/Makefile.am
index 18aac8a87a1bf797162830c87e79c9d4d5776e7b..aaee64c2d9b8e95b13f22606225287f958cd7041 100644 (file)
--- a/lib/algorithms/Makefile.am
+++ b/lib/algorithms/Makefile.am
@@ -20,7 +20,7 @@
 
 include $(top_srcdir)/lib/common.mk
 
-AM_CPPFLAGS = \
+AM_CPPFLAGS += \
        -I$(srcdir)/../../gl            \
        -I$(builddir)/../../gl          \
        -I$(srcdir)/../includes         \

diff --git a/lib/auth/Makefile.am b/lib/auth/Makefile.am
index e85eaaef813c6eaeeacf84834d73750fb12bfc58..ad8c608a05430d274b180a0c3835d1e1d13b2083 100644 (file)
--- a/lib/auth/Makefile.am
+++ b/lib/auth/Makefile.am
@@ -20,7 +20,7 @@
 
 include $(top_srcdir)/lib/common.mk
 
-AM_CPPFLAGS = \
+AM_CPPFLAGS += \
        -I$(srcdir)/../../gl            \
        -I$(builddir)/../../gl          \
        -I$(srcdir)/../includes         \

diff --git a/lib/common.mk b/lib/common.mk
index 2e0d0752d059b3f54ba38fd64efceb7fa9cd20c6..811d1796988cc7ce1024460f805435d1d76c70b5 100644 (file)
--- a/lib/common.mk
+++ b/lib/common.mk
@@ -1,3 +1,5 @@
+AM_CPPFLAGS = -DGNUTLS_BUILDING_LIB=1
+
 AM_CFLAGS = $(WERROR_CFLAGS) $(WSTACK_CFLAGS) $(WARN_CFLAGS) $(NETTLE_CFLAGS) \
   $(LIBTASN1_CFLAGS) $(LIBIDN2_CFLAGS) $(P11_KIT_CFLAGS) $(LIBZSTD_CFLAGS) \
   $(CODE_COVERAGE_CFLAGS)

diff --git a/lib/ext/Makefile.am b/lib/ext/Makefile.am
index 81efdbc55a7600940671001a33b5ecd704ae9a8f..d3a9ddcddc804d59ea8146e71550906c71e57a0a 100644 (file)
--- a/lib/ext/Makefile.am
+++ b/lib/ext/Makefile.am
@@ -20,7 +20,7 @@
 
 include $(top_srcdir)/lib/common.mk
 
-AM_CPPFLAGS = \
+AM_CPPFLAGS += \
        -I$(srcdir)/../../gl            \
        -I$(builddir)/../../gl          \
        -I$(srcdir)/../includes         \

diff --git a/lib/extras/Makefile.am b/lib/extras/Makefile.am
index 7e5274b26474b1917835724c00a5c0d45f6366d0..e7627bbf44e6ad7448f7f43d879e15ee73df6ee8 100644 (file)
--- a/lib/extras/Makefile.am
+++ b/lib/extras/Makefile.am
@@ -20,7 +20,7 @@
 
 include $(top_srcdir)/lib/common.mk
 
-AM_CPPFLAGS = \
+AM_CPPFLAGS += \
        -I$(srcdir)/../../gl            \
        -I$(builddir)/../../gl          \
        -I$(srcdir)/../includes         \

diff --git a/lib/liboqs/Makefile.am b/lib/liboqs/Makefile.am
index 782daf7307bb226944e20831d41045f433d9ed41..5ac3e3941634b1a0df2bdb9934eaa90958fa067f 100644 (file)
--- a/lib/liboqs/Makefile.am
+++ b/lib/liboqs/Makefile.am
@@ -23,7 +23,7 @@ include $(top_srcdir)/lib/common.mk
 
 AM_CFLAGS += $(LIBOQS_CFLAGS)
 
-AM_CPPFLAGS = \
+AM_CPPFLAGS += \
        -I$(srcdir)/../../gl            \
        -I$(builddir)/../../gl          \
        -I$(srcdir)/../includes         \

diff --git a/lib/minitasn1/Makefile.am b/lib/minitasn1/Makefile.am
index a0e39c5c404e5aafbb24eb3e2aec3c28233e5cad..1f4854c8812bb7e12c3177d2d3f384a078002b65 100644 (file)
--- a/lib/minitasn1/Makefile.am
+++ b/lib/minitasn1/Makefile.am
@@ -20,7 +20,7 @@
 
 include $(top_srcdir)/lib/common.mk
 
-AM_CPPFLAGS = -DASN1_BUILDING          \
+AM_CPPFLAGS += -DASN1_BUILDING=1       \
        -I$(srcdir)/../../gl            \
        -I$(builddir)/../../gl          \
        -I$(srcdir)/..

diff --git a/lib/nettle/Makefile.am b/lib/nettle/Makefile.am
index be6580550ac4a6119959d81255916ecd7b8c8dcf..7b60c4a5184e46bb5b4e17d5c50fc3ccf7c7e9c0 100644 (file)
--- a/lib/nettle/Makefile.am
+++ b/lib/nettle/Makefile.am
@@ -22,7 +22,7 @@ include $(top_srcdir)/lib/common.mk
 
 AM_CFLAGS += $(HOGWEED_CFLAGS) $(GMP_CFLAGS)
 
-AM_CPPFLAGS = \
+AM_CPPFLAGS += \
        -I$(srcdir)/int         \
        -I$(srcdir)/backport            \
        -I$(srcdir)/../../gl            \

diff --git a/lib/x509/Makefile.am b/lib/x509/Makefile.am
index 5caf8f87f9bbbb08cf0d92dd60a9690364378c42..6f77cb38151ccc7f42dcdeda51518a2c6ee78d48 100644 (file)
--- a/lib/x509/Makefile.am
+++ b/lib/x509/Makefile.am
@@ -18,7 +18,7 @@
 
 include $(top_srcdir)/lib/common.mk
 
-AM_CPPFLAGS = \
+AM_CPPFLAGS += \
        -I$(srcdir)/../../gl            \
        -I$(builddir)/../../gl          \
        -I$(srcdir)/../includes         \