Merge tag 'upstream/24.1'

[rrq/maintain_lilo.git] / Makefile

diff --git a/Makefile b/Makefile
index e16f6bb3e1c6a5898cb8140eb62d50c438eb5cb9..c7f931c934cf4e7aba5f181a0f7f49d2fe4bd4bb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,19 @@
 # -*- makefile -*-
 #
-# Copyright 2009-2011 Joachim Wiedorn
+# Copyright 2009-2014 Joachim Wiedorn
 # All rights reserved.
 # 
 # Licensed under the terms contained in the file 'COPYING'
 # in the source directory.
 #
 
+#
+# everything needed to run, just short of installation
+#
+all: test
+       make -C src all
+       make -C images all
+
 #
 #  make help
 #
@@ -17,7 +24,7 @@ help:
        @echo "  make dosexe      # DOS lilo.com utility"
        @echo "  make diagnostic  # standalone diagnostics"
        @echo "  make alles       # all above + static binary"
-       @echo "  make docs        # doc/[user,tech].[pdf,dvi] docs"
+       @echo "  make docs        # doc/[user,tech].html docs"
        @echo "  make floppy      # 2 standalone bootable diagnostic floppies"
        @echo ""
        @echo "  make install     # install binaries++ into root directory"
@@ -33,13 +40,6 @@ help:
        @echo "  make distclean   # remove editor temps, & all of the above"
        @echo ""
 
-#
-# everything needed to run, just short of installation
-#
-all: test
-       $(MAKE) -C src all
-       $(MAKE) -C images all
-
 #
 # everything above plus the statically linked version
 #
@@ -51,7 +51,6 @@ alles: test
 # documentation files
 #
 docs:
-       $(MAKE) -C doc all
 
 #
 # if you have the 'bcc' compiler, then you can make the diagnostics, too
@@ -116,7 +115,6 @@ tidy:
        $(MAKE) -C src tidy
        $(MAKE) -C diagnose tidy
        $(MAKE) -C dos tidy
-       $(MAKE) -C doc tidy
 
 clean: tidy
        rm -f test.img
@@ -124,7 +122,6 @@ clean: tidy
        $(MAKE) -C images clean
        $(MAKE) -C diagnose clean
        $(MAKE) -C dos clean
-       $(MAKE) -C doc clean
 
 spotless: distclean
 distclean: clean