This is an automated email from the ASF dual-hosted git repository.
rainerjung pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git
The following commit(s) were added to refs/heads/main by this push:
new d5289393c list.mk no longer needs to get generated
d5289393c is described below
commit d5289393c09a26b3272ef788212170ba9766397a
Author: Rainer Jung <[email protected]>
AuthorDate: Wed Jun 24 19:55:18 2026 +0200
list.mk no longer needs to get generated
---
native/apache-2.0/Makefile.apxs.in | 2 +-
native/apache-2.0/Makefile.in | 2 +-
native/common/.gitignore | 1 -
native/common/Makefile.in | 4 ++--
native/common/{list.mk.in => list.mk} | 0
native/configure.ac | 1 -
6 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/native/apache-2.0/Makefile.apxs.in
b/native/apache-2.0/Makefile.apxs.in
index 161616502..3a64d1ad7 100644
--- a/native/apache-2.0/Makefile.apxs.in
+++ b/native/apache-2.0/Makefile.apxs.in
@@ -28,7 +28,7 @@ JK_INCL=-DUSE_APACHE_MD5 -I${top_builddir}/${COMMON} -I
${top_srcdir}/${COMMON}
## read the object (.c) from the list file.
OEXT=.c
-include @top_builddir@/common/list.mk
+include ${top_srcdir}/${COMMON}/list.mk
all: mod_jk.la
diff --git a/native/apache-2.0/Makefile.in b/native/apache-2.0/Makefile.in
index a9327743b..c6961443f 100644
--- a/native/apache-2.0/Makefile.in
+++ b/native/apache-2.0/Makefile.in
@@ -33,7 +33,7 @@ libexecdir=${APACHE_DIR}/modules
JK=${top_builddir}/common/
# Defines APACHE_OBJECTS - the list of all common files
-include ${top_builddir}/common/list.mk
+include ${top_srcdir}/${COMMON}/list.mk
# Apache settings, values guessed by Apache config and used to build it
# Will define libexecdir, LIBTOOL, etc
diff --git a/native/common/.gitignore b/native/common/.gitignore
index 10e6adddc..ba494e7c8 100644
--- a/native/common/.gitignore
+++ b/native/common/.gitignore
@@ -4,7 +4,6 @@
.libs
Makefile
stamp-h.in
-list.mk
stamp-h
config.h.in
config.h
diff --git a/native/common/Makefile.in b/native/common/Makefile.in
index a50628335..8b675f3d3 100644
--- a/native/common/Makefile.in
+++ b/native/common/Makefile.in
@@ -30,11 +30,11 @@ LIBTOOL = @LIBTOOL@
CC = @CC@
OEXT=.lo
-include list.mk
+include ${top_srcdir}/common/list.mk
CFLAGS=-I. @apache_include@ @CFLAGS@ ${APXSCFLAGS} ${APXSCPPFLAGS}
-include @top_srcdir@/scripts/build/rules.mk
+include ${top_srcdir}/scripts/build/rules.mk
JK=./
diff --git a/native/common/list.mk.in b/native/common/list.mk
similarity index 100%
rename from native/common/list.mk.in
rename to native/common/list.mk
diff --git a/native/configure.ac b/native/configure.ac
index 5605f59ba..80e41337e 100644
--- a/native/configure.ac
+++ b/native/configure.ac
@@ -661,7 +661,6 @@ AC_OUTPUT([
apache-2.0/Makefile
apache-2.0/Makefile.apxs
common/Makefile
- common/list.mk
common/jk_types.h
])
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
