Commit 89fa8cef authored by Leonardo Lai's avatar Leonardo Lai

move dependencies to folder

parent e7d4851b
[submodule "dpdk"] [submodule "dpdk"]
path = dpdk path = deps/dpdk
url = https://github.com/DPDK/dpdk url = https://github.com/DPDK/dpdk
[submodule "inih"] [submodule "inih"]
path = inih path = deps/inih
url = https://github.com/benhoyt/inih url = https://github.com/benhoyt/inih
...@@ -4,9 +4,10 @@ ...@@ -4,9 +4,10 @@
# #
ROOTDIR=../.. ROOTDIR=../..
DEPSDIR=${ROOTDIR}/deps
ifeq ($(RTE_SDK),) ifeq ($(RTE_TARGET),)
$(error "Please define RTE_SDK environment variable") $(error "Please define RTE_TARGET environment variable")
endif endif
ifeq ($(UDPDK_PATH),) ifeq ($(UDPDK_PATH),)
...@@ -17,14 +18,14 @@ endif ...@@ -17,14 +18,14 @@ endif
SRCS= main.c SRCS= main.c
LIBS+= -L${UDPDK_PATH}/udpdk -Wl,--whole-archive,-ludpdk,--no-whole-archive LIBS+= -L${UDPDK_PATH}/udpdk -Wl,--whole-archive,-ludpdk,--no-whole-archive
LIBS+= -L${RTE_SDK}/${RTE_TARGET}/lib -Wl,--whole-archive,-ldpdk,--no-whole-archive LIBS+= -L${DEPSDIR}/dpdk/${RTE_TARGET}/lib -Wl,--whole-archive,-ldpdk,--no-whole-archive
LIBS+= -Wl,--no-whole-archive -lrt -lm -ldl -lcrypto -pthread -lnuma LIBS+= -Wl,--no-whole-archive -lrt -lm -ldl -lcrypto -pthread -lnuma
CFLAGS += $(WERROR_FLAGS) -O3 CFLAGS += $(WERROR_FLAGS) -O3
TARGET="pingpong" TARGET="pingpong"
all: all:
cc -I${ROOTDIR}/udpdk -I${RTE_SDK}/${RTE_TARGET}/include -o ${TARGET} ${SRCS} ${LIBS} cc -I${ROOTDIR}/udpdk -I${DEPSDIR}/dpdk/${RTE_TARGET}/include -o ${TARGET} ${SRCS} ${LIBS}
.PHONY: clean .PHONY: clean
clean: clean:
......
...@@ -4,9 +4,10 @@ ...@@ -4,9 +4,10 @@
# #
ROOTDIR=../.. ROOTDIR=../..
DEPSDIR=${ROOTDIR}/deps
ifeq ($(RTE_SDK),) ifeq ($(RTE_TARGET),)
$(error "Please define RTE_SDK environment variable") $(error "Please define RTE_TARGET environment variable")
endif endif
ifeq ($(UDPDK_PATH),) ifeq ($(UDPDK_PATH),)
...@@ -17,14 +18,14 @@ endif ...@@ -17,14 +18,14 @@ endif
SRCS= main.c SRCS= main.c
LIBS+= -L${UDPDK_PATH}/udpdk -Wl,--whole-archive,-ludpdk,--no-whole-archive LIBS+= -L${UDPDK_PATH}/udpdk -Wl,--whole-archive,-ludpdk,--no-whole-archive
LIBS+= -L${RTE_SDK}/${RTE_TARGET}/lib -Wl,--whole-archive,-ldpdk,--no-whole-archive LIBS+= -L${DEPSDIR}/dpdk/${RTE_TARGET}/lib -Wl,--whole-archive,-ldpdk,--no-whole-archive
LIBS+= -Wl,--no-whole-archive -lrt -lm -ldl -lcrypto -pthread -lnuma LIBS+= -Wl,--no-whole-archive -lrt -lm -ldl -lcrypto -pthread -lnuma
CFLAGS += $(WERROR_FLAGS) -O3 CFLAGS += $(WERROR_FLAGS) -O3
TARGET="pktgen" TARGET="pktgen"
all: all:
cc -I${ROOTDIR}/udpdk -I${RTE_SDK}/${RTE_TARGET}/include -o ${TARGET} ${SRCS} ${LIBS} cc -I${ROOTDIR}/udpdk -I${DEPSDIR}/dpdk/${RTE_TARGET}/include -o ${TARGET} ${SRCS} ${LIBS}
.PHONY: clean .PHONY: clean
clean: clean:
......
File moved
File moved
...@@ -4,25 +4,23 @@ ...@@ -4,25 +4,23 @@
# #
ROOTDIR?=${CURDIR}/.. ROOTDIR?=${CURDIR}/..
DEPSDIR=${ROOTDIR}/deps
PREFIX=/usr/local PREFIX=/usr/local
PREFIX_LIB=${PREFIX}/lib PREFIX_LIB=${PREFIX}/lib
PREFIX_INCLUDE=/usr/local/include PREFIX_INCLUDE=/usr/local/include
PREFIX_BIN=/usr/local/bin PREFIX_BIN=/usr/local/bin
UDPDK_VERSION=0.1 UDPDK_VERSION=1.0
# root is only needed to perform install # root is only needed to perform install
ifneq ($(shell id -u), 0) ifneq ($(shell id -u), 0)
ifeq ($(RTE_SDK),)
$(error "Please define RTE_SDK environment variable")
endif
ifeq ($(RTE_TARGET),) ifeq ($(RTE_TARGET),)
$(error "Please define RTE_TARGET environment variable") $(error "Please define RTE_TARGET environment variable")
endif endif
endif endif
UDPDK_DPDK=${RTE_SDK}/${RTE_TARGET} UDPDK_DPDK=${DEPSDIR}/dpdk/${RTE_TARGET}
INIH=${ROOTDIR}/inih INIH=${DEPSDIR}/inih
CFLAGS= -march=native -O2 CFLAGS= -march=native -O2
CFLAGS+= -Wall -Wno-deprecated-declarations -Werror -Wno-unused-variable CFLAGS+= -Wall -Wno-deprecated-declarations -Werror -Wno-unused-variable
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment