Makefile.am: use EXTRA_prog_DEPENDENCIES everywhere

The _DEPENDENCIES variable will omit automake generated dependencies,
causing the Makefiles not to depend on some of the intermediate build
products. For example, the json test programs never directly depended
on libtest and sometimes when libtest changed the test programs
were not rebuilt.

Signed-off-by: Balazs Scheidler <[email protected]>

lib/Makefile.am

@@ -57,10 +57,10 @@ lib_libsyslog_ng_la_LDFLAGS		= -no-undefined -release ${LSNG_RELEASE} \
 
 lib_test_subdirs			= lib_filter lib_filterx lib_logproto lib_parser lib_rewrite lib_template lib_stats lib_control
 
-lib_libsyslog_ng_la_DEPENDENCIES       = lib/eventlog/src/libevtlog.la lib/secret-storage/libsecret-storage.la
+EXTRA_lib_libsyslog_ng_la_DEPENDENCIES       = lib/eventlog/src/libevtlog.la lib/secret-storage/libsecret-storage.la
 
 if IVYKIS_INTERNAL
-lib_libsyslog_ng_la_DEPENDENCIES	+= lib/ivykis/src/libivykis.la
+EXTRA_lib_libsyslog_ng_la_DEPENDENCIES	+= lib/ivykis/src/libivykis.la
 
 lib/ivykis/src/libivykis.la:
 	${MAKE} CFLAGS="${CFLAGS} -Wno-error" -C lib/ivykis

modules/add-contextual-data/Makefile.am

@@ -33,7 +33,7 @@ modules_add_contextual_data_libadd_contextual_data_la_LIBADD	=		\
 	$(MODULE_DEPS_LIBS)
 modules_add_contextual_data_libadd_contextual_data_la_LDFLAGS	=		\
 	$(MODULE_LDFLAGS)
-modules_add_contextual_data_libadd_contextual_data_la_DEPENDENCIES	=	\
+EXTRA_modules_add_contextual_data_libadd_contextual_data_la_DEPENDENCIES	=	\
 	$(MODULE_DEPS_LIBS)
 
 BUILT_SOURCES					+=				\

modules/afamqp/Makefile.am

@@ -19,7 +19,7 @@ modules_afamqp_libafamqp_la_LIBADD	= 	\
 	$(MODULE_DEPS_LIBS) $(LIBRABBITMQ_LIBS)
 modules_afamqp_libafamqp_la_LDFLAGS	=	\
 	$(MODULE_LDFLAGS)
-modules_afamqp_libafamqp_la_DEPENDENCIES=	\
+EXTRA_modules_afamqp_libafamqp_la_DEPENDENCIES=	\
 	$(MODULE_DEPS_LIBS)			\
 	$(lr_EXTRA_DEPS)
 

modules/affile/Makefile.am

@@ -71,7 +71,7 @@ modules_affile_libaffile_la_CPPFLAGS	=			\
 	-I$(top_builddir)/modules/affile
 modules_affile_libaffile_la_LIBADD	= $(MODULE_DEPS_LIBS) $(IVYKIS_LIBS)
 modules_affile_libaffile_la_LDFLAGS	= $(MODULE_LDFLAGS)
-modules_affile_libaffile_la_DEPENDENCIES= $(MODULE_DEPS_LIBS)
+EXTRA_modules_affile_libaffile_la_DEPENDENCIES= $(MODULE_DEPS_LIBS)
 
 modules/affile modules/affile/ mod-affile mod-file: modules/affile/libaffile.la
 .PHONY: modules/affile/ mod-affile mod-file

modules/afmongodb/Makefile.am

@@ -23,7 +23,7 @@ modules_afmongodb_libafmongodb_la_LIBADD	=	\
 	$(MODULE_DEPS_LIBS) $(LIBMONGO_LIBS)
 modules_afmongodb_libafmongodb_la_LDFLAGS	=	\
 	$(MODULE_LDFLAGS)
