You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2009/08/25 02:43:46 UTC

svn commit: r807442 - in /httpd/mod_fcgid/trunk: ./ build/ modules/fcgid/

Author: wrowe
Date: Tue Aug 25 00:43:46 2009
New Revision: 807442

URL: http://svn.apache.org/viewvc?rev=807442&view=rev
Log:
Borrowed heavily from mod_ftp, give fcgid a build schema that works
out of tree, or actually works in-tree on unix vpath builds.

Added:
    httpd/mod_fcgid/trunk/Makefile.apxs
      - copied, changed from r807306, httpd/mod_ftp/trunk/Makefile.apxs
    httpd/mod_fcgid/trunk/build/
    httpd/mod_fcgid/trunk/build/Makefile.apxs
      - copied, changed from r807306, httpd/mod_ftp/trunk/build/Makefile.apxs
    httpd/mod_fcgid/trunk/configure.apxs
      - copied, changed from r807306, httpd/mod_ftp/trunk/configure.apxs
    httpd/mod_fcgid/trunk/mod_fcgid.dsw
    httpd/mod_fcgid/trunk/modules/fcgid/Makefile.apxs
      - copied, changed from r807306, httpd/mod_ftp/trunk/modules/ftp/Makefile.apxs
    httpd/mod_fcgid/trunk/modules/fcgid/Makefile.in
      - copied, changed from r807306, httpd/mod_ftp/trunk/modules/ftp/Makefile.in
    httpd/mod_fcgid/trunk/modules/fcgid/modules.mk.apxs
      - copied, changed from r807371, httpd/mod_fcgid/trunk/modules/fcgid/modules.mk
Removed:
    httpd/mod_fcgid/trunk/modules/fcgid/Makefile
    httpd/mod_fcgid/trunk/modules/fcgid/modules.mk
Modified:
    httpd/mod_fcgid/trunk/modules/fcgid/config.m4
    httpd/mod_fcgid/trunk/modules/fcgid/mod_fcgid.dsp

Copied: httpd/mod_fcgid/trunk/Makefile.apxs (from r807306, httpd/mod_ftp/trunk/Makefile.apxs)
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/Makefile.apxs?p2=httpd/mod_fcgid/trunk/Makefile.apxs&p1=httpd/mod_ftp/trunk/Makefile.apxs&r1=807306&r2=807442&rev=807442&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/Makefile.apxs (original)
+++ httpd/mod_fcgid/trunk/Makefile.apxs Tue Aug 25 00:43:46 2009
@@ -26,7 +26,7 @@
 
 include $(exp_installbuilddir)/rules.mk
 
-# Dang nabbit, these are stripped!  Reconsitute them;
+# Dang nabbit, these are stripped!  Reconstitute them;
 rel_libexecdir=`echo $(exp_libexecdir) | sed -e "s#^$(prefix)/##;"`
 rel_sysconfdir=`echo $(exp_sysconfdir) | sed -e "s#^$(prefix)/##;"`
 rel_logfiledir=`echo $(exp_logfiledir) | sed -e "s#^$(prefix)/##;"`

Copied: httpd/mod_fcgid/trunk/build/Makefile.apxs (from r807306, httpd/mod_ftp/trunk/build/Makefile.apxs)
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/build/Makefile.apxs?p2=httpd/mod_fcgid/trunk/build/Makefile.apxs&p1=httpd/mod_ftp/trunk/build/Makefile.apxs&r1=807306&r2=807442&rev=807442&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/build/Makefile.apxs (original)
+++ httpd/mod_fcgid/trunk/build/Makefile.apxs Tue Aug 25 00:43:46 2009
@@ -1,7 +1,7 @@
 ##
-##  Makefile.apxs -- Feature test procedures for mod_ftp Apache module
+##  Makefile.apxs -- Feature test procedures for mod_fcgid Apache module
 ##
-##  Do not use this target; ./configure.apxs from the mod_ftp dir root
+##  Do not use this target; ./configure.apxs from the mod_fcgid dir root
 ##
  
 # top_builddir and top_srcdir are misnomers, because build/*.mk
@@ -11,79 +11,27 @@
 top_srcdir=$(installbuilddir)/..
 top_builddir=$(installbuilddir)/..
 
-ftp_builddir=..
-ftp_srcdir=..
+fcgid_builddir=..
+fcgid_srcdir=..
 builddir=.
 srcdir=.
 
 CLEAN_TARGETS = conftest_fchmod.c \
-		conftest_arpa_ftp_h.c \
-		conftest_netinet_ip_h.c \
-		conftest_struct_msghdr_msg_control.c \
-		conftest_struct_msghdr_msg_accrights.c \
-		conftest_SOL_IP.c \
 		*.loT
 TARGETS       = conftest_fchmod \
-		conftest_arpa_ftp_h \
-		conftest_netinet_ip_h \
-		conftest_struct_msghdr_msg_control \
-		conftest_struct_msghdr_msg_accrights \
-		conftest_SOL_IP \
 
 PROGRAM_LDADD        = 
 PROGRAM_DEPENDENCIES = 
 
 include $(exp_installbuilddir)/rules.mk
 
+# Tests follow this pattern; one to execute, one to create source;
+
 conftest_fchmod: conftest_fchmod.lo
 	$(LINK) conftest_fchmod.lo
 
-conftest_arpa_ftp_h: conftest_arpa_ftp_h.lo
-	@echo "success" > $@
-
-conftest_netinet_ip_h: conftest_netinet_ip_h.lo
-	@echo "success" > $@
-
-conftest_SOL_IP: conftest_SOL_IP.lo
-	@echo "success" > $@
-
-conftest_struct_msghdr_msg_control: conftest_struct_msghdr_msg_control.lo
-	@echo "success" > $@
-
-conftest_struct_msghdr_msg_accrights: conftest_struct_msghdr_msg_accrights.lo
-	@echo "success" > $@
-
 conftest_fchmod.c:
 	@echo "#include <sys/types.h>" > $@
 	@echo "#include <sys/stat.h>" >> $@
 	@echo "int main() { return fchmod(2, 0644); }" >> $@
 
-conftest_arpa_ftp_h.c:
-	@echo "#include <arpa/ftp.h>" > $@
-
-conftest_netinet_ip_h.c:
-	@echo "#include <sys/types.h>" > $@
-	@echo "#include <sys/socket.h>" >> $@
-	@echo "#include <netinet/ip.h>" >> $@
-
-conftest_SOL_IP.c:
-	@echo "#include <sys/types.h>" > $@
-	@echo "#include <sys/socket.h>" >> $@
-	@echo "#include <netinet/ip.h>" >> $@
-	@echo "int main ()" >> $@
-	@echo "{ return SOL_IP; }" >> $@
-
-conftest_struct_msghdr_msg_control.c:
-	@echo "#include <sys/types.h>" > $@
-	@echo "#include <sys/socket.h>" >> $@
-	@echo "int main ()" >> $@
-	@echo "{ static struct msghdr ac_aggr;" >> $@
-	@echo "  return sizeof(ac_aggr.msg_control); }" >> $@
-
-conftest_struct_msghdr_msg_accrights.c:
-	@echo "#include <sys/types.h>" > $@
-	@echo "#include <sys/socket.h>" >> $@
-	@echo "int main ()" >> $@
-	@echo "{ static struct msghdr ac_aggr;" >> $@
-	@echo "  return sizeof(ac_aggr.msg_accrights); }" >> $@
-

Copied: httpd/mod_fcgid/trunk/configure.apxs (from r807306, httpd/mod_ftp/trunk/configure.apxs)
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/configure.apxs?p2=httpd/mod_fcgid/trunk/configure.apxs&p1=httpd/mod_ftp/trunk/configure.apxs&r1=807306&r2=807442&rev=807442&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/configure.apxs (original)
+++ httpd/mod_fcgid/trunk/configure.apxs Tue Aug 25 00:43:46 2009
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#  configure.apxs --- build configuration script for creating mod_ftp
+#  configure.apxs --- build configuration script for creating mod_fcgid
 #  out of tree using the apxs utility and httpd build toolset
 #
 if test "$APXS" = ""; then
