removed default: target. moved all: target to start

diff --git a/ChangeLog b/ChangeLog
index c6e8814d51bc84ee38dbb405c8ddcf1952f197c2..9a11556d0e7214a705857b95c17af88846251950 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Mar 19 01:33:35 1998  Tom Tromey  <tromey@cygnus.com>
+
+       * automake.in (initialize_per_input): Set $output_all.
+       (generate_makefile): Don't set $output_header or generate
+       `default' target.  Print $output_all before $output_header.
+       (handle_merge_targets): Put `all' target into $output_all.
+
 Wed Mar 18 14:48:44 1998  Tom Tromey  <tromey@cygnus.com>
 
        * automake.in (handle_configure): Put secondary dependencies from

diff --git a/Makefile.in b/Makefile.in
index f85dd9a593c3b596d8e35f383805bb80bb993be8..f25e0fd042a8c4b553d2102e05df2e8d54eed762 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.2f from Makefile.am
+# Makefile.in generated automatically by automake 1.2g from Makefile.am
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -109,14 +109,14 @@ stamp-vti texinfo.tex version.texi ylwrap
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 GZIP = --best
-default: all
+all: all-recursive all-am
 
 .SUFFIXES:
 .SUFFIXES: .dvi .info .ps .texi .texinfo .txi
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
        cd $(top_srcdir) && $(AUTOMAKE) --gnits Makefile
 
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
        cd $(top_builddir) \
          && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -474,8 +474,6 @@ install: install-recursive install-exec-am install-data-am
 
 uninstall: uninstall-recursive uninstall-am
 
-all: all-recursive all-am
-
 install-strip:
        $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
 installdirs: installdirs-recursive
@@ -521,12 +519,12 @@ maintainer-clean:  maintainer-clean-recursive maintainer-clean-am
        @echo "it deletes files that may require special tools to rebuild."
        -rm -f config.status
 
-.PHONY: default uninstall-binSCRIPTS install-binSCRIPTS \
-uninstall-pkgdataSCRIPTS install-pkgdataSCRIPTS mostlyclean-vti \
-distclean-vti clean-vti maintainer-clean-vti install-info-am \
-uninstall-info mostlyclean-aminfo distclean-aminfo clean-aminfo \
-maintainer-clean-aminfo uninstall-pkgdataDATA install-pkgdataDATA \
-install-data-recursive uninstall-data-recursive install-exec-recursive \
+.PHONY: uninstall-binSCRIPTS install-binSCRIPTS uninstall-pkgdataSCRIPTS \
+install-pkgdataSCRIPTS mostlyclean-vti distclean-vti clean-vti \
+maintainer-clean-vti install-info-am uninstall-info mostlyclean-aminfo \
+distclean-aminfo clean-aminfo maintainer-clean-aminfo \
+uninstall-pkgdataDATA install-pkgdataDATA install-data-recursive \
+uninstall-data-recursive install-exec-recursive \
 uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
 all-recursive check-recursive installcheck-recursive info-recursive \
 dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \

diff --git a/automake.in b/automake.in
index b90589564fdcf767f38a7b7989d70afb5fad6637..a7db36f4c7872d9e9743b44afc7de5abcd30c39a 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -536,15 +536,6 @@ sub generate_makefile
     push (@objects, '$(OBJECTS)')
        if &variable_defined ('OBJECTS');
 
-    # This is always the default target.  This gives us freedom to do
-    # things in whatever order is convenient.  Note that we set up
-    # $output_header here so that we can insert some text just after
-    # the "default" target, but before any other targets.  In
-    # particular we want to support the .SUFFIX hack here; this is
-    # documented elsewhere.
-    $output_header = "default: all\n\n";
-    push (@phony, 'default');
-
     &read_am_file ($makefile . '.am');
     if (&handle_options)
     {
@@ -628,6 +619,8 @@ sub generate_makefile
     print "automake: creating ", $makefile, ".in\n" if $verbose;
 
     print GM_FILE $output_vars;
+    # We make sure that `all:' is the first target.
+    print GM_FILE $output_all;
     print GM_FILE $output_header;
     print GM_FILE $output_rules;
     print GM_FILE $output_trailer;
@@ -3573,9 +3566,7 @@ sub handle_merge_targets
                      . "\n\n");
     push (@phony, 'install', 'uninstall');
 
-    $output_rules .= ('all: '
-                     . join (' ', @all)
-                     . "\n\n");
+    $output_all = 'all: ' . join (' ', @all) . "\n\n";
     push (@phony, 'all');
 
     # Generate the new 'install-strip' target.  Must set
@@ -5458,6 +5449,7 @@ sub initialize_per_input
     $output_rules = '';
     $output_vars = '';
     $output_trailer = '';
+    $output_all = '';
     $output_header = '';
 
     # Suffixes found during a run.

diff --git a/m4/Makefile.in b/m4/Makefile.in
index 73b2d0ac56cad06ea78c64d04c720e90ea469465..3f0f5814479a25167f96d5ac91c20805f7b5eb86 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.2f from Makefile.am
+# Makefile.in generated automatically by automake 1.2g from Makefile.am
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -81,13 +81,13 @@ DIST_COMMON =  Makefile.am Makefile.in
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 GZIP = --best
-default: all
+all: Makefile $(DATA)
 
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
        cd $(top_srcdir) && $(AUTOMAKE) --gnits m4/Makefile
 
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
        cd $(top_builddir) \
          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -146,8 +146,6 @@ install: install-exec install-data all
 
 uninstall: uninstall-m4dataDATA
 
-all: Makefile $(DATA)
-
 install-strip:
        $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
 installdirs:
@@ -179,8 +177,8 @@ maintainer-clean:  maintainer-clean-generic distclean
        @echo "This command is intended for maintainers to use;"
        @echo "it deletes files that may require special tools to rebuild."
 
-.PHONY: default uninstall-m4dataDATA install-m4dataDATA tags distdir \
-info dvi installcheck install-exec install-data install uninstall all \
+.PHONY: uninstall-m4dataDATA install-m4dataDATA tags distdir info dvi \
+installcheck install-exec install-data install uninstall all \
 installdirs mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 66e0dcedcb0ee0249228311f9aba17dd286bbf4a..85c1a3ad91edffaed0ba2f13cf07d58f2fe646c7 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.2f from Makefile.am
+# Makefile.in generated automatically by automake 1.2g from Makefile.am
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -101,13 +101,13 @@ DIST_COMMON =  ChangeLog Makefile.am Makefile.in
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 GZIP = --best
-default: all
+all: Makefile
 
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
        cd $(top_srcdir) && $(AUTOMAKE) --gnits tests/Makefile
 
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
        cd $(top_builddir) \
          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -172,8 +172,6 @@ install: install-exec install-data all
 
 uninstall: 
 
-all: Makefile
-
 install-strip:
        $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
 installdirs:
@@ -204,10 +202,10 @@ maintainer-clean:  maintainer-clean-generic distclean
        @echo "This command is intended for maintainers to use;"
        @echo "it deletes files that may require special tools to rebuild."
 
-.PHONY: default tags distdir check-TESTS info dvi installcheck \
-install-exec install-data install uninstall all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+.PHONY: tags distdir check-TESTS info dvi installcheck install-exec \
+install-data install uninstall all installdirs mostlyclean-generic \
+distclean-generic clean-generic maintainer-clean-generic clean \
+mostlyclean distclean maintainer-clean
 
 
 distclean-local: