Skip to content

Commit 8f16c8c

Browse files
authored
Fix NF Makefiles' NFLib and ONVMHelper Includes (#279)
With the introduction of NF config file support in dca9f75, the Scaling Example and NDPI Stats NFs' Makefiles were not updated to include and link the correct paths/libs to build cJSON dependencies correctly. This change adds the appropriate CFLAGS and LDFLAGS to build things.
1 parent 8984e68 commit 8f16c8c

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

examples/ndpi_stats/Makefile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,15 @@ SRCS-y := ndpi_stats.c ndpi_util.c
5858
ONVM= $(SRCDIR)/../../onvm
5959

6060
CFLAGS += -O3 $(USER_FLAGS)
61-
#CFLAGS += $(WERROR_FLAGS) -O3 $(USER_FLAGS)
62-
CFLAGS += -I$(ONVM)/onvm_nflib
63-
LDFLAGS += $(ONVM)/onvm_nflib/$(RTE_TARGET)/libonvm.a
6461

6562
CFLAGS += -I$(NDPI_HOME)/src/include
6663
LDFLAGS += $(NDPI_HOME)/lib/libndpi.a
6764

65+
CFLAGS += -I$(ONVM)/onvm_nflib
66+
CFLAGS += -I$(ONVM)/lib
67+
LDFLAGS += $(ONVM)/onvm_nflib/$(RTE_TARGET)/libonvm.a
68+
LDFLAGS += $(ONVM)/lib/$(RTE_TARGET)/lib/libonvmhelper.a -lm
69+
6870
LDFLAGS += -lpcap
6971

7072
include $(RTE_SDK)/mk/rte.extapp.mk

examples/scaling_example/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,9 @@ ONVM ?= $(SRCDIR)/../../onvm
5555
CFLAGS += $(WERROR_FLAGS) -O3 $(USER_FLAGS)
5656

5757
CFLAGS += -I$(ONVM)/onvm_nflib
58+
CFLAGS += -I$(ONVM)/lib
5859
LDFLAGS += $(ONVM)/onvm_nflib/$(RTE_TARGET)/libonvm.a
60+
LDFLAGS += $(ONVM)/lib/$(RTE_TARGET)/lib/libonvmhelper.a -lm
5961

6062
# workaround for a gcc bug with noreturn attribute
6163
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12603

0 commit comments

Comments
 (0)