Eliminate automake / gmake warnings.

sobomax · sobomax · commit 303a4f43efe4 · 2026-03-21T12:12:29.000-07:00
diff --git a/extractaudio/Makefile.am b/extractaudio/Makefile.am
@@ -33,7 +33,7 @@ extractaudio_LDFLAGS = $(LTO_FLAG)
 
 extractaudio_debug_SOURCES = $(extractaudio_BASESOURCES) $(RTPP_MEMDEB_CORESRCS) \
   $(rtpp_netaddr_AUTOSRCS) $(rtpp_refcnt_AUTOSRCS) $(rtpp_ringbuf_AUTOSRCS)
-extractaudio_debug_LDADD = $(extractaudio_LDADD) $(RTPP_MEMDEB_LDADD)
+extractaudio_debug_LDADD = $(extractaudio_LDADD) $(RTPP_MEMDEB_LD_ADD)
 extractaudio_debug_CPPFLAGS = $(extractaudio_CPPFLAGS) \
   $(RTPP_MEMDEB_CPPFLAGS) -DMEMDEB_APP=extractaudio
 extractaudio_debug_CFLAGS = $(NOPT_CFLAGS) $(LTO_FLAG) $(RTPP_MEMDEB_CFLAGS)
diff --git a/libre/Makefile.am b/libre/Makefile.am
@@ -50,10 +50,10 @@ noinst_LTLIBRARIES += libre_debug.la
 libre_test_CPPFLAGS += $(RTPP_MEMDEB_CPPFLAGS) -DMEMDEB_APP=libre_test
 libre_test_SOURCES += $(RTPP_MEMDEB_CORESRCS) $(rtpp_refcnt_AUTOSRCS)
 libre_test_CFLAGS += $(NOPT_CFLAGS) $(RTPP_MEMDEB_CFLAGS)
-libre_test_LDADD = $(RTPP_MEMDEB_LDADD) libre_debug.la
+libre_test_LDADD = $(RTPP_MEMDEB_LD_ADD) libre_debug.la
 else
 libre_test_CPPFLAGS += -I$(RTPP_AUTOSRC_DIR)
-libre_test_SOURCES += $(top_srcdir)/src/rtpp_mallocs.c \
-  $(top_srcdir)/src/rtpp_refcnt.c
+libre_test_SOURCES += $(MAINSRCDIR)/rtpp_mallocs.c \
+  $(MAINSRCDIR)/rtpp_refcnt.c
 libre_test_LDADD = libre.la
 endif
diff --git a/libucl/Makefile.am b/libucl/Makefile.am
@@ -40,7 +40,7 @@ libucl_test_CFLAGS = $(OPT_CFLAGS) $(RTPP_MEMDEB_CFLAGS) $(LTO_FLAG)
 libucl_test_SOURCES = libucl_test.c \
   $(top_srcdir)/modules/acct_rtcp_hep/rtpp_arh_conf.c \
   $(MAINSRCDIR)/rtpp_ucl.c $(RTPP_MEMDEB_CORESRCS) $(rtpp_refcnt_AUTOSRCS)
-libucl_test_LDADD=$(RTPP_MEMDEB_LDADD)
+libucl_test_LDADD=$(RTPP_MEMDEB_LD_ADD)
 libucl_test_LDLAGS=$(LTO_FLAG)
 
 if ENABLE_debug
diff --git a/m4/memdeb.ami b/m4/memdeb.ami
@@ -13,4 +13,4 @@ RTPP_MEMDEB_CORESRCS = $(MAINSRCDIR)/rtpp_memdeb.c $(MAINSRCDIR)/rtpp_memdeb.h \
 if !ENABLE_LIBUNWIND
 RTPP_MEMDEB_CFLAGS = -fno-omit-frame-pointer
 endif