-modules_afmongodb_libafmongodb_la_DEPENDENCIES	=	\
+EXTRA_modules_afmongodb_libafmongodb_la_DEPENDENCIES	=	\
 	$(MODULE_DEPS_LIBS) $(lmc_EXTRA_DEPS)
 
 modules/afmongodb modules/afmongodb/ mod-afmongodb mod-mongodb: \

modules/afprog/Makefile.am

@@ -23,7 +23,7 @@ modules_afprog_libafprog_la_LIBADD	=	\
 	$(MODULE_DEPS_LIBS)
 modules_afprog_libafprog_la_LDFLAGS	=	\
 	$(MODULE_LDFLAGS)
-modules_afprog_libafprog_la_DEPENDENCIES=	\
+EXTRA_modules_afprog_libafprog_la_DEPENDENCIES=	\
 	$(MODULE_DEPS_LIBS)
 
 modules/afprog modules/afprog/ mod-afprog mod-prog: \

modules/afsmtp/Makefile.am

@@ -16,7 +16,7 @@ modules_afsmtp_libafsmtp_la_LIBADD	=	\
 	$(MODULE_DEPS_LIBS) $(LIBESMTP_LIBS)
 modules_afsmtp_libafsmtp_la_LDFLAGS	=	\
 	$(MODULE_LDFLAGS)
-modules_afsmtp_libafsmtp_la_DEPENDENCIES=	\
+EXTRA_modules_afsmtp_libafsmtp_la_DEPENDENCIES=	\
 	$(MODULE_DEPS_LIBS)
 
 modules/afsmtp modules/afsmtp/ mod-afsmtp mod-smtp: \

modules/afsnmp/Makefile.am

@@ -30,7 +30,7 @@ modules_afsnmp_libafsnmp_la_LDFLAGS	=	\
 	$(MODULE_LDFLAGS) \
 	$(NETSNMP_LIBS)
 
-modules_afsnmp_libafsnmp_la_DEPENDENCIES	=	\
+EXTRA_modules_afsnmp_libafsnmp_la_DEPENDENCIES	=	\
 	$(MODULE_DEPS_LIBS)
 
 modules/afsnmp mod-afsnmp: modules/afsnmp/libafsnmp.la

modules/afsnmp/tests/Makefile.am

@@ -18,7 +18,7 @@ modules_afsnmp_tests_test_afsnmp_dest_LDADD = $(TEST_LDADD)
 modules_afsnmp_tests_test_afsnmp_dest_LDFLAGS = \
   -dlpreopen $(top_builddir)/modules/afsnmp/libafsnmp.la
 
-modules_afsnmp_tests_test_afsnmp_dest_DEPENDENCIES = \
+EXTRA_modules_afsnmp_tests_test_afsnmp_dest_DEPENDENCIES = \
 	$(top_builddir)/modules/afsnmp/libafsnmp.la
 
 modules_afsnmp_tests_test_varbindlist_scanner_CFLAGS   = \

modules/afsocket/Makefile.am

@@ -52,7 +52,7 @@ modules_afsocket_libafsocket_la_LIBADD	=	\
 	$(MODULE_DEPS_LIBS) $(OPENSSL_LIBS)	\
 	$(ZLIB_LIBS) $(LIBNET_LIBS)	\
 	$(LIBWRAP_LIBS) $(libsystemd_LIBS)
-modules_afsocket_libafsocket_la_DEPENDENCIES= 	\
+EXTRA_modules_afsocket_libafsocket_la_DEPENDENCIES= 	\
 	$(MODULE_DEPS_LIBS)
 modules_afsocket_libafsocket_la_LDFLAGS	= 	\
 	$(MODULE_LDFLAGS)

modules/afsql/Makefile.am

@@ -18,7 +18,7 @@ modules_afsql_libafsql_la_LIBADD	= 	\
 	$(OPENSSL_LIBS)
 modules_afsql_libafsql_la_LDFLAGS	=	\
 	$(MODULE_LDFLAGS)
-modules_afsql_libafsql_la_DEPENDENCIES	=	\
+EXTRA_modules_afsql_libafsql_la_DEPENDENCIES	=	\
 	$(MODULE_DEPS_LIBS)
 
 modules/afsql modules/afsql/ mod-afsql mod-sql:	\

