diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2019-01-25 21:40:53 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2019-02-04 19:07:18 +0100 |
| commit | f797b7a1a9d7a095fc91399e40907142639e2f4e (patch) | |
| tree | 92b618668218d6f3440dd0067bec949610218d44 /lib | |
| parent | 71afdf09b820180f3125eeefaeb787155e7333fc (diff) | |
| download | gnutls-tmp-code-coverage-update.tar.gz | |
ax_code_coverage.m4: updated to latest macrotmp-code-coverage-update
Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile.am | 4 | ||||
| -rw-r--r-- | lib/accelerated/Makefile.am | 2 | ||||
| -rw-r--r-- | lib/accelerated/aarch64/Makefile.am | 2 | ||||
| -rw-r--r-- | lib/accelerated/x86/Makefile.am | 2 | ||||
| -rw-r--r-- | lib/algorithms/Makefile.am | 2 | ||||
| -rw-r--r-- | lib/auth/Makefile.am | 2 | ||||
| -rw-r--r-- | lib/common.mk | 5 | ||||
| -rw-r--r-- | lib/ext/Makefile.am | 2 | ||||
| -rw-r--r-- | lib/extras/Makefile.am | 2 | ||||
| -rw-r--r-- | lib/minitasn1/Makefile.am | 2 | ||||
| -rw-r--r-- | lib/nettle/Makefile.am | 2 | ||||
| -rw-r--r-- | lib/x509/Makefile.am | 2 |
12 files changed, 16 insertions, 13 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index 9f140469da..efb4a13eec 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -33,7 +33,7 @@ localedir = $(datadir)/locale include $(top_srcdir)/lib/common.mk -AM_CPPFLAGS = \ +AM_CPPFLAGS += \ -DLOCALEDIR=\"$(localedir)\" \ -I$(srcdir)/../gl \ -I$(builddir)/../gl \ @@ -207,7 +207,7 @@ if MACOSX libgnutls_la_LDFLAGS += -framework Security -framework CoreFoundation endif -libgnutls_la_LIBADD += $(thirdparty_libadd) +libgnutls_la_LIBADD += $(thirdparty_libadd) $(COMMON_LINK_LIBS) # C++ library diff --git a/lib/accelerated/Makefile.am b/lib/accelerated/Makefile.am index ae6adf966e..ba6cccecb5 100644 --- 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 ccf37e991b..d2cc477aab 100644 --- 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 c4ee6a1308..9335f92a39 100644 --- 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 2f5607e5a8..ef8c5efda2 100644 --- 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 9f749b04ed..f335e27623 100644 --- 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 6a1b7855d6..79eba663b1 100644 --- a/lib/common.mk +++ b/lib/common.mk @@ -1,3 +1,6 @@ +AM_CPPFLAGS = \ + $(CODE_COVERAGE_CPPFLAGS) + AM_CFLAGS = $(WERROR_CFLAGS) $(WSTACK_CFLAGS) $(WARN_CFLAGS) $(NETTLE_CFLAGS) \ $(LIBTASN1_CFLAGS) $(LIBIDN2_CFLAGS) $(P11_KIT_CFLAGS) $(CODE_COVERAGE_CFLAGS) -COMMON_LINK_FLAGS = $(CODE_COVERAGE_LDFLAGS) +COMMON_LINK_LIBS = $(CODE_COVERAGE_LIBS) diff --git a/lib/ext/Makefile.am b/lib/ext/Makefile.am index c8ef79101c..f28f71d97c 100644 --- 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 a22eb27238..a87682530d 100644 --- 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/minitasn1/Makefile.am b/lib/minitasn1/Makefile.am index 9b6769746d..2a6d51941b 100644 --- a/lib/minitasn1/Makefile.am +++ b/lib/minitasn1/Makefile.am @@ -22,7 +22,7 @@ include $(top_srcdir)/lib/common.mk -AM_CPPFLAGS = -DASN1_BUILDING \ +AM_CPPFLAGS += -DASN1_BUILDING \ -I$(srcdir)/../../gl \ -I$(builddir)/../../gl \ -I$(srcdir)/.. diff --git a/lib/nettle/Makefile.am b/lib/nettle/Makefile.am index 30a195b52b..23cc9f6b62 100644 --- 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 a10cd2f00c..a0048cee0f 100644 --- 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 \ |