Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix unlinking of /dev/shm files.
[vpp.git]
/
src
/
vpp.am
diff --git
a/src/vpp.am
b/src/vpp.am
index
425f1e3
..
10a4e31
100644
(file)
--- a/
src/vpp.am
+++ b/
src/vpp.am
@@
-28,14
+28,16
@@
bin_vpp_SOURCES += \
if WITH_APICLI
bin_vpp_SOURCES += \
vpp/api/api_format.c \
if WITH_APICLI
bin_vpp_SOURCES += \
vpp/api/api_format.c \
- vpp/api/api_main.c
+ vpp/api/api_main.c \
+ vpp/api/plugin.c \
+ vpp/api/plugin.h
endif
endif
-# comment out to disable stats upload to gmond
+# uncomment to enable stats upload to gmond
+# bin_vpp_SOURCES += \
+# vpp/api/gmon.c
bin_vpp_CFLAGS = @APICLI@
bin_vpp_CFLAGS = @APICLI@
-bin_vpp_SOURCES += \
- vpp/api/gmon.c
nobase_include_HEADERS += \
vpp/api/vpe_all_api_h.h \
nobase_include_HEADERS += \
vpp/api/vpe_all_api_h.h \
@@
-52,6
+54,10
@@
vpp/app/version.o: vpp/app/version.h
VPP_VERSION = $(shell $(srcdir)/scripts/version)
VPP_VERSION = $(shell $(srcdir)/scripts/version)
+VPP_BUILD_DATE ?= $$(date)
+VPP_BUILD_USER ?= $$(whoami)
+VPP_BUILD_HOST ?= $$(hostname)
+
# update version.h only when version changes, to avoid
# unnecessary re-linking of vpp binary
# update version.h only when version changes, to avoid
# unnecessary re-linking of vpp binary
@@
-60,16
+66,15
@@
VPP_VERSION = $(shell $(srcdir)/scripts/version)
f="vpp/app/version.h" ;\
echo " VERSION $$f ($(VPP_VERSION))" ;\
echo $(VPP_VERSION) > .version ;\
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 "#define VPP_BUILD_DATE \"$(VPP_BUILD_DATE)\"" > $$f
;\
+
echo "#define VPP_BUILD_USER \"$(VPP_BUILD_USER)\"" >> $$f
;\
+
echo "#define VPP_BUILD_HOST \"$(VPP_BUILD_HOST)\"" >> $$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
bin_vpp_LDADD = \
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
bin_vpp_LDADD = \
- libvlibapi.la \
libvlibmemory.la \
libvlib.la \
libvnet.la \
libvlibmemory.la \
libvlib.la \
libvnet.la \
@@
-78,6
+83,12
@@
bin_vpp_LDADD = \
libvppinfra.la \
-lrt -lm -lpthread -ldl
libvppinfra.la \
-lrt -lm -lpthread -ldl
+bin_vpp_LDFLAGS = -Wl,--export-dynamic
+
+bin_PROGRAMS += bin/vppctl
+bin_vppctl_SOURCES = vpp/app/vppctl.c
+bin_vppctl_LDADD = libvppinfra.la
+
if ENABLE_TESTS
noinst_PROGRAMS += bin/test_client
if ENABLE_TESTS
noinst_PROGRAMS += bin/test_client
@@
-86,7
+97,6
@@
bin_test_client_SOURCES = \
bin_test_client_LDADD = \
libvlibmemoryclient.la \
bin_test_client_LDADD = \
libvlibmemoryclient.la \
- libvlibapi.la \
libsvm.la \
libvppinfra.la \
-lpthread -lm -lrt
libsvm.la \
libvppinfra.la \
-lpthread -lm -lrt
@@
-98,8
+108,6
@@
bin_test_ha_SOURCES = \
bin_test_ha_LDADD = \
libvlibmemoryclient.la \
bin_test_ha_LDADD = \
libvlibmemoryclient.la \
- libvlibapi.la \
- libsvmdb.la \
libsvm.la \
libvppinfra.la \
-lpthread -lm -lrt
libsvm.la \
libvppinfra.la \
-lpthread -lm -lrt
@@
-112,7
+120,6
@@
bin_summary_stats_client_SOURCES = \
bin_summary_stats_client_LDADD = \
libvlibmemoryclient.la \
bin_summary_stats_client_LDADD = \
libvlibmemoryclient.la \
- libvlibapi.la \
libsvm.la \
libvppinfra.la \
-lpthread -lm -lrt
libsvm.la \
libvppinfra.la \
-lpthread -lm -lrt
@@
-128,4
+135,6
@@
bin_vpp_get_metrics_LDADD = \
libvppinfra.la \
-lpthread -lm -lrt
libvppinfra.la \
-lpthread -lm -lrt
+CLEANFILES += vpp/app/version.h
+
# vi:syntax=automake
# vi:syntax=automake