modules/afstomp/Makefile.am

@@ -18,7 +18,7 @@ modules_afstomp_libafstomp_la_LIBADD = \
     $(MODULE_DEPS_LIBS)
 modules_afstomp_libafstomp_la_LDFLAGS = \
     $(MODULE_LDFLAGS)
-modules_afstomp_libafstomp_la_DEPENDENCIES  = \
+EXTRA_modules_afstomp_libafstomp_la_DEPENDENCIES  = \
         $(MODULE_DEPS_LIBS)
 
 modules/afstomp modules/afstomp/ mod-afstomp mod-stomp: \

modules/afstreams/Makefile.am

@@ -17,7 +17,7 @@ modules_afstreams_libafstreams_la_LIBADD	=	\
 	$(MODULE_DEPS_LIBS)
 modules_afstreams_libafstreams_la_LDFLAGS	=	\
 	$(MODULE_LDFLAGS)
-modules_afstreams_libafstreams_la_DEPENDENCIES	=	\
+EXTRA_modules_afstreams_libafstreams_la_DEPENDENCIES	=	\
 	$(MODULE_DEPS_LIBS)
 
 modules/afstreams modules/afstreams/ mod-afstreams mod-streams: \

modules/afuser/Makefile.am

@@ -15,7 +15,7 @@ modules_afuser_libafuser_la_LIBADD	=	\
 	$(MODULE_DEPS_LIBS)
 modules_afuser_libafuser_la_LDFLAGS	=	\
 	$(MODULE_LDFLAGS)
-modules_afuser_libafuser_la_DEPENDENCIES=	\
+EXTRA_modules_afuser_libafuser_la_DEPENDENCIES=	\
 	$(MODULE_DEPS_LIBS)
 
 BUILT_SOURCES				+=	\

modules/appmodel/Makefile.am

@@ -24,7 +24,7 @@ modules_appmodel_libappmodel_la_LIBADD	=	\
 	$(MODULE_DEPS_LIBS)
 modules_appmodel_libappmodel_la_LDFLAGS	=	\
 	$(MODULE_LDFLAGS)
-modules_appmodel_libappmodel_la_DEPENDENCIES	=	\
+EXTRA_modules_appmodel_libappmodel_la_DEPENDENCIES	=	\
 	$(MODULE_DEPS_LIBS)
 
 BUILT_SOURCES					+=	\

modules/appmodel/tests/Makefile.am

@@ -16,7 +16,7 @@ modules_appmodel_tests_test_appmodel_LDADD	=	\
 modules_appmodel_tests_test_appmodel_LDFLAGS	=	\
 	$(PREOPEN_SYSLOGFORMAT)				\
 	-dlpreopen $(top_builddir)/modules/appmodel/libappmodel.la
-modules_appmodel_tests_test_appmodel_DEPENDENCIES =      \
+EXTRA_modules_appmodel_tests_test_appmodel_DEPENDENCIES =      \
         $(top_builddir)/modules/appmodel/libappmodel.la
 
 modules_appmodel_tests_test_appmodel_context_CFLAGS	=	\
@@ -26,7 +26,7 @@ modules_appmodel_tests_test_appmodel_context_LDADD	=	\
 modules_appmodel_tests_test_appmodel_context_LDFLAGS	=	\
 	$(PREOPEN_SYSLOGFORMAT)				\
 	-dlpreopen $(top_builddir)/modules/appmodel/libappmodel.la
-modules_appmodel_tests_test_appmodel_context_DEPENDENCIES =      \
+EXTRA_modules_appmodel_tests_test_appmodel_context_DEPENDENCIES =      \
         $(top_builddir)/modules/appmodel/libappmodel.la
 
 modules_appmodel_tests_test_app_parser_generator_CFLAGS	=	\
@@ -36,7 +36,7 @@ modules_appmodel_tests_test_app_parser_generator_LDADD	=	\
 modules_appmodel_tests_test_app_parser_generator_LDFLAGS	=	\
 	$(PREOPEN_SYSLOGFORMAT)				\
 	-dlpreopen $(top_builddir)/modules/appmodel/libappmodel.la
