From 730b985b03f79b5bd9c46edb8f1dc77a7db92547 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Thu, 14 Jan 2016 20:08:07 -0800 Subject: [PATCH 1/1] pktbuf: Move from 'ofproto' to 'lib'. An upcoming commit will use this library from ofp-util instead of ofproto. Signed-off-by: Ben Pfaff Acked-by: Jarno Rajahalme --- lib/automake.mk | 4 +++- {ofproto => lib}/pktbuf.c | 0 {ofproto => lib}/pktbuf.h | 0 ofproto/automake.mk | 4 +--- 4 files changed, 4 insertions(+), 4 deletions(-) rename {ofproto => lib}/pktbuf.c (100%) rename {ofproto => lib}/pktbuf.h (100%) diff --git a/lib/automake.mk b/lib/automake.mk index 39a652be0..27a16691e 100644 --- a/lib/automake.mk +++ b/lib/automake.mk @@ -1,4 +1,4 @@ -# Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014, 2015 Nicira, Inc. +# Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Nicira, Inc. # # Copying and distribution of this file, with or without modification, # are permitted in any medium without royalty provided the copyright @@ -195,6 +195,8 @@ lib_libopenvswitch_la_SOURCES = \ lib/pcap-file.h \ lib/perf-counter.h \ lib/perf-counter.c \ + lib/pktbuf.c \ + lib/pktbuf.h \ lib/poll-loop.c \ lib/poll-loop.h \ lib/process.c \ diff --git a/ofproto/pktbuf.c b/lib/pktbuf.c similarity index 100% rename from ofproto/pktbuf.c rename to lib/pktbuf.c diff --git a/ofproto/pktbuf.h b/lib/pktbuf.h similarity index 100% rename from ofproto/pktbuf.h rename to lib/pktbuf.h diff --git a/ofproto/automake.mk b/ofproto/automake.mk index 50e7507ba..7486f2bb4 100644 --- a/ofproto/automake.mk +++ b/ofproto/automake.mk @@ -1,4 +1,4 @@ -# Copyright (C) 2009, 2010, 2011, 2012, 2014 Nicira, Inc. +# Copyright (C) 2009, 2010, 2011, 2012, 2014, 2016 Nicira, Inc. # # Copying and distribution of this file, with or without modification, # are permitted in any medium without royalty provided the copyright @@ -43,8 +43,6 @@ ofproto_libofproto_la_SOURCES = \ ofproto/ofproto-dpif-xlate.c \ ofproto/ofproto-dpif-xlate.h \ ofproto/ofproto-provider.h \ - ofproto/pktbuf.c \ - ofproto/pktbuf.h \ ofproto/pinsched.c \ ofproto/pinsched.h \ ofproto/tunnel.c \ -- 2.20.1