From 30f96ad51bbc90d63411a407853bfc132f27ccc2 Mon Sep 17 00:00:00 2001 From: Toni Uhlig Date: Tue, 12 Jul 2022 11:55:58 +0200 Subject: Do not interfere with CFLAGS/LDFLAGS env anymore. * CI fixes * some build systems do not like that (e.g. OpenWrt) * fixed some rrdtool related build warnings/errors Signed-off-by: Toni Uhlig --- tests/dga/Makefile.in | 4 ++-- tests/unit/Makefile.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/dga/Makefile.in b/tests/dga/Makefile.in index 52fdea113..39958c4f9 100644 --- a/tests/dga/Makefile.in +++ b/tests/dga/Makefile.in @@ -7,10 +7,10 @@ SRCHOME=../../src ifneq ($(OS),Windows_NT) CFLAGS+=-fPIC -DPIC endif -CFLAGS+=-g -I$(SRCHOME)/include @CFLAGS@ +CFLAGS+=-g -I$(SRCHOME)/include @NDPI_CFLAGS@ LIBNDPI=$(SRCHOME)/lib/libndpi.a LIBS=$(LIBNDPI) @ADDITIONAL_LIBS@ -lpthread @LIBS@ -LDFLAGS=@LDFLAGS@ +LDFLAGS+=@NDPI_LDFLAGS@ HEADERS=$(SRCHOME)/include/ndpi_api.h $(SRCHOME)/include/ndpi_typedefs.h $(SRCHOME)/include/ndpi_protocol_ids.h OBJS=dga_evaluate PREFIX?=@prefix@ diff --git a/tests/unit/Makefile.in b/tests/unit/Makefile.in index 9185c9031..34eb50558 100644 --- a/tests/unit/Makefile.in +++ b/tests/unit/Makefile.in @@ -8,10 +8,10 @@ SRCHOME=../../src ifneq ($(OS),Windows_NT) CFLAGS+=-fPIC -DPIC endif -CFLAGS+=-g -I$(SRCHOME)/include @JSONC_CFLAGS@ @PCAP_INC@ @CFLAGS@ +CFLAGS+=-g -I$(SRCHOME)/include @NDPI_CFLAGS@ @JSONC_CFLAGS@ @PCAP_INC@ LIBNDPI=$(SRCHOME)/lib/libndpi.a LIBS=$(LIBNDPI) @PCAP_LIB@ @ADDITIONAL_LIBS@ @JSONC_LIBS@ @LIBS@ -LDFLAGS=@LDFLAGS@ +LDFLAGS+=@NDPI_LDFLAGS@ HEADERS=$(SRCHOME)/include/ndpi_api.h $(SRCHOME)/include/ndpi_typedefs.h $(SRCHOME)/include/ndpi_protocol_ids.h OBJS=unit PREFIX?=@prefix@ -- cgit v1.2.3