X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=vpp%2FMakefile.am;h=73e01b79c1c7817313f6ffd00d82cdefda765fb2;hb=1f8aeb90270961bca6838afa01a1e4ecc3f9236a;hp=1e3bbf08ebd1b6febd99a90ed479573a6c718ab9;hpb=a0d4a1a6d1b81b132787e382ac3f8487b71cf52c;p=vpp.git

diff --git a/vpp/Makefile.am b/vpp/Makefile.am
index 1e3bbf08ebd..73e01b79c1c 100644
--- a/vpp/Makefile.am
+++ b/vpp/Makefile.am
@@ -13,7 +13,7 @@
 
 AUTOMAKE_OPTIONS = foreign subdir-objects
 
-AM_CFLAGS = -Wall @Q_PLATFORM_DEFINE@ @Q_PLATFORM_PLUGPATH@ @DPDK@
+AM_CFLAGS = -Wall @DPDK@ @IPSEC@ @VCGN@ @IPV6SR@
 
 noinst_PROGRAMS = 
 BUILT_SOURCES =
@@ -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 =			\
@@ -51,30 +51,35 @@ api_DATA = api/vpe.api
 
 BUILT_SOURCES += api/vpe.api.h app/version.h
 
+app/version.o:	app/version.h
+
 .PHONY:	app/version.h
 
-app/version.h: ../build-root/scripts/version
-	@echo "#define VPP_BUILD_DATE \"$$(date)\"" 	 			 > $@
-	@echo "#define VPP_BUILD_USER \"$$(whoami)\"" 				>> $@
-	@echo "#define VPP_BUILD_HOST \"$$(hostname)\"" 			>> $@
+app/version.h:
+	@echo "  VERSION " $@ 
+	@echo "#define VPP_BUILD_DATE \"$$(date)\"" > $@
+	@echo "#define VPP_BUILD_USER \"$$(whoami)\"" >> $@
+	@echo "#define VPP_BUILD_HOST \"$$(hostname)\"" >> $@
 	@echo "#define VPP_BUILD_TOPDIR \"$$(git rev-parse --show-toplevel)\"" 	>> $@
-	@echo "#define VPP_BUILD_VER \"$$(../../scripts/version)\"" 		>> $@
+	@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
+vpp_LDADD += -lvppinfra -lm -lpthread -ldl
 
-vpe_LDADD += -lvppinfra -lm -lpthread -lcrypto -ldl
+if WITH_IPV6SR
+  vpp_LDADD += -lcrypto
+endif
 
 SUFFIXES = .api.h .api