@@ -18,7 +18,7 @@
   exit 1
 fi
 
-echo Configuring mod_ftp for APXS in $APXS
+echo Configuring mod_fcgid for APXS in $APXS
 
 # top_builddir and top_srcdir are a misnomers, because build/*.mk
 # scripts expect them to be the parent of the build directory
@@ -29,8 +29,8 @@
 
 builddir=`pwd`
 srcdir=$builddir
-ftp_builddir=$builddir
-ftp_srcdir=$builddir
+fcgid_builddir=$builddir
+fcgid_srcdir=$builddir
 
 # prefix is the default @@ServerRoot@@, where libexecdir/sysconfdir may
 # be relative (if it is not their prefix, the rel_ paths remain unchanged
@@ -40,90 +40,65 @@
 rel_logfiledir=`$APXS -q exp_logfiledir | sed -e "s#^$rel_fix_prefix/##;"`
 httpd_conffile=`$APXS -q exp_sysconfdir`/`$APXS -q progname`.conf
 
-exp_ftpdocsdir=`$APXS -q exp_datadir`/ftpdocs
-FTPPORT=21
-
-for i in Makefile build/Makefile modules/ftp/Makefile modules/ftp/modules.mk; do
+for i in Makefile build/Makefile modules/fcgid/Makefile modules/fcgid/modules.mk; do
     l_r=`echo $i|sed -e "s#/*[^/]*\\\$##;s#^\(..*\)\\\$#/\1#"`
     sed -e "s#^\(exp_installbuilddir\)=.*#\1=$exp_installbuilddir#;" \
         -e "s#^\(include\) \$(exp_installbuilddir)#\1 $exp_installbuilddir#;" \
         -e "s#^\(top_builddir\)=.*#\1=$top_installbuilddir#;" \
         -e "s#^\(top_srcdir\)=.*#\1=$top_installbuilddir#;" \
-        -e "s#^\(ftp_srcdir\)=.*#\1=$srcdir#;" \
-        -e "s#^\(ftp_builddir\)=.*#\1=$builddir#;" \
+        -e "s#^\(fcgid_srcdir\)=.*#\1=$srcdir#;" \
+        -e "s#^\(fcgid_builddir\)=.*#\1=$builddir#;" \
         -e "s#^\(srcdir\)=.*#\1=$srcdir$l_r#;" \
         -e "s#^\(builddir\)=.*#\1=$builddir$l_r#;" \
         -e "s#^\(rel_libexecdir\)=.*#\1=$rel_libexecdir#;" \
         -e "s#^\(rel_sysconfdir\)=.*#\1=$rel_sysconfdir#;" \
         -e "s#^\(rel_logfiledir\)=.*#\1=$rel_logfiledir#;" \
         -e "s#^\(httpd_conffile\)=.*#\1=$httpd_conffile#;" \
-        -e "s#^\(exp_ftpdocsdir\)=.*#\1=$exp_ftpdocsdir#;" \
-        -e "s#^\(FTPPORT\)=.*#\1=$FTPPORT#;" \
         < $i.apxs > $i
 done
 
 touch .deps
 touch build/.deps
-touch modules/ftp/.deps
+touch modules/fcgid/.deps
+
+if test -f modules/fcgid/fcgid_config.h.in; then
 
 cd build
 found_features=""
 echo "Detecting features"
 echo "Detecting features" > ../config.apxs.log
 
