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 --- rrdtool/Makefile.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'rrdtool/Makefile.in') diff --git a/rrdtool/Makefile.in b/rrdtool/Makefile.in index 55f0d6a10..f1768b788 100644 --- a/rrdtool/Makefile.in +++ b/rrdtool/Makefile.in @@ -1,7 +1,8 @@ CC=@CC@ INC=-I ../src/include -I/usr/local/include LIBDPI=../src/lib/libndpi.a -LDFLAGS=@LDFLAGS@ +CFLAGS+=@NDPI_CFLAGS@ +LDFLAGS+=@NDPI_LDFLAGS@ LIB=$(LIBDPI) -lm @ADDITIONAL_LIBS@ @LIBRRD@ @LIBS@ TOOLS=rrd_anomaly rrd_similarity @@ -9,10 +10,10 @@ TOOLS=rrd_anomaly rrd_similarity all: $(TOOLS) rrd_anomaly: rrd_anomaly.c Makefile $(LIBDPI) - $(CC) $(CPPFLAGS) -g $(INC) $(LDFLAGS) rrd_anomaly.c -o rrd_anomaly $(LIB) + $(CC) $(CFLAGS) $(CPPFLAGS) -g $(INC) $(LDFLAGS) rrd_anomaly.c -o rrd_anomaly $(LIB) rrd_similarity: rrd_similarity.c Makefile $(LIBDPI) - $(CC) $(CPPFLAGS) -g $(INC) $(LDFLAGS) rrd_similarity.c -o rrd_similarity $(LIB) + $(CC) $(CFLAGS) $(CPPFLAGS) -g $(INC) $(LDFLAGS) rrd_similarity.c -o rrd_similarity $(LIB) clean: /bin/rm -f *.o $(TOOLS) *~ -- cgit v1.2.3