commit 3820bd138e15a9af840a8f168ce19ea6bcef65a0
author Massimo Manghi <mxmanghi@apache.org> Sun Apr 13 23:09:40 2025 +0200
committer Massimo Manghi <mxmanghi@apache.org> Sun Apr 13 23:09:40 2025 +0200
tree 4c8376dcfcc0cfe3b42bfb67fda7277a27c1f942
parent e228acce9780d25243272f5a931d57e0f7875136
parent 6b4532c3a48d5bcadbb3663f46bf70c5bd277cc9

Merge branch 'master' into tcl-novem

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 674cf5e..57b1fbd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2025-04-13 Massimo Manghi <mxmanghi@apache.org>
+    * src/Makefile.am: wrap long definitions for improved readability
+
 2025-04-10 Massimo Manghi <mxmanghi@apache.org>
 	* configure.ac: defined m4 variable for rivet version.
 

src/Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index b17a9ae..e97b46a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -66,25 +66,53 @@
 
 mod_rivet_la_LDFLAGS = @TCL_LIB_SPEC@ @APXS_LDFLAGS@ @APR_LDFLAGS@ -module -avoid-version
 mod_rivet_la_LIBADD = @TCL_LIBS@ @APXS_LIBS@ 
-mod_rivet_la_CPPFLAGS = -I$(srcdir) -I$(srcdir)/@rivet_core@ -I$(srcdir)/@rivet_channel@ -I$(srcdir)/parser -I$(srcdir)/@apache_request@ @apache_include@ -I. @TCL_INCLUDES@ @APXS_CPPFLAGS@ @APXS_INCLUDES@ @APR_CPPFLAGS@ @APR_INCLUDES@ @APU_INCLUDES@ -DSTART_TAG='"<?"' -DEND_TAG='"?>"'
+mod_rivet_la_CPPFLAGS = -I$(srcdir) \
+                        -I$(srcdir)/@rivet_core@ \
+                        -I$(srcdir)/@rivet_channel@ \
+                        -I$(srcdir)/parser \
+                        -I$(srcdir)/@apache_request@ \
+                         @apache_include@ -I. @TCL_INCLUDES@ \
+                         @APXS_CPPFLAGS@ @APXS_INCLUDES@ \
+                         @APR_CPPFLAGS@ @APR_INCLUDES@ \
+                         @APU_INCLUDES@ -DSTART_TAG='"<?"' -DEND_TAG='"?>"'
 
 lib_libmpmdir = @RIVET_TCL_TARGET@/mpm
 lib_libmpm_LTLIBRARIES = rivet_worker_mpm.la rivet_prefork_mpm.la rivet_lazy_mpm.la
 
-rivet_worker_mpm_la_SOURCES = @rivet_core@/rivet_worker_mpm.c @rivet_core@/worker_prefork_common.c
+rivet_worker_mpm_la_SOURCES = @rivet_core@/rivet_worker_mpm.c \
+                              @rivet_core@/worker_prefork_common.c
 rivet_worker_mpm_la_LDFLAGS = @TCL_STUB_LIB_SPEC@ @APXS_LDFLAGS@ -module -avoid-version
 rivet_worker_mpm_la_LIBADD  = @APXS_LIBS@
-rivet_worker_mpm_la_CPPFLAGS = @apache_include@ @TCL_INCLUDES@ @APXS_CPPFLAGS@ @APXS_INCLUDES@ @APR_CPPFLAGS@ @APR_INCLUDES@ @APU_INCLUDES@ -I$(srcdir)/@apache_request@ -I$(srcdir) -I$(srcdir)/@rivet_core@
+rivet_worker_mpm_la_CPPFLAGS = @apache_include@ @TCL_INCLUDES@ \
+                               @APXS_CPPFLAGS@ @APXS_INCLUDES@ \
+                               @APR_CPPFLAGS@ @APR_INCLUDES@ \
+                               @APU_INCLUDES@ \
+                              -I$(srcdir) \
+                              -I$(srcdir)/@apache_request@ \
+                              -I$(srcdir)/@rivet_core@
  
-rivet_prefork_mpm_la_SOURCES = @rivet_core@/rivet_prefork_mpm.c @rivet_core@/worker_prefork_common.c
+rivet_prefork_mpm_la_SOURCES = @rivet_core@/rivet_prefork_mpm.c \
+                               @rivet_core@/worker_prefork_common.c
 rivet_prefork_mpm_la_LDFLAGS = @TCL_STUB_LIB_SPEC@ @APXS_LDFLAGS@ -module -avoid-version
 rivet_prefork_mpm_la_LIBADD  = @APXS_LIBS@
-rivet_prefork_mpm_la_CPPFLAGS = @apache_include@ @TCL_INCLUDES@ @APXS_CPPFLAGS@ @APXS_INCLUDES@ @APR_CPPFLAGS@ @APR_INCLUDES@ @APU_INCLUDES@ -I$(srcdir)/@apache_request@ -I$(srcdir) -I$(srcdir)/@rivet_core@
+rivet_prefork_mpm_la_CPPFLAGS = @apache_include@ @TCL_INCLUDES@ \
+                                @APXS_CPPFLAGS@ @APXS_INCLUDES@ \
+                                @APR_CPPFLAGS@ @APR_INCLUDES@ \
+                                @APU_INCLUDES@ \
+                               -I$(srcdir) \
+                               -I$(srcdir)/@apache_request@ \
+                               -I$(srcdir)/@rivet_core@
 
 rivet_lazy_mpm_la_SOURCES = @rivet_core@/rivet_lazy_mpm.c
 rivet_lazy_mpm_la_LDFLAGS = @TCL_STUB_LIB_SPEC@ @APXS_LDFLAGS@ -module -avoid-version
 rivet_lazy_mpm_la_LIBADD  = @APXS_LIBS@
-rivet_lazy_mpm_la_CPPFLAGS = @apache_include@ @TCL_INCLUDES@ @APXS_CPPFLAGS@ @APXS_INCLUDES@ @APR_CPPFLAGS@ @APR_INCLUDES@ @APU_INCLUDES@ -I$(srcdir)/@apache_request@ -I$(srcdir) -I$(srcdir)/@rivet_core@
+rivet_lazy_mpm_la_CPPFLAGS = @apache_include@ @TCL_INCLUDES@ \
+                             @APXS_CPPFLAGS@ @APXS_INCLUDES@ \
+                             @APR_CPPFLAGS@ @APR_INCLUDES@ \
+                             @APU_INCLUDES@ \
+                            -I$(srcdir) \
+                            -I$(srcdir)/@apache_request@ \
+                            -I$(srcdir)/@rivet_core@
 
 # Removing libtool .la files from installation