-if make local-clean conftest_arpa_ftp_h >>../config.apxs.log 2>&1; then
-  found_features="$found_features \
-    -e \"s/^#undef \(HAVE_ARPA_FTP_H\)[ \t]*/#define \1/;\""
-fi
-
-if make local-clean conftest_fchmod >>../config.apxs.log 2>&1; then
-  found_features="$found_features \
-    -e \"s/^#undef \(HAVE_FCHMOD\)[ \t]*/#define \1/;\""
-fi
-
-if make local-clean conftest_netinet_ip_h >>../config.apxs.log 2>&1; then
-  found_features="$found_features \
-    -e \"s/^#undef \(HAVE_NETINET_IP_H\)[ \t]*/#define \1/;\""
-
-  if make local-clean conftest_SOL_IP >>../config.apxs.log 2>&1; then
-    found_features="$found_features \
-      -e \"s/^#undef \(HAVE_SOL_IP\)[ \t]*/#define \1/;\""
-  fi
-fi
-
-if make conftest_struct_msghdr_msg_control >>../config.apxs.log 2>&1; then
-  found_features="$found_features \
-    -e \"s/^#undef \(HAVE_STRUCT_MSGHDR_MSG_CONTROL\)[ \t]*/#define \1/;\""
-fi
-
-if make conftest_struct_msghdr_msg_accrights >>../config.apxs.log 2>&1; then
-  found_features="$found_features \
-    -e \"s/^#undef \(HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS\)[ \t]*/#define \1/;\""
-fi
+#test invocations follow the pattern;
+#
+#if make local-clean conftest_fchmod >>../config.apxs.log 2>&1; then
+#  found_features="$found_features \
+#    -e \"s/^#undef \(HAVE_FCHMOD\)[ \t]*/#define \1/;\""
+#fi
 
 make local-distclean >>../config.apxs.log 2>&1
 cd ..
 
 if test "x$found_features" = "x"; then
-  cp modules/ftp/ftp_config.h.in modules/ftp/ftp_config.h
+  cp modules/fcgid/fcgid_config.h.in modules/fcgid/fcgid_config.h
 else
   found_features="`echo \"$found_features\" | sed -e '#s*/#*\\$/#g;'`"
-  eval sed $found_features < modules/ftp/ftp_config.h.in \
-                           > modules/ftp/ftp_config.h
+  eval sed $found_features < modules/fcgid/fcgid_config.h.in \
+                           > modules/fcgid/fcgid_config.h
+fi
+
 fi
 
 echo ""
-echo "Finished, run 'make' to compile mod_ftp"
+echo "Finished, run 'make' to compile mod_fcgid"
 echo ""
-echo "Run 'make FTPPORT=8021 install' to install mod_ftp"
-echo "(The default FTPPORT is $FTPPORT if not specified)"
+echo "Run 'make install' to install mod_fcgid"
 echo ""
-echo "The manual pages ftp/index.html and mod/mod_ftp.html"
-echo "will be installed to help get you started."
-echo
-echo "The conf/extra/ftpd.conf will be installed as an example"
-echo "for you to work from.  In your configuration file,"
-echo "  `$APXS -q exp_sysconfdir`/`$APXS -q progname`.conf"
-echo "uncomment the line '#Include conf/extra/ftpd.conf'"
-echo "to activate this example mod_ftp configuration."
+#echo "The manual pages fcgid/index.html and mod/mod_fcgid.html"
+#echo "will be installed to help get you started."
+#echo
+#echo "The conf/extra/httpd-fcgid.conf will be installed as an example"
+#echo "for you to work from.  In your configuration file,"
+#echo "  `$APXS -q exp_sysconfdir`/`$APXS -q progname`.conf"
+#echo "uncomment the line '#Include conf/extra/ftpd.conf'"
+#echo "to activate this example mod_ftp configuration."
 

Added: httpd/mod_fcgid/trunk/mod_fcgid.dsw
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/mod_fcgid.dsw?rev=807442&view=auto
==============================================================================
--- httpd/mod_fcgid/trunk/mod_fcgid.dsw (added)
+++ httpd/mod_fcgid/trunk/mod_fcgid.dsw Tue Aug 25 00:43:46 2009
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "mod_fcgid"=modules\fcgid\mod_fcgid.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+