-modules_appmodel_tests_test_app_parser_generator_DEPENDENCIES =      \
+EXTRA_modules_appmodel_tests_test_app_parser_generator_DEPENDENCIES =      \
         $(top_builddir)/modules/appmodel/libappmodel.la
 
 modules_appmodel_tests_test_application_CFLAGS	=	\
@@ -46,5 +46,5 @@ modules_appmodel_tests_test_application_LDADD	=	\
 modules_appmodel_tests_test_application_LDFLAGS	=	\
 	$(PREOPEN_SYSLOGFORMAT)				\
 	-dlpreopen $(top_builddir)/modules/appmodel/libappmodel.la
-modules_appmodel_tests_test_application_DEPENDENCIES =      \
+EXTRA_modules_appmodel_tests_test_application_DEPENDENCIES =      \
         $(top_builddir)/modules/appmodel/libappmodel.la

modules/azure-auth-header/Makefile.am

@@ -19,7 +19,7 @@ EXTRA_DIST        +=      \
 modules_azure_auth_header_libazure_auth_header_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/modules/azure-auth-header -I$(top_builddir)/modules/azure-auth-header
 modules_azure_auth_header_libazure_auth_header_la_LIBADD = $(MODULE_DEPS_LIBS)
 modules_azure_auth_header_libazure_auth_header_la_LDFLAGS = $(MODULE_LDFLAGS)
-modules_azure_auth_header_libazure_auth_header_la_DEPENDENCIES = $(MODULE_DEPS_LIBS)
+EXTRA_modules_azure_auth_header_libazure_auth_header_la_DEPENDENCIES = $(MODULE_DEPS_LIBS)
 
 modules/azure-auth-header modules/azure-auth-header/ mod-azure-auth-header: modules/azure-auth-header/libazure-auth-header.la
 

modules/basicfuncs/Makefile.am

@@ -10,7 +10,7 @@ modules_basicfuncs_libbasicfuncs_la_LIBADD	=	\
 	$(MODULE_DEPS_LIBS)
 modules_basicfuncs_libbasicfuncs_la_LDFLAGS	=	\
 	$(MODULE_LDFLAGS)
-modules_basicfuncs_libbasicfuncs_la_DEPENDENCIES=	\
+EXTRA_modules_basicfuncs_libbasicfuncs_la_DEPENDENCIES=	\
 	$(MODULE_DEPS_LIBS)
 
 EXTRA_DIST					+=	\

modules/cef/Makefile.am

@@ -15,7 +15,7 @@ modules_cef_libcef_la_LIBADD	=	\
 	$(MODULE_DEPS_LIBS)
 modules_cef_libcef_la_LDFLAGS	=	\
 	$(MODULE_LDFLAGS)
-modules_cef_libcef_la_DEPENDENCIES=	\
+EXTRA_modules_cef_libcef_la_DEPENDENCIES=	\
 	$(MODULE_DEPS_LIBS)
 
 modules/cef modules/cef/ mod-cef: modules/cef/libcef.la

modules/cef/tests/Makefile.am

@@ -11,5 +11,5 @@ modules_cef_tests_test_format_cef_extension_LDFLAGS	= \
 	$(PREOPEN_SYSLOGFORMAT)		  \
 	-dlpreopen $(top_builddir)/modules/cef/libcef.la
 
-modules_cef_tests_test_format_cef_extension_DEPENDENCIES =	\
+EXTRA_modules_cef_tests_test_format_cef_extension_DEPENDENCIES =	\
 	$(top_builddir)/modules/cef/libcef.la

modules/cloud-auth/Makefile.am

@@ -18,7 +18,7 @@ modules_cloud_auth_libcloud_auth_cpp_la_CXXFLAGS = \
 
 modules_cloud_auth_libcloud_auth_cpp_la_LIBADD = $(MODULE_DEPS_LIBS) $(LIBCURL_LIBS)
 modules_cloud_auth_libcloud_auth_cpp_la_LDFLAGS = $(MODULE_LDFLAGS)