-RTPP_MEMDEB_LDADD = $(top_srcdir)/libexecinfo/libexecinfo.la @LIBS_DL@ -lpthread
+RTPP_MEMDEB_LD_ADD = $(top_srcdir)/libexecinfo/libexecinfo.la @LIBS_DL@ -lpthread
diff --git a/makeann/Makefile.am b/makeann/Makefile.am
@@ -20,7 +20,7 @@ makeann_CFLAGS = $(OPT_CFLAGS) $(LTO_FLAG)
 makeann_LDFLAGS = $(LTO_FLAG)
 
 makeann_debug_SOURCES = $(makeann_SOURCES) $(RTPP_MEMDEB_CORESRCS) $(rtpp_refcnt_AUTOSRCS)
-makeann_debug_LDADD = $(makeann_LDADD) $(RTPP_MEMDEB_LDADD)
+makeann_debug_LDADD = $(makeann_LDADD) $(RTPP_MEMDEB_LD_ADD)
 makeann_debug_CPPFLAGS = $(makeann_CPPFLAGS) $(RTPP_MEMDEB_CPPFLAGS) -DMEMDEB_APP=makeann
 makeann_debug_CFLAGS = $(NOPT_CFLAGS) $(LTO_FLAG) $(RTPP_MEMDEB_CFLAGS)
 makeann_debug_LDFLAGS = $(makeann_LDFLAGS)
diff --git a/modules/acct_csv/Makefile.am b/modules/acct_csv/Makefile.am
@@ -17,7 +17,7 @@ rtpp_acct_csv_la_CPPFLAGS = -D_BSD_SOURCE -DRTPP_MOD_NAME="acct_csv"
 rtpp_acct_csv_la_CFLAGS = $(OPT_CFLAGS) $(LTO_FLAG)
 
 rtpp_acct_csv_debug_la_SOURCES = ${rtpp_acct_csv_la_SOURCES}
-rtpp_acct_csv_debug_la_LIBADD = $(RTPP_MEMDEB_LDADD)
+rtpp_acct_csv_debug_la_LIBADD = $(RTPP_MEMDEB_LD_ADD)
 rtpp_acct_csv_debug_la_LDFLAGS=${rtpp_acct_csv_la_LDFLAGS}
 rtpp_acct_csv_debug_la_CPPFLAGS=$(rtpp_acct_csv_la_CPPFLAGS) \
  $(RTPP_MEMDEB_CPPFLAGS) -DMEMDEB_APP="acct_csv"
diff --git a/modules/acct_rtcp_hep/Makefile.am b/modules/acct_rtcp_hep/Makefile.am
@@ -33,7 +33,7 @@ CFLAGS_acct_rtcp_hep_common = -std=c11 -D_BSD_SOURCE -D_XOPEN_SOURCE \
 rtpp_acct_rtcp_hep_la_CFLAGS=$(OPT_CFLAGS) $(CFLAGS_acct_rtcp_hep_common)
 
 rtpp_acct_rtcp_hep_debug_la_SOURCES = $(rtpp_acct_rtcp_hep_la_SOURCES)
-rtpp_acct_rtcp_hep_debug_la_LIBADD = $(RTPP_MEMDEB_LDADD)
+rtpp_acct_rtcp_hep_debug_la_LIBADD = $(RTPP_MEMDEB_LD_ADD)
 rtpp_acct_rtcp_hep_debug_la_LDFLAGS=$(rtpp_acct_rtcp_hep_la_LDFLAGS)
 rtpp_acct_rtcp_hep_debug_la_CPPFLAGS=$(rtpp_acct_rtcp_hep_la_CPPFLAGS) \
  $(RTPP_MEMDEB_CPPFLAGS) -DMEMDEB_APP="acct_rtcp_hep"
@@ -48,7 +48,7 @@ rtpp_sbuf_selftest_CPPFLAGS = -Drtpp_sbuf_selftest=main \
 rtpp_sbuf_selftest_CFLAGS = $(OPT_CFLAGS) $(RTPP_MEMDEB_CFLAGS) $(LTO_FLAG)
 rtpp_sbuf_selftest_SOURCES = $(MAINSRCDIR)/rtpp_sbuf.c $(MAINSRCDIR)/rtpp_sbuf.h \
   $(RTPP_MEMDEB_CORESRCS) $(rtpp_refcnt_AUTOSRCS)
