Merge pull request #314 from jajik/tweak-build

Improve Makefiles for modules, use environment variables through GH Actions

Author: rhusar

.github/workflows/ci.yml

@@ -109,6 +109,8 @@ jobs:
     defaults:
       run:
         shell: bash
+    env:
+        CFLAGS: "-Wall -Werror"
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -118,7 +120,7 @@ jobs:
           for module in advertise/ mod_proxy_cluster/ balancers/ mod_manager/; do \
             cd $module; \
             sh buildconf; \
-            ./configure CFLAGS="-Wall -Werror" --with-apxs=/usr/local/apache2/bin/apxs; \
+            ./configure --with-apxs=/usr/local/apache2/bin/apxs; \
             make clean; \
             make || exit 1; \
             cd ..; \
@@ -158,13 +160,15 @@ jobs:
           sudo make
           sudo make install
       - name: Build mod_proxy_cluster and add it to httpd
+        env:
+            CFLAGS: "-Wall -Werror"
         run: |
           ls
           cd mod_proxy_cluster/native
           for module in advertise/ mod_proxy_cluster/ balancers/ mod_manager/; do \
             cd $module; \
             sh buildconf; \
-            ./configure CFLAGS="-Wall -Werror" --with-apxs=/usr/local/apache2/bin/apxs; \
+            ./configure --with-apxs=/usr/local/apache2/bin/apxs; \
             make clean; \
             make || exit 1; \
             sudo cp *.so /usr/local/apache2/modules; \

native/advertise/Makefile.in

@@ -14,7 +14,7 @@ builddir = @CLUSTER_BASE@
 top_srcdir = @APACHE_BASE@
 
 include $(top_builddir)/build/rules.mk
-SH_COMPILE = $(LIBTOOL) --mode=compile $(BASE_CC) -I../include -prefer-pic -c $< && touch $@
+SHLTCFLAGS += -I$(builddir)/../include
 
 all: mod_advertise.so
 

native/balancers/Makefile.in

@@ -9,7 +9,7 @@ top_builddir = @APACHE_BUILDDIR@
 builddir = @CLUSTER_BASE@
 
 include $(top_builddir)/build/rules.mk
-SH_COMPILE = $(LIBTOOL) --mode=compile $(BASE_CC) -I../include -prefer-pic -c $< && touch $@
+SHLTCFLAGS += -I$(builddir)/../include
 
 all: mod_lbmethod_cluster.so
 

native/mod_manager/Makefile.in

@@ -14,7 +14,7 @@ builddir = @CLUSTER_BASE@
 top_srcdir = @APACHE_BASE@
 
 include $(top_builddir)/build/rules.mk
-SH_COMPILE = $(LIBTOOL) --mode=compile $(BASE_CC) -I../include -prefer-pic -c $< && touch $@
+SHLTCFLAGS += -I$(builddir)/../include
 
 all: mod_manager.so
 

native/mod_proxy_cluster/Makefile.in

@@ -9,7 +9,7 @@ top_builddir = @APACHE_BUILDDIR@
 builddir = @CLUSTER_BASE@
 
 include $(top_builddir)/build/rules.mk
-SH_COMPILE = $(LIBTOOL) --mode=compile $(BASE_CC) -I../include -prefer-pic -c $< && touch $@
+SHLTCFLAGS += -I$(builddir)/../include
 
 all: mod_proxy_cluster.so