-modules_cloud_auth_libcloud_auth_cpp_la_DEPENDENCIES = $(MODULE_DEPS_LIBS)
+EXTRA_modules_cloud_auth_libcloud_auth_cpp_la_DEPENDENCIES = $(MODULE_DEPS_LIBS)
 
 
 module_LTLIBRARIES += modules/cloud-auth/libcloud_auth.la
@@ -43,7 +43,7 @@ modules_cloud_auth_libcloud_auth_la_LIBADD = \
 modules_cloud_auth_libcloud_auth_la_LDFLAGS = \
   $(MODULE_LDFLAGS)
 
-modules_cloud_auth_libcloud_auth_la_DEPENDENCIES = \
+EXTRA_modules_cloud_auth_libcloud_auth_la_DEPENDENCIES = \
   $(MODULE_DEPS_LIBS) \
   $(top_builddir)/modules/cloud-auth/libcloud_auth_cpp.la
 

modules/confgen/Makefile.am

@@ -8,7 +8,7 @@ modules_confgen_libconfgen_la_LIBADD		=	\
 	$(MODULE_DEPS_LIBS)
 modules_confgen_libconfgen_la_LDFLAGS		=	\
 	$(MODULE_LDFLAGS)
-modules_confgen_libconfgen_la_DEPENDENCIES	=	\
+EXTRA_modules_confgen_libconfgen_la_DEPENDENCIES	=	\
 	$(MODULE_DEPS_LIBS)
 
 EXTRA_DIST += modules/confgen/CMakeLists.txt

modules/correlation/Makefile.am

@@ -48,7 +48,7 @@ modules_correlation_libsyslog_ng_patterndb_la_CFLAGS	=	\
 	$(AM_CFLAGS) -fPIC
 modules_correlation_libsyslog_ng_patterndb_la_LIBADD	=	\
 	$(MODULE_DEPS_LIBS)
-modules_correlation_libsyslog_ng_patterndb_la_DEPENDENCIES	=	\
+EXTRA_modules_correlation_libsyslog_ng_patterndb_la_DEPENDENCIES	=	\
 	$(MODULE_DEPS_LIBS)
 
 module_LTLIBRARIES					+= modules/correlation/libcorrelation.la
@@ -76,7 +76,7 @@ modules_correlation_libcorrelation_la_LIBADD			=	\
 	$(MODULE_DEPS_LIBS)
 modules_correlation_libcorrelation_la_LDFLAGS			=	\
 	$(MODULE_LDFLAGS)
-modules_correlation_libcorrelation_la_DEPENDENCIES		=	\
+EXTRA_modules_correlation_libcorrelation_la_DEPENDENCIES		=	\
 	$(MODULE_DEPS_LIBS)
 
 BUILT_SOURCES						+=	\

modules/cryptofuncs/Makefile.am

@@ -9,7 +9,7 @@ modules_cryptofuncs_libcryptofuncs_la_LIBADD		=	\
 	$(MODULE_DEPS_LIBS) $(OPENSSL_LIBS)
 modules_cryptofuncs_libcryptofuncs_la_LDFLAGS		=	\
 	$(MODULE_LDFLAGS) $(OPENSSL_CFLAGS)
-modules_cryptofuncs_libcryptofuncs_la_DEPENDENCIES	=	\
+EXTRA_modules_cryptofuncs_libcryptofuncs_la_DEPENDENCIES	=	\
 	$(MODULE_DEPS_LIBS)
 
 modules/cryptofuncs modules/cryptofuncs/ mod-cryptofuncs: modules/cryptofuncs/libcryptofuncs.la

modules/csvparser/Makefile.am

@@ -17,7 +17,7 @@ modules_csvparser_libcsvparser_la_LIBADD	=	\
 	$(MODULE_DEPS_LIBS)
 modules_csvparser_libcsvparser_la_LDFLAGS	=	\
 	$(MODULE_LDFLAGS)