Copied: httpd/mod_fcgid/trunk/modules/fcgid/Makefile.apxs (from r807306, httpd/mod_ftp/trunk/modules/ftp/Makefile.apxs)
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/modules/fcgid/Makefile.apxs?p2=httpd/mod_fcgid/trunk/modules/fcgid/Makefile.apxs&p1=httpd/mod_ftp/trunk/modules/ftp/Makefile.apxs&r1=807306&r2=807442&rev=807442&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/Makefile.apxs (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/Makefile.apxs Tue Aug 25 00:43:46 2009
@@ -1,7 +1,7 @@
 ##
-##  Makefile.apx -- Build procedure for mod_ftp Apache module
+##  Makefile.apxs -- Build procedure for mod_fcgid Apache module
 ##
-##  Do not use this target; build from the mod_ftp dir root
+##  Do not use this target; build from the mod_fcgid dir root
 ##
  
 # top_builddir and top_srcdir are misnomers, because build/*.mk
@@ -11,28 +11,18 @@
 top_srcdir=$(installbuilddir)/..
 top_builddir=$(installbuilddir)/..
 
-ftp_builddir=../..
-ftp_srcdir=../..
+fcgid_builddir=../..
+fcgid_srcdir=../..
 builddir=.
 srcdir=.
 
 CLEAN_TARGETS = *.loT
 include $(exp_installbuilddir)/special.mk
 
-all: $(srcdir)/ftp_protocol.h local-shared-build all-recursive
+all: local-shared-build all-recursive
 
 #   additional defines, includes and libraries
-DEFS=-DFTP_APXS_BUILD
-INCLUDES=-I$(builddir) -I$(srcdir) -I$(ftp_srcdir)/include
+DEFS=-DFCGID_APXS_BUILD
+INCLUDES=-I$(builddir) -I$(srcdir) -I$(fcgid_srcdir)/include
 #LIBS=-Lmy/lib/dir -lmylib
 
-#
-#   since ftp_protocol.h is only updated when the source tree
-#   is changed, it's refreshed in srcdir rather than builddir
-#
-
-$(srcdir)/ftp_protocol.h: $(ftp_srcdir)/include/mod_ftp.h \
-		$(srcdir)/ftp_commands.c
-	$(srcdir)/remake_ftp_protocol > $(srcdir)/ftp_protocol.h
-
-

Copied: httpd/mod_fcgid/trunk/modules/fcgid/Makefile.in (from r807306, httpd/mod_ftp/trunk/modules/ftp/Makefile.in)
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/modules/fcgid/Makefile.in?p2=httpd/mod_fcgid/trunk/modules/fcgid/Makefile.in&p1=httpd/mod_ftp/trunk/modules/ftp/Makefile.in&r1=807306&r2=807442&rev=807442&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/Makefile.in (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/Makefile.in Tue Aug 25 00:43:46 2009
@@ -19,16 +19,5 @@
 
 include $(top_srcdir)/build/special.mk
 
-all: $(srcdir)/ftp_protocol.h all-recursive
-
-#
-#   developer stuff
-#
-#   since ftp_protocol.h is only updated when the source tree
-#   is changed, it's refreshed in srcdir rather than builddir
-#
-
-$(srcdir)/ftp_protocol.h: $(top_srcdir)/include/mod_ftp.h \
-		$(srcdir)/ftp_commands.c
-	$(srcdir)/remake_ftp_protocol > $(srcdir)/ftp_protocol.h
+all: all-recursive
 

Modified: httpd/mod_fcgid/trunk/modules/fcgid/config.m4
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/modules/fcgid/config.m4?rev=807442&r1=807441&r2=807442&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/modules/fcgid/config.m4 (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/config.m4 Tue Aug 25 00:43:46 2009
@@ -1,15 +1,29 @@
-dnl APACHE_MODULE(name, helptext[, objects[, structname[, default[, config]]]])
+dnl Licensed to the Apache Software Foundation (ASF) under one or more
+dnl contributor license agreements.  See the NOTICE file distributed with
+dnl this work for additional information regarding copyright ownership.
+dnl The ASF licenses this file to You under the Apache License, Version 2.0
+dnl (the "License"); you may not use this file except in compliance with
+dnl the License.  You may obtain a copy of the License at
+dnl
+dnl       http://www.apache.org/licenses/LICENSE-2.0
+dnl
+dnl Unless required by applicable law or agreed to in writing, software
+dnl distributed under the License is distributed on an "AS IS" BASIS,
+dnl WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+dnl See the License for the specific language governing permissions and
+dnl limitations under the License.
 
-APACHE_MODPATH_INIT(mod_fcgid)
+dnl #  start of module specific part
+APACHE_MODPATH_INIT(fcgid)
 
 dnl #  list of module object files
 fcigd_objs="dnl
+mod_fcgid.lo dnl
 fcgid_bridge.lo dnl
 fcgid_conf.lo dnl
 fcgid_pm_main.lo dnl
 fcgid_protocol.lo dnl
 fcgid_spawn_ctl.lo dnl
-mod_fcgid.lo dnl
 fcgid_proctbl_unix.lo dnl
 fcgid_pm_unix.lo dnl
 fcgid_proc_unix.lo dnl
@@ -19,4 +33,5 @@
 
 APACHE_MODULE(fcgid, [FastCGI support (mod_fcgid)], $fcigd_objs, , no)
 
+dnl #  end of module specific part
 APACHE_MODPATH_FINISH

Modified: httpd/mod_fcgid/trunk/modules/fcgid/mod_fcgid.dsp
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/modules/fcgid/mod_fcgid.dsp?rev=807442&r1=807441&r2=807442&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/modules/fcgid/mod_fcgid.dsp (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/mod_fcgid.dsp Tue Aug 25 00:43:46 2009
@@ -137,7 +137,7 @@
 # End Source File
 # Begin Source File
 
-SOURCE=.\arch\win32\fcgid_pm_win.c
+SOURCE=.\fcgid_pm_win.c
 # End Source File
 # Begin Source File
 
@@ -145,7 +145,7 @@
 # End Source File
 # Begin Source File
 
-SOURCE=.\arch\win32\fcgid_proc_win.c
+SOURCE=.\fcgid_proc_win.c
 # End Source File
 # Begin Source File
 
@@ -153,7 +153,7 @@
 # End Source File
 # Begin Source File
 
-SOURCE=.\arch\win32\fcgid_proctbl_win.c
+SOURCE=.\fcgid_proctbl_win.c
 # End Source File
 # Begin Source File
 

Copied: httpd/mod_fcgid/trunk/modules/fcgid/modules.mk.apxs (from r807371, httpd/mod_fcgid/trunk/modules/fcgid/modules.mk)
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/modules/fcgid/modules.mk.apxs?p2=httpd/mod_fcgid/trunk/modules/fcgid/modules.mk.apxs&p1=httpd/mod_fcgid/trunk/modules/fcgid/modules.mk&r1=807371&r2=807442&rev=807442&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/modules/fcgid/modules.mk (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/modules.mk.apxs Tue Aug 25 00:43:46 2009
@@ -16,14 +16,9 @@
 #
 # this is used/needed by the APACHE2 build system
 #
-
-MOD_FCGID = fcgid_bridge fcgid_conf fcgid_pm_main fcgid_protocol fcgid_spawn_ctl \
-	mod_fcgid fcgid_proctbl_unix fcgid_pm_unix fcgid_proc_unix fcgid_bucket fcgid_filter
-
-mod_fcgid.la: ${MOD_FCGID:=.slo}
-	$(SH_LINK) -rpath $(libexecdir) -module -avoid-version ${MOD_FCGID:=.lo}
-
+mod_fcgid.la: mod_fcgid.slo fcgid_bridge.slo fcgid_conf.slo fcgid_pm_main.slo fcgid_protocol.slo fcgid_spawn_ctl.slo  fcgid_proctbl_unix.slo fcgid_pm_unix.slo fcgid_proc_unix.slo fcgid_bucket.slo fcgid_filter.slo
+	$(SH_LINK) -rpath $(libexecdir) -module -avoid-version mod_fcgid.slo fcgid_bridge.slo fcgid_conf.slo fcgid_pm_main.slo fcgid_protocol.slo fcgid_spawn_ctl.slo  fcgid_proctbl_unix.slo fcgid_pm_unix.slo fcgid_proc_unix.slo fcgid_bucket.slo fcgid_filter.slo
 DISTCLEAN_TARGETS = modules.mk
-
+static =
 shared =  mod_fcgid.la