From 08ff7e00bf0e7cf93a732e98a026a76a4349fd41 Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
Date: Wed, 20 Jan 2016 13:45:36 +0100
Subject: Rename vpe binary name to avoid collision with latex

Change-Id: I34a46b9ebbc0e36486fbef528b34ea1c3be2e8be
Signed-off-by: Damjan Marion <damarion@cisco.com>
---
 vpp/Makefile.am       | 20 ++++++++++----------
 vpp/conf/startup.conf |  2 +-
 vpp/configure.ac      |  2 +-
 vpp/vnet/main.c       |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'vpp')

diff --git a/vpp/Makefile.am b/vpp/Makefile.am
index 8560fe54..5103646c 100644
--- a/vpp/Makefile.am
+++ b/vpp/Makefile.am
@@ -21,22 +21,22 @@ bin_PROGRAMS =
 CLEANFILES = 
 lib_LTLIBRARIES =
 
-bin_PROGRAMS += vpe
+bin_PROGRAMS += vpp
 
-vpe_SOURCES =					\
+vpp_SOURCES =					\
   vnet/main.c					\
   app/vpe_cli.c					\
   app/version.c					\
   oam/oam.c					\
   stats/stats.c
 
-vpe_SOURCES +=					\
+vpp_SOURCES +=					\
   api/api.c					\
   api/custom_dump.c
 
 # comment out to disable stats upload to gmond 
 
-vpe_SOURCES +=					\
+vpp_SOURCES +=					\
   api/gmon.c	
 
 nobase_include_HEADERS =			\
@@ -63,21 +63,21 @@ app/version.h:
 	@echo "#define VPP_BUILD_TOPDIR \"$$(git rev-parse --show-toplevel)\"" 	>> $@
 	@echo "#define VPP_BUILD_VER \"$$(../../scripts/version)\"" >> $@
 
-vpe_LDADD = -lvlibapi -lvlibmemory  -lvlib_unix -lvlib 
+vpp_LDADD = -lvlibapi -lvlibmemory  -lvlib_unix -lvlib
 
-vpe_LDADD += -l:libvnet.a
+vpp_LDADD += -l:libvnet.a
 
-vpe_LDADD += -lsvm -lsvmdb -lrt
+vpp_LDADD += -lsvm -lsvmdb -lrt
 
-vpe_LDADD += -lvnetplugin
+vpp_LDADD += -lvnetplugin
 
 if WITH_DPDK
-vpe_LDADD += -l:libdpdk.a
+vpp_LDADD += -l:libdpdk.a
 endif
 
 # These go last
 
-vpe_LDADD += -lvppinfra -lm -lpthread -lcrypto -ldl
+vpp_LDADD += -lvppinfra -lm -lpthread -lcrypto -ldl
 
 SUFFIXES = .api.h .api
 
diff --git a/vpp/conf/startup.conf b/vpp/conf/startup.conf
index 5ce860b3..c41cf06d 100644
--- a/vpp/conf/startup.conf
+++ b/vpp/conf/startup.conf
@@ -1,7 +1,7 @@
 
 unix {
   nodaemon
-  log /tmp/vpe.log
+  log /tmp/vpp.log
   full-coredump
 }
 
diff --git a/vpp/configure.ac b/vpp/configure.ac
index 673ff5ae..8c7beb4d 100644
--- a/vpp/configure.ac
+++ b/vpp/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(vpe, 1.1)
+AC_INIT(vpp, 1.1)
 AM_INIT_AUTOMAKE
 AM_SILENT_RULES
 
diff --git a/vpp/vnet/main.c b/vpp/vnet/main.c
index da1ec9a4..d60b489e 100644
--- a/vpp/vnet/main.c
+++ b/vpp/vnet/main.c
@@ -145,7 +145,7 @@ int main (int argc, char * argv[])
 
     /*
      * Load startup config from file.
-     * usage: vpe -c /etc/vpp/startup.conf
+     * usage: vpp -c /etc/vpp/startup.conf
      */
     if ((argc == 3) && !strncmp(argv[1], "-c", 2))
       {
-- 
cgit