-modules_csvparser_libcsvparser_la_DEPENDENCIES	=	\
+EXTRA_modules_csvparser_libcsvparser_la_DEPENDENCIES	=	\
 	$(MODULE_DEPS_LIBS)
 
 BUILT_SOURCES					+=	\

modules/darwinosl/Makefile.am

@@ -18,7 +18,7 @@ modules/darwinosl/darwinosl-grammar.y
 modules_darwinosl_libdarwinosl_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/modules/darwinosl -I$(top_builddir)/modules/darwinosl
 modules_darwinosl_libdarwinosl_la_LIBADD = $(MODULE_DEPS_LIBS)
 modules_darwinosl_libdarwinosl_la_LDFLAGS = $(MODULE_LDFLAGS) -ObjC -framework Foundation -framework OSLog
-modules_darwinosl_libdarwinosl_la_DEPENDENCIES = $(MODULE_DEPS_LIBS)
+EXTRA_modules_darwinosl_libdarwinosl_la_DEPENDENCIES = $(MODULE_DEPS_LIBS)
 
 modules/darwinosl mod-darwinosl: modules/darwinosl/libdarwinosl.la
 else

modules/diskq/Makefile.am

@@ -23,7 +23,7 @@ modules_diskq_libsyslog_ng_disk_buffer_la_CPPFLAGS = \
   -I$(top_srcdir)/modules/diskq
 modules_diskq_libsyslog_ng_disk_buffer_la_LIBADD	=	\
   $(MODULE_DEPS_LIBS)
-modules_diskq_libsyslog_ng_disk_buffer_la_DEPENDENCIES	=	\
+EXTRA_modules_diskq_libsyslog_ng_disk_buffer_la_DEPENDENCIES	=	\
   $(MODULE_DEPS_LIBS)
 
 modules_diskq_libdisk_buffer_la_SOURCES = \
@@ -47,7 +47,7 @@ LIBSYSLOG_NG_DISK_BUFFER = $(top_builddir)/modules/diskq/libsyslog-ng-disk-buffe
 modules_diskq_libdisk_buffer_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/modules/diskq -I$(top_builddir)/modules/diskq
 modules_diskq_libdisk_buffer_la_LIBADD = $(MODULE_DEPS_LIBS) $(LIBSYSLOG_NG_DISK_BUFFER)
 modules_diskq_libdisk_buffer_la_LDFLAGS = $(MODULE_LDFLAGS) -lm
-modules_diskq_libdisk_buffer_la_DEPENDENCIES = $(MODULE_DEPS_LIBS) $(LIBSYSLOG_NG_DISK_BUFFER)
+EXTRA_modules_diskq_libdisk_buffer_la_DEPENDENCIES = $(MODULE_DEPS_LIBS) $(LIBSYSLOG_NG_DISK_BUFFER)
 
 modules_diskq_dqtool_SOURCES = modules/diskq/dqtool.c
 modules_diskq_dqtool_LDADD = \

modules/ebpf/Makefile.am

@@ -12,7 +12,7 @@ modules_ebpf_libebpf_la_SOURCES = \
 modules_ebpf_libebpf_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/modules/ebpf -I$(top_builddir)/modules/ebpf
 modules_ebpf_libebpf_la_LIBADD = $(MODULE_DEPS_LIBS) $(LIBBPF_LIBS)
 modules_ebpf_libebpf_la_LDFLAGS = $(MODULE_LDFLAGS)
-modules_ebpf_libebpf_la_DEPENDENCIES = $(MODULE_DEPS_LIBS)
+EXTRA_modules_ebpf_libebpf_la_DEPENDENCIES = $(MODULE_DEPS_LIBS)
 
 modules/ebpf modules/ebpf/ mod-ebpf: modules/ebpf/libebpf.la
 

modules/examples/Makefile.am

@@ -31,7 +31,7 @@ modules_examples_libexamples_la_SOURCES = \
   modules/examples/example-plugins.c
 
 modules_examples_libexamples_la_LIBADD = $(MODULE_DEPS_LIBS) $(EXAMPLE_PLUGINS)
