summaryrefslogtreecommitdiffstats
path: root/vlib/Makefile.am
diff options
context:
space:
mode:
authorDamjan Marion <damarion@cisco.com>2016-11-24 02:07:32 +0100
committerOle Trøan <otroan@employees.org>2016-11-24 09:25:22 +0000
commit1cd8f3c98561771c23d04ac825c745b3b1b28735 (patch)
tree2725d8cd56b71fedc47b21d156270633d7b54c4f /vlib/Makefile.am
parentf3ebeda1da8b0646af7be6a04696f72572112f90 (diff)
vlib: merge buffers.c and dpdk_buffer.c
Majority of those two files are identical so makes sense to have only one. Change-Id: Id23eeb332cb23a11e54eecccefe08594e21a724e Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'vlib/Makefile.am')
-rw-r--r--vlib/Makefile.am7
1 files changed, 1 insertions, 6 deletions
diff --git a/vlib/Makefile.am b/vlib/Makefile.am
index 07a34c563c5..3da0a3abbbb 100644
--- a/vlib/Makefile.am
+++ b/vlib/Makefile.am
@@ -25,6 +25,7 @@ vlib/config.h:
echo "#define __PRE_DATA_SIZE" $(PRE_DATA_SIZE) > $@
libvlib_la_SOURCES = \
+ vlib/buffer.c \
vlib/cli.c \
vlib/cli.h \
vlib/config.h \
@@ -44,12 +45,6 @@ libvlib_la_SOURCES = \
vlib/threads_cli.c \
vlib/trace.c
-if WITH_DPDK
- libvlib_la_SOURCES += vlib/dpdk_buffer.c
-else
- libvlib_la_SOURCES += vlib/buffer.c
-endif
-
nobase_include_HEADERS = \
vlib/buffer_funcs.h \
vlib/buffer_node.h \