-rtpp_sbuf_selftest_LDADD = $(RTPP_MEMDEB_LDADD)
+rtpp_sbuf_selftest_LDADD = $(RTPP_MEMDEB_LD_ADD)
 rtpp_sbuf_selftest_LDFLAGS = $(LTO_FLAG)
 
 librtpp_acct_rtcp_hep_la_SOURCES = $(rtpp_acct_rtcp_hep_la_SOURCES)
diff --git a/modules/badmod/Makefile.am b/modules/badmod/Makefile.am
@@ -17,7 +17,7 @@ rtpp_badmod1_la_CPPFLAGS = -D_BSD_SOURCE
 rtpp_badmod1_la_CFLAGS = $(OPT_CFLAGS) $(LTO_FLAG)
 
 rtpp_badmod1_debug_la_SOURCES = ${rtpp_badmod1_la_SOURCES}
-rtpp_badmod1_debug_la_LIBADD = $(RTPP_MEMDEB_LDADD)
+rtpp_badmod1_debug_la_LIBADD = $(RTPP_MEMDEB_LD_ADD)
 rtpp_badmod1_debug_la_LDFLAGS=${rtpp_badmod1_la_LDFLAGS}
 rtpp_badmod1_debug_la_CPPFLAGS=$(rtpp_badmod1_la_CPPFLAGS) \
  $(RTPP_MEMDEB_CPPFLAGS) -DMEMDEB_APP="badmod1"