-modules_examples_libexamples_la_DEPENDENCIES = $(MODULE_DEPS_LIBS) $(EXAMPLE_PLUGINS)
+EXTRA_modules_examples_libexamples_la_DEPENDENCIES = $(MODULE_DEPS_LIBS) $(EXAMPLE_PLUGINS)
 modules_examples_libexamples_la_LDFLAGS = $(MODULE_LDFLAGS)
 
 if ENABLE_CPP

modules/examples/destinations/example_destination/Makefile.am

@@ -26,4 +26,4 @@ modules_examples_destinations_example_destination_libexample_destination_la_CPPF
 
 modules_examples_destinations_example_destination_libexample_destination_la_LIBADD  = $(MODULE_DEPS_LIBS)
 modules_examples_destinations_example_destination_libexample_destination_la_LDFLAGS = $(MODULE_LDFLAGS)
-modules_examples_destinations_example_destination_libexample_destination_la_DEPENDENCIES= $(MODULE_DEPS_LIBS)
+EXTRA_modules_examples_destinations_example_destination_libexample_destination_la_DEPENDENCIES= $(MODULE_DEPS_LIBS)

modules/examples/filterx/example-filterx-func/Makefile.am

@@ -13,4 +13,4 @@ modules_examples_filterx_example_filterx_func_libexample_filterx_func_la_CPPFLAG
   -I$(top_builddir)/modules/examples/filterx/example-filterx-func
 modules_examples_filterx_example_filterx_func_libexample_filterx_func_la_LIBADD  = $(MODULE_DEPS_LIBS)
 modules_examples_filterx_example_filterx_func_libexample_filterx_func_la_LDFLAGS = $(MODULE_LDFLAGS)
-modules_examples_filterx_example_filterx_func_libexample_filterx_func_la_DEPENDENCIES= $(MODULE_DEPS_LIBS)
+EXTRA_modules_examples_filterx_example_filterx_func_libexample_filterx_func_la_DEPENDENCIES= $(MODULE_DEPS_LIBS)

modules/examples/inner-destinations/http-test-slots/Makefile.am

@@ -19,6 +19,6 @@ EXTRA_DIST += \
 modules_examples_inner_destinations_http_test_slots_libhttp_test_slots_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/modules/examples/inner-destinations/http-test-slots -I$(top_builddir)/modules/examples/inner-destinations/http-test-slots
 modules_examples_inner_destinations_http_test_slots_libhttp_test_slots_la_LIBADD = $(MODULE_DEPS_LIBS)
 modules_examples_inner_destinations_http_test_slots_libhttp_test_slots_la_LDFLAGS = $(MODULE_LDFLAGS)
-modules_examples_inner_destinations_http_test_slots_libhttp_test_slots_la_DEPENDENCIES = $(MODULE_DEPS_LIBS)
+EXTRA_modules_examples_inner_destinations_http_test_slots_libhttp_test_slots_la_DEPENDENCIES = $(MODULE_DEPS_LIBS)
 
 PHONY: modules/examples/inner-destinations/http-test-slots/ mod-http-test-slots

modules/examples/inner-destinations/tls-test-validation/Makefile.am

@@ -19,6 +19,6 @@ EXTRA_DIST += \
 modules_examples_inner_destinations_tls_test_validation_libtls_test_validation_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/modules/examples/inner-destinations/tls-test-validation -I$(top_builddir)/modules/examples/inner-destinations/tls-test-validation
 modules_examples_inner_destinations_tls_test_validation_libtls_test_validation_la_LIBADD = $(MODULE_DEPS_LIBS)
 modules_examples_inner_destinations_tls_test_validation_libtls_test_validation_la_LDFLAGS = $(MODULE_LDFLAGS)
-modules_examples_inner_destinations_tls_test_validation_libtls_test_validation_la_DEPENDENCIES = $(MODULE_DEPS_LIBS)
+EXTRA_modules_examples_inner_destinations_tls_test_validation_libtls_test_validation_la_DEPENDENCIES = $(MODULE_DEPS_LIBS)
 
 PHONY: modules/examples/inner-destinations/tls-test-validation/ mod-tls-test-validation

