Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Revert "ipsec: VPP-1316 calculate IP/TCP/UDP inner checksums"
[vpp.git]
/
src
/
vnet.am
diff --git
a/src/vnet.am
b/src/vnet.am
index
47159fc
..
cecc2e2
100644
(file)
--- a/
src/vnet.am
+++ b/
src/vnet.am
@@
-21,7
+21,7
@@
libvnet_la_DEPENDENCIES = \
libsvmdb.la \
libsvm.la \
libvlibmemory.la
libsvmdb.la \
libsvm.la \
libvlibmemory.la
-libvnet_multiversioning_
fil
es =
+libvnet_multiversioning_
sourc
es =
libvnet_la_LIBADD = $(libvnet_la_DEPENDENCIES) -lm -lpthread -ldl -lrt
libvnet_la_LIBADD = $(libvnet_la_DEPENDENCIES) -lm -lpthread -ldl -lrt
@@
-128,7
+128,7
@@
libvnet_la_SOURCES += \
vnet/ethernet/p2p_ethernet_input.c \
vnet/ethernet/p2p_ethernet_api.c
vnet/ethernet/p2p_ethernet_input.c \
vnet/ethernet/p2p_ethernet_api.c
-libvnet_multiversioning_
files +=
\
+libvnet_multiversioning_
sources +=
\
vnet/l2/l2_output.c
nobase_include_HEADERS += \
vnet/l2/l2_output.c
nobase_include_HEADERS += \
@@
-294,7
+294,7
@@
nobase_include_HEADERS += \
vnet/bonding/node.h \
vnet/bonding/bond.api.h
vnet/bonding/node.h \
vnet/bonding/bond.api.h
-libvnet_multiversioning_
files =
\
+libvnet_multiversioning_
sources +=
\
vnet/bonding/node.c
API_FILES += vnet/bonding/bond.api
vnet/bonding/node.c
API_FILES += vnet/bonding/bond.api
@@
-416,7
+416,7
@@
API_FILES += \
vnet/ip/rd_cp.api \
vnet/ip/punt.api
vnet/ip/rd_cp.api \
vnet/ip/punt.api
-libvnet_multiversioning_
files =
\
+libvnet_multiversioning_
sources +=
\
vnet/ip/ip4_input.c
########################################
vnet/ip/ip4_input.c
########################################
@@
-783,13
+783,26
@@
API_FILES += vnet/lisp-gpe/lisp_gpe.api
libvnet_la_SOURCES += \
vnet/dhcp/client.c \
vnet/dhcp/dhcp_client_detect.c \
libvnet_la_SOURCES += \
vnet/dhcp/client.c \
vnet/dhcp/dhcp_client_detect.c \
+ vnet/dhcp/dhcp6_client_common_dp.c \
+ vnet/dhcp/dhcp6_pd_client_dp.c \
+ vnet/dhcp/dhcp6_pd_client_cp.c \
+ vnet/dhcp/dhcp6_ia_na_client_dp.c \
+ vnet/dhcp/dhcp6_ia_na_client_cp.c \
vnet/dhcp/dhcp_api.c
nobase_include_HEADERS += \
vnet/dhcp/client.h \
vnet/dhcp/dhcp_api.c
nobase_include_HEADERS += \
vnet/dhcp/client.h \
- vnet/dhcp/dhcp.api.h
+ vnet/dhcp/dhcp6_client_common_dp.h \
+ vnet/dhcp/dhcp6_pd_client_dp.h \
+ vnet/dhcp/dhcp6_ia_na_client_dp.h \
+ vnet/dhcp/dhcp.api.h \
+ vnet/dhcp/dhcp6_pd_client_cp.api.h \
+ vnet/dhcp/dhcp6_ia_na_client_cp.api.h
-API_FILES += vnet/dhcp/dhcp.api
+API_FILES += \
+ vnet/dhcp/dhcp.api \
+ vnet/dhcp/dhcp6_pd_client_cp.api \
+ vnet/dhcp/dhcp6_ia_na_client_cp.api
########################################
# DHCP proxy
########################################
# DHCP proxy
@@
-1286,10
+1299,10
@@
if CC_SUPPORTS_AVX2
###############################################################
# AVX2
###############################################################
###############################################################
# AVX2
###############################################################
-libvnet_avx2_la_SOURCES = $(libvnet_multiversioning_
fil
es)
+libvnet_avx2_la_SOURCES = $(libvnet_multiversioning_
sourc
es)
libvnet_avx2_la_CFLAGS = \
$(AM_CFLAGS) @CPU_AVX2_FLAGS@ \
libvnet_avx2_la_CFLAGS = \
$(AM_CFLAGS) @CPU_AVX2_FLAGS@ \
- -DCLIB_M
ULTI
ARCH_VARIANT=avx2
+ -DCLIB_MARCH_VARIANT=avx2
noinst_LTLIBRARIES += libvnet_avx2.la
libvnet_la_LIBADD += libvnet_avx2.la
endif
noinst_LTLIBRARIES += libvnet_avx2.la
libvnet_la_LIBADD += libvnet_avx2.la
endif
@@
-1298,10
+1311,10
@@
if CC_SUPPORTS_AVX512
###############################################################
# AVX512
###############################################################
###############################################################
# AVX512
###############################################################
-libvnet_avx512_la_SOURCES = $(libvnet_multiversioning_
fil
es)
+libvnet_avx512_la_SOURCES = $(libvnet_multiversioning_
sourc
es)
libvnet_avx512_la_CFLAGS = \
$(AM_CFLAGS) @CPU_AVX512_FLAGS@ \
libvnet_avx512_la_CFLAGS = \
$(AM_CFLAGS) @CPU_AVX512_FLAGS@ \
- -DCLIB_M
ULTI
ARCH_VARIANT=avx512
+ -DCLIB_MARCH_VARIANT=avx512
noinst_LTLIBRARIES += libvnet_avx512.la
libvnet_la_LIBADD += libvnet_avx512.la
endif
noinst_LTLIBRARIES += libvnet_avx512.la
libvnet_la_LIBADD += libvnet_avx512.la
endif