Move DBGFLAGS initialization to configure.ac

sonic-net · Aug 21, 2021 · add29e0 · add29e0
1 parent e75abb7
commit add29e0
Show file tree

Hide file tree

Showing 11 changed files with 2 additions and 60 deletions.
diff --git a/configure.ac b/configure.ac
@@ -27,6 +27,8 @@ AC_ARG_ENABLE(debug,
 esac],[debug=false])
 AM_CONDITIONAL(DEBUG, test x$debug = xtrue)
 
+AM_COND_IF([DEBUG], AC_SUBST(DBGFLAGS, "-ggdb -DDEBUG"), AC_SUBST(DBGFLAGS, "-g"))
+
 AC_ARG_WITH(sai,
 [  --with-sai=vs           compiling against specific SAI],
 [case "${withval}" in

diff --git a/lib/src/Makefile.am b/lib/src/Makefile.am
@@ -1,11 +1,5 @@
 AM_CXXFLAGS = -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/experimental -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/lib/inc
 
-if DEBUG
-DBGFLAGS = -ggdb -DDEBUG
-else
-DBGFLAGS = -g
-endif
-
 lib_LTLIBRARIES = libsairedis.la
 
 noinst_LIBRARIES = libSaiRedis.a

diff --git a/meta/Makefile.am b/meta/Makefile.am
@@ -1,12 +1,6 @@
 AM_CFLAGS = -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/experimental -I$(top_srcdir)/SAI/meta
 AM_CXXFLAGS = -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/experimental -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/lib/inc
 
-if DEBUG
-DBGFLAGS = -ggdb -DDEBUG
-else
-DBGFLAGS = -g
-endif
-
 lib_LTLIBRARIES = libsaimetadata.la libsaimeta.la
 
 BUILT_SOURCES = $(top_srcdir)/SAI/meta/saimetadata.c $(top_srcdir)/SAI/meta/saimetadata.h

diff --git a/saiasiccmp/Makefile.am b/saiasiccmp/Makefile.am
@@ -2,12 +2,6 @@ AM_CXXFLAGS = -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/experimental -I$(top_s
 
 bin_PROGRAMS = saiasiccmp
 
-if DEBUG
-DBGFLAGS = -ggdb -DDEBUG
-else
-DBGFLAGS = -g
-endif
-
 noinst_LIBRARIES = libAsicCmp.a
 
 libAsicCmp_a_SOURCES = \

diff --git a/saidiscovery/Makefile.am b/saidiscovery/Makefile.am
@@ -2,12 +2,6 @@ AM_CXXFLAGS = -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/experimental -I$(top_s
 
 bin_PROGRAMS = saidiscovery
 
-if DEBUG
-DBGFLAGS = -ggdb -DDEBUG
-else
-DBGFLAGS = -g
-endif
-
 if SAIVS
 SAILIB=-L$(top_srcdir)/vslib/src/.libs -lsaivs
 else

diff --git a/saidump/Makefile.am b/saidump/Makefile.am
@@ -2,12 +2,6 @@ AM_CXXFLAGS = -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/experimental -I$(top_s
 
 bin_PROGRAMS = saidump
 
-if DEBUG
-DBGFLAGS = -ggdb -DDEBUG
-else
-DBGFLAGS = -g
-endif
-
 saidump_SOURCES = saidump.cpp
 saidump_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS)
 saidump_CXXFLAGS = $(DBGFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS_COMMON) $(CODE_COVERAGE_CXXFLAGS)

diff --git a/saiplayer/Makefile.am b/saiplayer/Makefile.am
@@ -2,12 +2,6 @@ AM_CXXFLAGS = -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/experimental -I$(top_s
 
 bin_PROGRAMS = saiplayer
 
-if DEBUG
-DBGFLAGS = -ggdb -DDEBUG
-else
-DBGFLAGS = -g
-endif
-
 noinst_LIBRARIES = libSaiPlayer.a
 
 libSaiPlayer_a_SOURCES = \

diff --git a/saisdkdump/Makefile.am b/saisdkdump/Makefile.am
@@ -2,12 +2,6 @@ AM_CXXFLAGS = -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/experimental -I$(top_s
 
 bin_PROGRAMS = saisdkdump
 
-if DEBUG
-DBGFLAGS = -ggdb -DDEBUG
-else
-DBGFLAGS = -g
-endif
-
 if SAIVS
 SAILIB=-L$(top_srcdir)/vslib/src/.libs -lsaivs
 else

diff --git a/syncd/Makefile.am b/syncd/Makefile.am
@@ -1,11 +1,5 @@
 AM_CXXFLAGS = -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/experimental -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/lib/inc -I$(top_srcdir)/vslib/inc
 
-if DEBUG
-DBGFLAGS = -ggdb -DDEBUG
-else
-DBGFLAGS = -g
-endif
-
 if SAIVS
 SAILIB=-L$(top_srcdir)/vslib/src/.libs -lsaivs
 else

diff --git a/tests/Makefile.am b/tests/Makefile.am
@@ -2,12 +2,6 @@ AM_CXXFLAGS = -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/experimental -I$(top_s
 
 bin_PROGRAMS = vssyncd tests testclient
 
-if DEBUG
-DBGFLAGS = -ggdb -DDEBUG
-else
-DBGFLAGS = -g
-endif
-
 SAILIB=-L$(top_srcdir)/vslib/src/.libs -lsaivs
 
 vssyncd_SOURCES = main.cpp

diff --git a/vslib/src/Makefile.am b/vslib/src/Makefile.am
@@ -1,11 +1,5 @@
 AM_CXXFLAGS = -I$(top_srcdir)/SAI/inc -I$(top_srcdir)/SAI/experimental -I$(top_srcdir)/SAI/meta -I$(top_srcdir)/vslib/inc -I$(top_srcdir)/lib/inc -I/usr/include/libnl3
 
-if DEBUG
-DBGFLAGS = -ggdb -DDEBUG
-else
-DBGFLAGS = -g
-endif
-
 lib_LTLIBRARIES = libsaivs.la
 
 noinst_LIBRARIES = libSaiVS.a