diff options
| author | Toni Uhlig <matzeton@googlemail.com> | 2022-07-12 11:55:58 +0200 |
|---|---|---|
| committer | Toni Uhlig <matzeton@googlemail.com> | 2022-07-12 19:40:43 +0200 |
| commit | 30f96ad51bbc90d63411a407853bfc132f27ccc2 (patch) | |
| tree | 4628afc521403a4e802d4b129fa72c97c6b9e765 /rrdtool/Makefile.in | |
| parent | b4cb14ec1922b16a52c24324792f2bd7819f04a7 (diff) | |
Do not interfere with CFLAGS/LDFLAGS env anymore.improved/c-ld-flags-copts
* CI fixes
* some build systems do not like that (e.g. OpenWrt)
* fixed some rrdtool related build warnings/errors
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
Diffstat (limited to 'rrdtool/Makefile.in')
| -rw-r--r-- | rrdtool/Makefile.in | 7 |
1 files changed, 4 insertions, 3 deletions
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) *~ |