modules/examples/sources/msg-generator/Makefile.am

@@ -26,4 +26,4 @@ modules_examples_sources_libmsg_generator_la_CPPFLAGS  = \
 
 modules_examples_sources_libmsg_generator_la_LIBADD  = $(MODULE_DEPS_LIBS)
 modules_examples_sources_libmsg_generator_la_LDFLAGS = $(MODULE_LDFLAGS)
-modules_examples_sources_libmsg_generator_la_DEPENDENCIES = $(MODULE_DEPS_LIBS)
+EXTRA_modules_examples_sources_libmsg_generator_la_DEPENDENCIES = $(MODULE_DEPS_LIBS)

modules/examples/sources/random-choice-generator/Makefile.am

@@ -15,7 +15,7 @@ modules_examples_sources_librandom_choice_generator_cpp_la_CXXFLAGS = \
 
 modules_examples_sources_librandom_choice_generator_cpp_la_LIBADD = $(MODULE_DEPS_LIBS)
 modules_examples_sources_librandom_choice_generator_cpp_la_LDFLAGS = $(MODULE_LDFLAGS)
-modules_examples_sources_librandom_choice_generator_cpp_la_DEPENDENCIES = $(MODULE_DEPS_LIBS)
+EXTRA_modules_examples_sources_librandom_choice_generator_cpp_la_DEPENDENCIES = $(MODULE_DEPS_LIBS)
 
 # C code
 
@@ -38,7 +38,7 @@ modules_examples_sources_librandom_choice_generator_la_LIBADD = \
 modules_examples_sources_librandom_choice_generator_la_LDFLAGS = \
   $(MODULE_LDFLAGS)
 
-modules_examples_sources_librandom_choice_generator_la_DEPENDENCIES = \
+EXTRA_modules_examples_sources_librandom_choice_generator_la_DEPENDENCIES = \
   $(MODULE_DEPS_LIBS) \
   modules/examples/sources/librandom_choice_generator_cpp.la
 

modules/examples/sources/threaded-diskq-source/Makefile.am

@@ -28,6 +28,6 @@ modules_examples_sources_libthreaded_diskq_source_la_LIBADD  = \
 
 modules_examples_sources_libthreaded_diskq_source_la_LDFLAGS = $(MODULE_LDFLAGS)
 
-modules_examples_sources_libthreaded_diskq_source_la_DEPENDENCIES = \
+EXTRA_modules_examples_sources_libthreaded_diskq_source_la_DEPENDENCIES = \
   $(MODULE_DEPS_LIBS) \
   $(top_builddir)/modules/diskq/libsyslog-ng-disk-buffer.la

modules/examples/sources/threaded-random-generator/Makefile.am

@@ -16,7 +16,7 @@ modules_examples_sources_libthreaded_random_generator_la_CPPFLAGS  = \
 
 modules_examples_sources_libthreaded_random_generator_la_LIBADD  = $(MODULE_DEPS_LIBS)
 modules_examples_sources_libthreaded_random_generator_la_LDFLAGS = $(MODULE_LDFLAGS)
-modules_examples_sources_libthreaded_random_generator_la_DEPENDENCIES = $(MODULE_DEPS_LIBS)
+EXTRA_modules_examples_sources_libthreaded_random_generator_la_DEPENDENCIES = $(MODULE_DEPS_LIBS)
 
 endif
 

modules/geoip2/Makefile.am

@@ -23,7 +23,7 @@ modules_geoip2_libgeoip2_plugin_la_LIBADD		=	\
 	$(MODULE_DEPS_LIBS) $(MAXMINDDB_LIBS)
 modules_geoip2_libgeoip2_plugin_la_LDFLAGS	=	\
 	$(MODULE_LDFLAGS)
-modules_geoip2_libgeoip2_plugin_la_DEPENDENCIES	=	\
+EXTRA_modules_geoip2_libgeoip2_plugin_la_DEPENDENCIES	=	\
 	$(MODULE_DEPS_LIBS)
 
 modules/geoip2 modules/geoip2/ mod-geoip2:	\