svn commit: r355855 - in /incubator/mod_ftp/trunk: Makefile.in configure.in modules/Makefile.in src/Makefile.in

[co...@apache.org]

Author: colm
Date: Sat Dec 10 17:33:44 2005
New Revision: 355855

URL: http://svn.apache.org/viewcvs?rev=355855&view=rev
Log:
Massage Makefiles into a state where we are free of Make syntax errors.
For now libtool is hard-coded and we do not search for it properly.

Modified:
    incubator/mod_ftp/trunk/Makefile.in
    incubator/mod_ftp/trunk/configure.in
    incubator/mod_ftp/trunk/modules/Makefile.in
    incubator/mod_ftp/trunk/src/Makefile.in

Modified: incubator/mod_ftp/trunk/Makefile.in
URL: http://svn.apache.org/viewcvs/incubator/mod_ftp/trunk/Makefile.in?rev=355855&r1=355854&r2=355855&view=diff
==============================================================================
--- incubator/mod_ftp/trunk/Makefile.in (original)
+++ incubator/mod_ftp/trunk/Makefile.in Sat Dec 10 17:33:44 2005
@@ -117,16 +117,6 @@
 DIST_SUBDIRS =  src modules tests
 all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in 
-	cd $(srcdir) && $(ACLOCAL)
-
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
 $(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
@@ -166,8 +156,6 @@
 # (1) if the variable is set in `config.status', edit `config.status'
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
-
-@SET_MAKE@
 
 all-recursive install-data-recursive install-exec-recursive \
 installdirs-recursive install-recursive uninstall-recursive  \

Modified: incubator/mod_ftp/trunk/configure.in
URL: http://svn.apache.org/viewcvs/incubator/mod_ftp/trunk/configure.in?rev=355855&r1=355854&r2=355855&view=diff
==============================================================================
--- incubator/mod_ftp/trunk/configure.in (original)
+++ incubator/mod_ftp/trunk/configure.in Sat Dec 10 17:33:44 2005
@@ -2,9 +2,15 @@
 AC_CONFIG_HEADER(include/ftp_config.h)
 AC_CONFIG_AUX_DIR(build)
 
+dnl various OS checks that apparently set required flags
+AC_AIX
+AC_ISC_POSIX
+AC_MINIX
+
 sinclude(build/apr_common.m4)
 sinclude(build/find_apr.m4)
 sinclude(build/find_apu.m4)
+sinclude(aclocal.m4)
 
 APR_FIND_APR("$srcdir/srclib/apr", "./srclib/apr", 1, 1)
 
@@ -37,6 +43,7 @@
 dnl PCRE and for our config tests will be whatever PCRE determines.
 AC_PROG_CC
 AC_PROG_CPP
+AC_PROG_LIBTOOL
 
 AC_HEADER_STDC
 AC_CHECK_HEADERS( \
@@ -50,11 +57,6 @@
 
 FTPDIR=`pwd`
 AC_SUBST(FTPDIR)
-
-dnl various OS checks that apparently set required flags
-AC_AIX
-AC_ISC_POSIX
-AC_MINIX
 
 dnl Check for what we can generate dependency files with
 APR_CHECK_DEPEND

Modified: incubator/mod_ftp/trunk/modules/Makefile.in
URL: http://svn.apache.org/viewcvs/incubator/mod_ftp/trunk/modules/Makefile.in?rev=355855&r1=355854&r2=355855&view=diff
==============================================================================
--- incubator/mod_ftp/trunk/modules/Makefile.in (original)
+++ incubator/mod_ftp/trunk/modules/Makefile.in Sat Dec 10 17:33:44 2005
@@ -136,7 +136,7 @@
 all: all-redirect
 .SUFFIXES:
 .SUFFIXES: .S .c .lo .o .obj .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps modules/Makefile
 
 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status

Modified: incubator/mod_ftp/trunk/src/Makefile.in
URL: http://svn.apache.org/viewcvs/incubator/mod_ftp/trunk/src/Makefile.in?rev=355855&r1=355854&r2=355855&view=diff
==============================================================================
--- incubator/mod_ftp/trunk/src/Makefile.in (original)
+++ incubator/mod_ftp/trunk/src/Makefile.in Sat Dec 10 17:33:44 2005
@@ -81,7 +81,7 @@
 EXEEXT = @EXEEXT@
 FTPDIR = @FTPDIR@
 LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
+LIBTOOL = libtool
 LN_S = @LN_S@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -136,13 +136,6 @@
 all: all-redirect
 .SUFFIXES:
 .SUFFIXES: .S .c .lo .o .obj .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps src/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
 
 mostlyclean-libLTLIBRARIES: