Revert "Non recursive automake and Debian packaging changes (sonic-ne…

…t#700)"

This reverts commit 7f40cde.

Makefile.am

@@ -1,24 +1,3 @@
-lib_LTLIBRARIES =
-bin_PROGRAMS =
-
-if DEBUG
-DBGFLAGS = -ggdb -DDEBUG
-else
-DBGFLAGS = -g -DNDEBUG
-endif
-
-SWIG_SOURCES = pyext/swsscommon.i
-SWIG_FLAG = -Wall -c++ -python -keyword
-if ARCH64
-SWIG_FLAG += -DSWIGWORDSIZE64
-endif
-
-CLEANFILES =
-
-include common/Makefile.am
-include pyext/Makefile.am
-include sonic-db-cli/Makefile.am
-include tests/Makefile.am
-
+SUBDIRS = common pyext sonic-db-cli tests
 
 ACLOCAL_AMFLAGS = -I m4

common/Makefile.am

@@ -1,80 +1,90 @@
+INCLUDES = -I $(top_srcdir)
 
-lib_LTLIBRARIES += common/libswsscommon.la
+lib_LTLIBRARIES = libswsscommon.la
 
-dist_swss_DATA = \
-    common/consumer_state_table_pops.lua \
-    common/consumer_table_pops.lua \
-    common/producer_state_table_apply_view.lua \
-    common/table_dump.lua \
-    common/portcounter.lua \
-    common/fdb_flush.lua \
-    common/fdb_flush.v2.lua
+EXTRA_DIST = \
+    consumer_state_table_pops.lua \
+    consumer_table_pops.lua \
+    producer_state_table_apply_view.lua \
+    table_dump.lua \
+    portcounter.lua \
+    fdb_flush.lua \
+    fdb_flush.v2.lua
 
-dist_swsscommon_DATA= common/database_config.json
+EXTRA_CONF_DIST = database_config.json
 
 swssdir = $(datadir)/swss
 swsscommondir = /var/run/redis/sonic-db
 
-bin_PROGRAMS += common/swssloglevel
+dist_swss_DATA = $(EXTRA_DIST)
+dist_swsscommon_DATA = $(EXTRA_CONF_DIST)
 
-common_libswsscommon_la_SOURCES = \
-    common/events_common.cpp         \
-    common/events_service.cpp        \
-    common/events.cpp                \
-    common/logger.cpp                \
-    common/redisreply.cpp            \
-    common/configdb.cpp              \
-    common/dbconnector.cpp           \
-    common/dbinterface.cpp           \
-    common/defaultvalueprovider.cpp  \
-    common/sonicv2connector.cpp      \
-    common/table.cpp                 \
-    common/decoratortable.cpp        \
-    common/json.cpp                  \
-    common/producertable.cpp         \
-    common/producerstatetable.cpp    \
-    common/rediscommand.cpp          \
-    common/redistran.cpp             \
-    common/redisselect.cpp           \
-    common/select.cpp                \
-    common/selectableevent.cpp       \
-    common/selectabletimer.cpp       \
-    common/consumertable.cpp         \
-    common/consumertablebase.cpp     \
-    common/consumerstatetable.cpp    \
-    common/ipaddress.cpp             \
-    common/ipprefix.cpp              \
-    common/ipaddresses.cpp           \
-    common/macaddress.cpp            \
-    common/netdispatcher.cpp         \
-    common/netlink.cpp               \
-    common/nfnetlink.cpp             \
-    common/notificationconsumer.cpp  \
-    common/notificationproducer.cpp  \
-    common/linkcache.cpp             \
-    common/portmap.cpp               \
-    common/pubsub.cpp                \
-    common/tokenize.cpp              \
-    common/exec.cpp                  \
-    common/saiaclschema.cpp          \
-    common/subscriberstatetable.cpp  \
-    common/decoratorsubscriberstatetable.cpp \
-    common/timestamp.cpp             \
-    common/warm_restart.cpp          \
-    common/luatable.cpp              \
-    common/countertable.cpp          \
-    common/redisutility.cpp          \
-    common/restart_waiter.cpp        \
-    common/redis_table_waiter.cpp
+bin_PROGRAMS = swssloglevel
 
-common_libswsscommon_la_CXXFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(LIBNL_CFLAGS) $(CODE_COVERAGE_CXXFLAGS)
-common_libswsscommon_la_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(LIBNL_CPPFLAGS) $(CODE_COVERAGE_CPPFLAGS)
-common_libswsscommon_la_LIBADD = -lpthread $(LIBNL_LIBS) $(CODE_COVERAGE_LIBS) -lzmq -lboost_serialization -luuid -lyang
+if DEBUG
+DBGFLAGS = -ggdb -DDEBUG
+else
+DBGFLAGS = -g -DNDEBUG
+endif
 
-common_swssloglevel_SOURCES =  \
-	common/loglevel.cpp        \
-	common/loglevel_util.cpp	
+libswsscommon_la_SOURCES = \
+    events_common.cpp         \
+    events_service.cpp        \
+    events.cpp                \
+    logger.cpp                \
+    redisreply.cpp            \
+    configdb.cpp              \
+    dbconnector.cpp           \
+    dbinterface.cpp           \
+    defaultvalueprovider.cpp  \
+    sonicv2connector.cpp      \
+    table.cpp                 \
+    decoratortable.cpp        \
+    json.cpp                  \
+    producertable.cpp         \
+    producerstatetable.cpp    \
+    rediscommand.cpp          \
+    redistran.cpp             \
+    redisselect.cpp           \
+    select.cpp                \
+    selectableevent.cpp       \
+    selectabletimer.cpp       \
+    consumertable.cpp         \
+    consumertablebase.cpp     \
+    consumerstatetable.cpp    \
+    ipaddress.cpp             \
+    ipprefix.cpp              \
+    ipaddresses.cpp           \
+    macaddress.cpp            \
+    netdispatcher.cpp         \
+    netlink.cpp               \
+    nfnetlink.cpp             \
+    notificationconsumer.cpp  \
+    notificationproducer.cpp  \
+    linkcache.cpp             \
+    portmap.cpp               \
+    pubsub.cpp                \
+    tokenize.cpp              \
+    exec.cpp                  \
+    saiaclschema.cpp          \
+    subscriberstatetable.cpp  \
+    decoratorsubscriberstatetable.cpp \
+    timestamp.cpp             \
+    warm_restart.cpp          \
+    luatable.cpp              \
+    countertable.cpp          \
+    redisutility.cpp          \
+    restart_waiter.cpp        \
+    redis_table_waiter.cpp
 
-common_swssloglevel_CXXFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CODE_COVERAGE_CXXFLAGS)
-common_swssloglevel_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CODE_COVERAGE_CPPFLAGS)
-common_swssloglevel_LDADD = common/libswsscommon.la $(CODE_COVERAGE_LIBS)
+libswsscommon_la_CXXFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(LIBNL_CFLAGS) $(CODE_COVERAGE_CXXFLAGS)
+libswsscommon_la_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(LIBNL_CPPFLAGS) $(CODE_COVERAGE_CPPFLAGS)
+libswsscommon_la_LIBADD = -lpthread $(LIBNL_LIBS) $(CODE_COVERAGE_LIBS) -lzmq -lboost_serialization -luuid -lyang
+
+swssloglevel_SOURCES =  \
+	loglevel.cpp        \
+	loglevel_util.cpp	
+
+swssloglevel_CXXFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CODE_COVERAGE_CXXFLAGS)
+swssloglevel_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CODE_COVERAGE_CPPFLAGS)
+swssloglevel_LDADD = libswsscommon.la $(CODE_COVERAGE_LIBS)

configure.ac

@@ -3,7 +3,7 @@ AC_CONFIG_SRCDIR([])
 AC_CONFIG_AUX_DIR(config)
 AM_CONFIG_HEADER(config.h)
 AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([foreign subdir-objects])
+AM_INIT_AUTOMAKE([foreign])
 AC_LANG_C
 AC_LANG([C++])
 AC_PROG_CC
@@ -94,6 +94,12 @@ AC_SUBST(CFLAGS_COMMON)
 
 AC_CONFIG_FILES([
     Makefile
+    common/Makefile
+    pyext/Makefile
+    pyext/py2/Makefile
+    pyext/py3/Makefile
+    sonic-db-cli/Makefile
+    tests/Makefile
 ])
 
 AC_OUTPUT

debian/compat

@@ -1 +1 @@
-12
+10

debian/control

@@ -2,7 +2,7 @@ Source: sonic
 Maintainer: Shuotian Cheng <shuche@microsoft.com>
 Section: net
 Priority: optional
-Build-Depends: dh-exec (>=0.3), debhelper (>= 12), autotools-dev, libboost-dev | libboost1.71-dev
+Build-Depends: dh-exec (>=0.3), debhelper (>= 9), autotools-dev, libboost-dev | libboost1.71-dev | libboost1.74-dev
 Standards-Version: 1.0.0
 
 Package: libswsscommon
@@ -11,9 +11,15 @@ Depends: ${shlibs:Depends}, ${misc:Pre-Depends}
 Section: libs
 Description: This package contains Switch State Service common library.
 
+Package: libswsscommon-dbg
+Architecture: any
+Depends: libswsscommon (= ${binary:Version}), ${misc:Depends}
+Section: debug
+Description: debugging symbols for libswsscommon library.
+
 Package: libswsscommon-dev
 Architecture: any
-Depends: libswsscommon (= ${binary:Version}), libboost-dev | libboost1.71-dev
+Depends: libswsscommon (= ${binary:Version}), libboost-dev | libboost1.71-dev | libboost1.74-dev
 Section: libdevel
 Description: This package contains development files for Switch State Service.
 

debian/rules

@@ -8,17 +8,17 @@ DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/default.mk
 
 # see FEATURE AREAS in dpkg-buildflags(1)
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 # see ENVIRONMENT in dpkg-buildflags(1)
 # package maintainers to append CFLAGS
 #export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
 # package maintainers to append LDFLAGS
 #export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
-DOPACKAGES = $(shell dh_listpackages)
+DEBIAN_DIST_CODENAME := $(shell lsb_release -sc | sed -e 's/\#/ /g')
 
-CONFIGURE_ARGS = --disable-static
+DOPACKAGES = $(shell dh_listpackages)
 
 # For Debian jessie, stretch, and buster, and Ubuntu bionic and focal, build
 # Python 2 bindings. This is controlled by the build profile being used.
@@ -28,12 +28,19 @@ else
 CONFIGURE_ARGS += --disable-python2
 endif
 
-# main packaging script
+# main packaging script based on dh7 syntax
 %:
-	dh $@
+	dh $@  --with autoreconf
 
 # dh_make generated override targets
 # This is example for Cmake (See https://bugs.debian.org/641051 )
 override_dh_auto_configure:
 	dh_auto_configure -- $(CONFIGURE_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS)
 #	-DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
+
+override_dh_clean:
+	dh_clean
+	rm -f pyext/swsscommon.py pyext/swsscommon_wrap.cpp
+
+override_dh_strip:
+	dh_strip -plibswsscommon --dbg-package=libswsscommon-dbg

pyext/Makefile.am

@@ -1,4 +1,6 @@
+SUBDIRS = py3
 if PYTHON2
-include pyext/py2/Makefile.am
+SUBDIRS += py2
 endif
-include pyext/py3/Makefile.am
+
+ACLOCAL_AMFLAGS = -I m4

pyext/py2/Makefile.am

@@ -1,12 +1,19 @@
-pkgpython_PYTHON = pyext/py2/swsscommon.py pyext/py2/__init__.py
-pkgpyexec_LTLIBRARIES = pyext/py2/_swsscommon.la
+SWIG_SOURCES = ../swsscommon.i
 
-pyext_py2__swsscommon_la_SOURCES = pyext/py2/swsscommon_wrap.cpp
-pyext_py2__swsscommon_la_CPPFLAGS = -std=c++11 -Icommon -I/usr/include/python$(PYTHON_VERSION)
-pyext_py2__swsscommon_la_LDFLAGS = -module
-pyext_py2__swsscommon_la_LIBADD = common/libswsscommon.la -lpython$(PYTHON_VERSION)
+pkgpython_PYTHON = swsscommon.py __init__.py
+pkgpyexec_LTLIBRARIES = _swsscommon.la
 
-pyext/py2/swsscommon_wrap.cpp: $(SWIG_SOURCES)
-	$(SWIG) $(SWIG_FLAG) -Icommon -o $@ $<
+_swsscommon_la_SOURCES = swsscommon_wrap.cpp
+_swsscommon_la_CPPFLAGS = -std=c++11 -I../../common -I/usr/include/python$(PYTHON_VERSION)
+_swsscommon_la_LDFLAGS = -module
+_swsscommon_la_LIBADD = ../../common/libswsscommon.la -lpython$(PYTHON_VERSION)
 
