You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by Marc Slemko <ma...@znep.com> on 1997/09/07 20:00:52 UTC
[PATCH] make modules/Makefile work with BSD make
Index: Configure
===================================================================
RCS file: /export/home/cvs/apachen/src/Configure,v
retrieving revision 1.150
diff -u -r1.150 Configure
--- Configure 1997/09/07 00:34:03 1.150
+++ Configure 1997/09/07 17:57:31
@@ -1000,12 +1000,14 @@
echo "MOD_CFLAGS=\$(INCLUDES2) \$(AUX_CFLAGS)">> modules/Makefile
CLEANERS=""
+MODULES=""
for i in $MODDIRS ; do
CLEANERS="$CLEANERS${i}_clean "
+ MODULES="$MODULES${i}_build "
done
cat << EOF >> modules/Makefile
-MODULES=$MODDIRS
+MODULES=$MODULES
CLEANERS=$CLEANERS
default: \$(MODULES)
@@ -1014,15 +1016,15 @@
clean: \$(CLEANERS)
@echo "Done cleaning module subdirectories"
-\$(MODULES): ForceMe
- (cd \$@; \$(MAKE) CC='\$(CC)' AUX_CFLAGS='\$(MOD_CFLAGS)' RANLIB='\$(RANLIB)')
-
ForceMe:
EOF
(
for i in $MODDIRS ; do
+ echo "${i}_build: ForceMe"
+ echo " (cd ${i}; \$(MAKE) CC='\$(CC)' AUX_CFLAGS='\$(MOD_CFLAGS)' RANLIB='\$(RANLIB)')"
+ echo ""
echo "${i}_clean:"
echo " (cd ${i}; \$(MAKE) clean)"
echo ""
[PATCH] simplify modules/Makefile
Posted by Paul Sutton <pa...@ukweb.com>.
This patch is an alternative to Marc's one to fix BSD make. This one
simplifies the modules/Makefile directory by removing the fake _clean
targets and use of non-existent forceme file targets. Basically it
replaces are the special place code to create "CLEANERS" and fake build
and clean targets with an "all clean :: ..." syntax.
Paul
Index: Configure
===================================================================
RCS file: /export/home/cvs/apachen/src/Configure,v
retrieving revision 1.150
diff -u -r1.150 Configure
--- Configure 1997/09/07 00:34:03 1.150
+++ Configure 1997/09/08 10:18:08
@@ -999,35 +997,16 @@
echo "INCLUDES2=$INCLUDES2">> modules/Makefile
echo "MOD_CFLAGS=\$(INCLUDES2) \$(AUX_CFLAGS)">> modules/Makefile
-CLEANERS=""
-for i in $MODDIRS ; do
- CLEANERS="$CLEANERS${i}_clean "
-done
-
cat << EOF >> modules/Makefile
MODULES=$MODDIRS
-CLEANERS=$CLEANERS
-
-default: \$(MODULES)
- @echo "Done building module subdirectories"
-clean: \$(CLEANERS)
- @echo "Done cleaning module subdirectories"
-
-\$(MODULES): ForceMe
- (cd \$@; \$(MAKE) CC='\$(CC)' AUX_CFLAGS='\$(MOD_CFLAGS)' RANLIB='\$(RANLIB)')
-
-ForceMe:
+all clean ::
+ for i in \$(MODULES); do \\
+ (cd \$\$i; \\
+ \$(MAKE) CC='\$(CC)' AUX_CFLAGS='\$(MOD_CFLAGS)' RANLIB='\$(RANLIB)' \$@);\\
+ done
EOF
-
-(
-for i in $MODDIRS ; do
- echo "${i}_clean:"
- echo " (cd ${i}; \$(MAKE) clean)"
- echo ""
-done
-) >> modules/Makefile
for moddir in $AUTODIRS ; do
echo "Creating Makefile in $moddir"