VPP-575 : Inconsistency in flag values for neighbors dump

[vpp.git] / src / vpp.am

diff --git a/src/vpp.am b/src/vpp.am
index 1d07b90..3bb2c1b 100644 (file)
--- a/src/vpp.am
+++ b/src/vpp.am
@@ -44,19 +44,30 @@ nobase_include_HEADERS +=                   \
 
 API_FILES += vpp/api/vpe.api
 
-BUILT_SOURCES += vpp/app/version.h
+BUILT_SOURCES += .version
 
 vpp/app/version.o:     vpp/app/version.h
 
-.PHONY:        vpp/app/version.h
+.PHONY:        .version
+
+VPP_VERSION = $(shell $(srcdir)/scripts/version)
+
+# update version.h only when version changes, to avoid
+# unnecessary re-linking of vpp binary
+
+.version:
+       @if [ "$$(cat .version 2> /dev/null)" != "$(VPP_VERSION)" ] ; then              \
+         f="vpp/app/version.h"                                                         ;\
+         echo "  VERSION  $$f ($(VPP_VERSION))"                                        ;\
+         echo $(VPP_VERSION) > .version                                                ;\
+         echo "#define VPP_BUILD_DATE \"$$(date)\"" > $$f                              ;\
+         echo "#define VPP_BUILD_USER \"$$(whoami)\"" >> $$f                           ;\
+         echo "#define VPP_BUILD_HOST \"$$(hostname)\"" >> $$f                         ;\
+         echo -n "#define VPP_BUILD_TOPDIR " >> $$f                                    ;\
+         echo "\"$$(cd $(srcdir) && git rev-parse --show-toplevel)\"" >> $$f           ;\
+         echo "#define VPP_BUILD_VER \"$(VPP_VERSION)\"" >> $$f                        ;\
+       fi
 
-vpp/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)\"" >> $@
 
 # Generate a plugin configuration script. Misconfiguring a
 # plugin can cause very subtle problems.
@@ -93,7 +104,6 @@ vpp_plugin_configure:
 bin_vpp_LDADD = \
   libvlibapi.la \
   libvlibmemory.la \
-  libvlib_unix.la \
   libvlib.la \
   libvnet.la \
   libsvm.la \
@@ -104,10 +114,6 @@ bin_vpp_LDADD = \
 bin_vpp_LDFLAGS = $(DPDK_LD_FLAGS)
 bin_vpp_LDADD += libvppinfra.la -lm -lpthread -ldl $(DPDK_LD_ADD)
 
-if WITH_IPV6SR
-  bin_vpp_LDADD += -lcrypto
-endif
-
 noinst_PROGRAMS += bin/test_client
 
 bin_test_client_SOURCES = \