-CLEANFILES += pyext/py2/swsscommon_wrap.cpp pyext/py2/swsscommon.py
+SWIG_FLAG = -Wall -c++ -python -keyword
+if ARCH64
+SWIG_FLAG += -DSWIGWORDSIZE64
+endif
+
+swsscommon_wrap.cpp: $(SWIG_SOURCES)
+	$(SWIG) $(SWIG_FLAG) -I../../common -o $@ $<
+
+CLEANFILES = swsscommon_wrap.cpp

pyext/py3/Makefile.am

@@ -1,12 +1,19 @@
-pkgpython3_PYTHON = pyext/py3/swsscommon.py pyext/py3/__init__.py
-pkgpy3exec_LTLIBRARIES = pyext/py3/_swsscommon.la
+SWIG_SOURCES = ../swsscommon.i
 
-pyext_py3__swsscommon_la_SOURCES = pyext/py3/swsscommon_wrap.cpp
-pyext_py3__swsscommon_la_CPPFLAGS = -std=c++11 -Icommon -I/usr/include/python$(PYTHON3_VERSION)
-pyext_py3__swsscommon_la_LDFLAGS = -module
-pyext_py3__swsscommon_la_LIBADD = common/libswsscommon.la $(PYTHON3_BLDLIBRARY)
+pkgpython3_PYTHON = swsscommon.py __init__.py
+pkgpy3exec_LTLIBRARIES = _swsscommon.la
 
-pyext/py3/swsscommon_wrap.cpp: $(SWIG_SOURCES)
-	$(SWIG) $(SWIG_FLAG) -Icommon -o $@ $<
+_swsscommon_la_SOURCES = swsscommon_wrap.cpp
+_swsscommon_la_CPPFLAGS = -std=c++11 -I../../common -I/usr/include/python$(PYTHON3_VERSION)
+_swsscommon_la_LDFLAGS = -module
+_swsscommon_la_LIBADD = ../../common/libswsscommon.la $(PYTHON3_BLDLIBRARY)
 
-CLEANFILES += pyext/py3/swsscommon_wrap.cpp pyext/py3/swsscommon.py
+SWIG_FLAG = -Wall -c++ -python -keyword
+if ARCH64
+SWIG_FLAG += -DSWIGWORDSIZE64
+endif
+
+swsscommon_wrap.cpp: $(SWIG_SOURCES)
+	$(SWIG) $(SWIG_FLAG) -I../../common -o $@ $<
+
+CLEANFILES = swsscommon_wrap.cpp

sonic-db-cli/Makefile.am

@@ -1,11 +1,19 @@
-lib_LTLIBRARIES += sonic-db-cli/libsonicdbcli.la
-sonic_db_cli_libsonicdbcli_la_SOURCES = sonic-db-cli/sonic-db-cli.cpp
-sonic_db_cli_libsonicdbcli_la_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON)
-sonic_db_cli_libsonicdbcli_la_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON)
-sonic_db_cli_libsonicdbcli_la_LIBADD = common/libswsscommon.la -lpthread
+INCLUDES = -I $(top_srcdir)
 
-bin_PROGRAMS += sonic-db-cli/sonic-db-cli
-sonic_db_cli_sonic_db_cli_SOURCES = sonic-db-cli/sonic-db-cli.cpp sonic-db-cli/main.cpp
-sonic_db_cli_sonic_db_cli_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON)
-sonic_db_cli_sonic_db_cli_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON)
-sonic_db_cli_sonic_db_cli_LDADD = common/libswsscommon.la -lpthread
+if DEBUG
+DBGFLAGS = -ggdb -DDEBUG
+else
+DBGFLAGS = -g -DNDEBUG
+endif
+
+lib_LTLIBRARIES = libsonicdbcli.la
+libsonicdbcli_la_SOURCES = sonic-db-cli.cpp
+libsonicdbcli_la_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON)
+libsonicdbcli_la_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON)
+libsonicdbcli_la_LDFLAGS = -L$(top_srcdir)/common -lswsscommon -lpthread
+
+bin_PROGRAMS = sonic-db-cli
+sonic_db_cli_SOURCES = sonic-db-cli.cpp main.cpp
+sonic_db_cli_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON)
+sonic_db_cli_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON)
+sonic_db_cli_LDFLAGS = -L$(top_srcdir)/common -lswsscommon -lpthread