From 1cd8f3c98561771c23d04ac825c745b3b1b28735 Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Thu, 24 Nov 2016 02:07:32 +0100 Subject: 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 --- vlib/Makefile.am | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'vlib/Makefile.am') 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 \ -- cgit 1.2.3-korg