Do not interfere with CFLAGS/LDFLAGS env anymore. (#1659)
* 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>
This commit is contained 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@
|
||||
|
||||
@@ -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@
|
||||
|
||||
Reference in New Issue
Block a user