Stop calling shared modules libapachemod_*. mod_* is much easier to deal

with.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87435 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/acinclude.m4 b/acinclude.m4
index 2391b5de50192d76b6fcf9ec5062795c9e961f17..abbc58325154e0f769a06135acc44480d2a7e516 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -250,12 +250,12 @@ AC_DEFUN(APACHE_MODPATH_ADD,[
 
   if test -z "$module_standalone"; then
     if test -z "$2"; then
-      libname="libapachemod_$1.la"
+      libname="mod_$1.la"
       BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname"
       modpath_static="$modpath_static $libname"
       cat >>$modpath_current/modules.mk<<EOF
 $libname: $objects
-       \$(LINK) $objects
+       \$(MOD_LINK) $objects
 EOF
     else
       apache_need_shared=yes

diff --git a/build/rules.mk b/build/rules.mk
index 1edc59501671cdd491004a8b1738a680787298c5..f5284bfa67175a28ad3e4d9ff94b4387bb82b39b 100644 (file)
--- a/build/rules.mk
+++ b/build/rules.mk
@@ -70,8 +70,9 @@ LT_CXX_COMPILE = $(LIBTOOL) --mode=compile $(CXX_COMPILE) -c $< && touch $@
 
 # Link-related commands
 
-LINK    = $(LIBTOOL) --mode=link $(COMPILE) $(LTFLAGS) $(LDFLAGS) -o $@
-SH_LINK = $(SH_LIBTOOL) --mode=link $(COMPILE) $(LTFLAGS) $(LDFLAGS) -o $@
+LINK     = $(LIBTOOL) --mode=link $(COMPILE) $(LTFLAGS) $(LDFLAGS) -o $@
+SH_LINK  = $(SH_LIBTOOL) --mode=link $(COMPILE) $(LTFLAGS) $(LDFLAGS) -o $@
+MOD_LINK = $(LIBTOOL) --mode=link $(COMPILE) -module $(LTFLAGS) $(LDFLAGS) -o $@
 
 # Cross compile commands