saiplayer: Change player to saiplayer and add it into syncd package (s…

…onic-net#114) * debian: Change player to saiplayer and add it into syncd package * .gitignore: Add saiplayer and saidump
dmytroxshevchuk · Nov 10, 2016 · b5edf8a · b5edf8a
1 parent 9762273
commit b5edf8a
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 17 deletions.
diff --git a/.gitignore b/.gitignore
@@ -65,7 +65,8 @@ deps/
 ###############
 syncd/syncd
 syncd/syncd_request_shutdown
-player/player
+saiplayer/saiplayer
+saidump/saidump
 meta/tests
 
 # Temporary files #

diff --git a/Makefile.am b/Makefile.am
@@ -1 +1 @@
-SUBDIRS = meta lib vslib syncd player saidump
+SUBDIRS = meta lib vslib syncd saiplayer saidump
diff --git a/configure.ac b/configure.ac
@@ -95,5 +95,5 @@ AC_OUTPUT(Makefile
           vslib/Makefile
           vslib/src/Makefile
           syncd/Makefile
-          player/Makefile
+          saiplayer/Makefile
           saidump/Makefile)
diff --git a/debian/syncd.install b/debian/syncd.install
@@ -1,3 +1,4 @@
 usr/bin/saidump
+usr/bin/saiplayer
 usr/bin/syncd*
 etc/*
diff --git a/player/Makefile.am b/player/Makefile.am
diff --git a/saiplayer/Makefile.am b/saiplayer/Makefile.am
@@ -0,0 +1,13 @@
+AM_CPPFLAGS = -I/usr/include/sai
+
+bin_PROGRAMS = saiplayer
+
+if DEBUG
+DBGFLAGS = -ggdb -DDEBUG
+else
+DBGFLAGS = -g
+endif
+
+saiplayer_SOURCES = saiplayer.cpp
+saiplayer_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON)
+saiplayer_LDADD = -lhiredis -lswsscommon -lpthread -L$(top_srcdir)/meta/.libs -lsaimetadata -L$(top_srcdir)/lib/src/.libs -lsairedis
diff --git a/player/player.cpp → saiplayer/saiplayer.cpp b/player/player.cpp → saiplayer/saiplayer.cpp
@@ -1112,7 +1112,7 @@ int replay(int argc, char **argv)
 
 void printUsage()
 {
-    std::cout << "Usage: player [-h] recordfile" << std::endl << std::endl;
+    std::cout << "Usage: saiplayer [-h] recordfile" << std::endl << std::endl;
     std::cout << "    -C --skipNotifySyncd:" << std::endl;
     std::cout << "        Will not send notify init/apply view to syncd" << std::endl << std::endl;
     std::cout << "    -d --enableDebug:" << std::endl;
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		SUBDIRS = meta lib vslib syncd player saidump
		SUBDIRS = meta lib vslib syncd saiplayer saidump