sascha 00/01/16 09:18:14
Modified: src/build build.mk build2.mk Log: Remove dependency on automake's aclocal. We continue to use acinclude.m4, because aclocal.m4 needs to contain libtool's m4 macros. Revision Changes Path 1.3 +2 -1 apache-2.0/src/build/build.mk Index: build.mk =================================================================== RCS file: /home/cvs/apache-2.0/src/build/build.mk,v retrieving revision 1.2 retrieving revision 1.3 diff -u -u -r1.2 -r1.3 --- build.mk 2000/01/12 16:55:58 1.2 +++ build.mk 2000/01/16 17:18:13 1.3 @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ############################################################################## -# $Id: build.mk,v 1.2 2000/01/12 16:55:58 sascha Exp $ +# $Id: build.mk,v 1.3 2000/01/16 17:18:13 sascha Exp $ # # Makefile to generate build tools # @@ -33,6 +33,7 @@ generated_lists: @echo config_m4_files = `find . -name config.m4` > $@ + @n=`which libtool`; echo libtool_prefix = `dirname $$n`/.. >> $@ $(STAMP): build/buildcheck.sh @build/buildcheck.sh && touch $(STAMP) 1.2 +7 -5 apache-2.0/src/build/build2.mk Index: build2.mk =================================================================== RCS file: /home/cvs/apache-2.0/src/build/build2.mk,v retrieving revision 1.1 retrieving revision 1.2 diff -u -u -r1.1 -r1.2 --- build2.mk 2000/01/11 13:10:58 1.1 +++ build2.mk 2000/01/16 17:18:13 1.2 @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ############################################################################## -# $Id: build2.mk,v 1.1 2000/01/11 13:10:58 sascha Exp $ +# $Id: build2.mk,v 1.2 2000/01/16 17:18:13 sascha Exp $ include generated_lists @@ -37,17 +37,19 @@ APR_TARGETS = $(apr_configure) $(apr_config_h_in) -targets = .deps $(APACHE_TARGETS) $(APR_TARGETS) +targets = .deps aclocal.m4 $(APACHE_TARGETS) $(APR_TARGETS) all: $(targets) .deps: touch $@ -aclocal.m4: configure.in acinclude.m4 +libtool_m4 = $(libtool_prefix)/share/aclocal/libtool.m4 + +aclocal.m4: acinclude.m4 $(libtool_m4) @echo rebuilding $@ - aclocal - + @cat acinclude.m4 $(libtool_m4) > $@ + $(LT_TARGETS): libtoolize $(AMFLAGS) --force