Add config option to use dlmalloc instead of mheap

[vpp.git] / src / vpp.am

diff --git a/src/vpp.am b/src/vpp.am
index 1c95949..c5fd48a 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.
 
-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                                        \
-  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                                        \
@@ -33,18 +35,23 @@ if WITH_APICLI
   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_SOURCES +=                             \
-  vpp/api/gmon.c
+bin_vpp_CFLAGS = @APICLI@ @DLMALLOC@
 
 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
 
-API_FILES += vpp/api/vpe.api
+API_FILES +=                                   \
+  vpp/api/vpe.api                              \
+  vpp/stats/stats.api                          \
+  vpp/oam/oam.api
 
 BUILT_SOURCES += .version
 
@@ -85,6 +92,10 @@ bin_vpp_LDADD = \
 
 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
 
@@ -112,14 +123,28 @@ endif
 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 = \
+   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
 
+
+
 bin_PROGRAMS += bin/vpp_get_metrics
 
 bin_vpp_get_metrics_SOURCES = \