diff --git a/modules/catch_dtmf/Makefile.am b/modules/catch_dtmf/Makefile.am
@@ -19,7 +19,7 @@ CFLAGS_rtpp_catch_dtmf_common = -std=c11 -D_BSD_SOURCE -D_XOPEN_SOURCE $(LTO_FLA
 rtpp_catch_dtmf_la_CFLAGS = $(OPT_CFLAGS) $(CFLAGS_rtpp_catch_dtmf_common)
 
 rtpp_catch_dtmf_debug_la_SOURCES = $(rtpp_catch_dtmf_la_SOURCES)
-rtpp_catch_dtmf_debug_la_LIBADD = $(rtpp_catch_dtmf_la_LIBADD) $(RTPP_MEMDEB_LDADD)
+rtpp_catch_dtmf_debug_la_LIBADD = $(rtpp_catch_dtmf_la_LIBADD) $(RTPP_MEMDEB_LD_ADD)
 rtpp_catch_dtmf_debug_la_LDFLAGS = $(rtpp_catch_dtmf_la_LDFLAGS)
 rtpp_catch_dtmf_debug_la_CPPFLAGS = $(rtpp_catch_dtmf_la_CPPFLAGS) \
  $(RTPP_MEMDEB_CPPFLAGS) -DMEMDEB_APP="catch_dtmf"
diff --git a/modules/dtls_gw/Makefile.am b/modules/dtls_gw/Makefile.am
@@ -21,7 +21,7 @@ rtpp_dtls_gw_la_CFLAGS = $(OPT_CFLAGS) $(CFLAGS_rtpp_dtls_gw_common)
 rtpp_dtls_gw_la_LIBADD = $(LIB_SSL) $(LIBS_SRTP)
 
 rtpp_dtls_gw_debug_la_SOURCES = $(rtpp_dtls_gw_la_SOURCES)
-rtpp_dtls_gw_debug_la_LIBADD = $(rtpp_dtls_gw_la_LIBADD) $(RTPP_MEMDEB_LDADD)
+rtpp_dtls_gw_debug_la_LIBADD = $(rtpp_dtls_gw_la_LIBADD) $(RTPP_MEMDEB_LD_ADD)
 rtpp_dtls_gw_debug_la_LDFLAGS = $(rtpp_dtls_gw_la_LDFLAGS)
 rtpp_dtls_gw_debug_la_CPPFLAGS = $(rtpp_dtls_gw_la_CPPFLAGS) \
  $(RTPP_MEMDEB_CPPFLAGS) -DMEMDEB_APP="dtls_gw"
diff --git a/modules/ice_lite/Makefile.am b/modules/ice_lite/Makefile.am
@@ -22,7 +22,7 @@ rtpp_ice_lite_la_CFLAGS = $(OPT_CFLAGS) $(CFLAGS_rtpp_ice_lite_common)
 rtpp_ice_lite_la_LIBADD = $(top_srcdir)/libre/libre.la $(LIB_CRYPTO)
 
 rtpp_ice_lite_debug_la_SOURCES = $(rtpp_ice_lite_la_SOURCES)
-rtpp_ice_lite_debug_la_LIBADD = $(top_srcdir)/libre/libre_debug.la $(RTPP_MEMDEB_LDADD) $(LIB_CRYPTO)
+rtpp_ice_lite_debug_la_LIBADD = $(top_srcdir)/libre/libre_debug.la $(RTPP_MEMDEB_LD_ADD) $(LIB_CRYPTO)
 rtpp_ice_lite_debug_la_LDFLAGS = $(rtpp_ice_lite_la_LDFLAGS)
 rtpp_ice_lite_debug_la_CPPFLAGS = $(rtpp_ice_lite_la_CPPFLAGS) \
  $(RTPP_MEMDEB_CPPFLAGS) -DMEMDEB_APP="ice_lite"
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -87,7 +87,7 @@ BASE_SOURCES+=rtpp_modman.c rtpp_module_if_static.c rtpp_module_if_static.h
 
 rtpproxy_LDADD=librtpproxy.la -lm -lpthread
 rtpproxy_debug_LDADD=-lm -lpthread @LIBS_ELPERIODIC@ $(top_srcdir)/libucl/libucl_debug.la \
-  $(XXH_DIR)/libxxHash_debug.la $(RTQ_DIR)/libRTQueue_debug.la $(RTPP_MEMDEB_LDADD)
+  $(XXH_DIR)/libxxHash_debug.la $(RTQ_DIR)/libRTQueue_debug.la $(RTPP_MEMDEB_LD_ADD)
 rtpproxy_debug_LDFLAGS=-Wl,--export-dynamic $(LTO_FLAG)
 rtpproxy_LDFLAGS=$(LTO_FLAG)
 
@@ -124,7 +124,7 @@ rtpp_objck_BASESOURCES=rtpp_objck.c $(SRCS_AUTOGEN) rtpp_network.c \
   rtpp_util.c rtpp_util.h
 rtpp_objck_perf_SOURCES=$(rtpp_objck_BASESOURCES) rtpp_refcnt.c rtpp_refcnt.h \
   rtpp_mallocs.c rtpp_mallocs.h
-rtpp_objck_LDADD=$(rtpp_objck_perf_LDADD) $(RTPP_MEMDEB_LDADD)
+rtpp_objck_LDADD=$(rtpp_objck_perf_LDADD) $(RTPP_MEMDEB_LD_ADD)
 rtpp_objck_SOURCES=$(rtpp_objck_BASESOURCES) $(SRCS_MEMDEB_CORE) $(SRCS_AUTOGEN_DEBUG)
 
 rtpp_rzmalloc_perf_SOURCES = rtpp_rzmalloc_perf.c rtpp_mallocs.c rtpp_mallocs.h \
@@ -182,7 +182,7 @@ rtpp_fintest_CPPFLAGS = -I$(RTPP_AUTOSRC_DIR) -Drtpp_fintest=main \
   "-DRTPP_AUTOTRAP()=(_naborts++)" -DRTPP_FINTEST $(RTPP_MEMDEB_CPPFLAGS) \
   -I$(top_srcdir) -DMEMDEB_APP=rtpp_fintest
 rtpp_fintest_CFLAGS = $(OPT_CFLAGS) $(LTO_FLAG) $(RTPP_MEMDEB_CFLAGS)
-rtpp_fintest_LDADD = $(RTPP_MEMDEB_LDADD)
+rtpp_fintest_LDADD = $(RTPP_MEMDEB_LD_ADD)
 rtpp_fintest_LDFLAGS = $(LTO_FLAG)
 
 librtpproxy_la_SOURCES = $(BASE_SOURCES) $(SRCS_AUTOGEN) \
