Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
export counters in a memfd segment
[vpp.git]
/
src
/
vpp.am
diff --git
a/src/vpp.am
b/src/vpp.am
index
8cdc60d
..
e8c0155
100644
(file)
--- a/
src/vpp.am
+++ b/
src/vpp.am
@@
-11,14
+11,16
@@
# See the License for the specific language governing permissions and
# limitations under the License.
# See the License for the specific language governing permissions and
# limitations under the License.
-bin_PROGRAMS += bin/vpp
+bin_PROGRAMS += bin/vpp
bin_vpp_SOURCES = \
vpp/vnet/main.c \
vpp/app/vpe_cli.c \
vpp/app/version.c \
vpp/oam/oam.c \
bin_vpp_SOURCES = \
vpp/vnet/main.c \
vpp/app/vpe_cli.c \
vpp/app/version.c \
vpp/oam/oam.c \
- vpp/stats/stats.c
+ vpp/oam/oam_api.c \
+ vpp/stats/stats.c \
+ vpp/stats/stat_segment.c
bin_vpp_SOURCES += \
vpp/api/api.c \
bin_vpp_SOURCES += \
vpp/api/api.c \
@@
-33,18
+35,23
@@
if WITH_APICLI
vpp/api/plugin.h
endif
vpp/api/plugin.h
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 \
vpp/api/vpe_msg_enum.h \
nobase_include_HEADERS += \
vpp/api/vpe_all_api_h.h \
vpp/api/vpe_msg_enum.h \
+ vpp/stats/stats.api.h \
+ vpp/oam/oam.api.h \
vpp/api/vpe.api.h
vpp/api/vpe.api.h
-API_FILES += vpp/api/vpe.api
+API_FILES += \
+ vpp/api/vpe.api \
+ vpp/stats/stats.api \
+ vpp/oam/oam.api
BUILT_SOURCES += .version
BUILT_SOURCES += .version
@@
-54,6
+61,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
@@
-62,9
+73,9
@@
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 ;\
echo -n "#define VPP_BUILD_TOPDIR " >> $$f ;\
echo "\"$$(cd $(srcdir) && git rev-parse --show-toplevel)\"" >> $$f ;\
echo "#define VPP_BUILD_VER \"$(VPP_VERSION)\"" >> $$f ;\
@@
-81,6
+92,10
@@
bin_vpp_LDADD = \
bin_vpp_LDFLAGS = -Wl,--export-dynamic
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
@@
-100,7
+115,6
@@
bin_test_ha_SOURCES = \
bin_test_ha_LDADD = \
libvlibmemoryclient.la \
bin_test_ha_LDADD = \
libvlibmemoryclient.la \
- libvlibapi.la \
libsvm.la \
libvppinfra.la \
-lpthread -lm -lrt
libsvm.la \
libvppinfra.la \
-lpthread -lm -lrt
@@
-109,14
+123,28
@@
endif
noinst_PROGRAMS += bin/summary_stats_client
bin_summary_stats_client_SOURCES = \
noinst_PROGRAMS += bin/summary_stats_client
bin_summary_stats_client_SOURCES = \
- vpp/api/summary_stats_client.c
+
vpp/api/summary_stats_client.c
bin_summary_stats_client_LDADD = \
bin_summary_stats_client_LDADD = \
+ libvlibmemoryclient.la \
+ libsvm.la \
+ libvppinfra.la \
+ -lpthread -lm -lrt
+
+noinst_PROGRAMS += bin/stat_client
+
+bin_stat_client_SOURCES = \
+ vpp/app/stat_client.c \
+ vpp/app/stat_client.h
+
+bin_stat_client_LDADD = \
libvlibmemoryclient.la \
libsvm.la \
libvppinfra.la \
-lpthread -lm -lrt
libvlibmemoryclient.la \
libsvm.la \
libvppinfra.la \
-lpthread -lm -lrt
+
+
bin_PROGRAMS += bin/vpp_get_metrics
bin_vpp_get_metrics_SOURCES = \
bin_PROGRAMS += bin/vpp_get_metrics
bin_vpp_get_metrics_SOURCES = \