[AD] makefile glitches

[ Thread Index | Date Index | More lists.liballeg.org/allegro-developers Archives ]


The attached patch fixes a couple of makefile glitches:
- make clean removes the documentation, while it ought not according to the 
docs,
- the message displayed at the end of the build is inaccurate.

Commited.

-- 
Eric Botcazou
--- /home/eric/cvs/allegro/makefile.lst	Fri Nov 15 12:09:50 2002
+++ allegro/makefile.lst	Sun Nov 17 14:27:26 2002
@@ -529,10 +529,6 @@
 	obj/*/*.o obj/*/*/*.o obj/*/*/*/*.o obj/*/*.obj obj/*/*/*.obj
 
 OTHER_CLEAN_FILES = \
-	docs/texi/*.texi docs/texi/*.txi docs/*.tex docs/info/*.info \
-	docs/info/*.inf docs/man/*.3 docs/txt/*.txt \
-	docs/html/*.htm* docs/html/*.css docs/chm/*.chm docs/chm/*.hh* \
-	docs/rtf/*.rtf docs/devhelp/*.html docs/devhelp/*.devhelp \
 	obj/*/*.h obj/*/*.s obj/*/*.exe obj/*/*/*.lst obj/*/*/*.asm \
 	obj/*/*.res obj/*/asmdef obj/*/*.inc src/i386/asmdef \
 	lib/*/*.a lib/unix/*.so* lib/unix/sta* \
@@ -543,8 +539,11 @@
 	log */log */*/log core */core */*/core
 
 DISTCLEAN_FILES = \
-	docs/html/*.html docs/html/*.htm docs/rtf/*.rtf docs/makedoc \
-	docs/allegro.dvi docs/allegro.ps* \
+	docs/texi/*.texi docs/texi/*.txi docs/*.tex docs/info/*.info \
+	docs/info/*.inf docs/man/*.3 docs/txt/*.txt \
+	docs/html/*.html docs/html/*.htm docs/html/*.css docs/chm/*.chm docs/chm/*.hh* \
+	docs/rtf/*.rtf docs/devhelp/*.html docs/devhelp/*.devhelp \
+	docs/makedoc docs/allegro.dvi docs/allegro.ps* \
 	$(ALLEGRO_LIB_EXES) $(ALLEGRO_EXAMPLE_EXES) $(ALLEGRO_DATAFILE_EXES) \
 	*.exe */*.exe */*/*.exe msvcmake.bat tests/win/*.scr \
 	config.cache config.log stamp-h stamp-h[0-9]* suid makefile.dep \
--- /cvs/allegro/docs/src/allegro._tx	Sat Nov 16 14:37:52 2002
+++ allegro/docs/src/allegro._tx	Sun Nov 17 14:43:52 2002
@@ -9086,8 +9086,8 @@
 <li>
    'distclean'<br>
    Like "make clean", but more so. This removes all the executable files and 
-   HTML format documentation, leaving you with only the same files that are 
-   included when you unzip a new Allegro distribution.
+   the documentation, leaving you with only the same files that are included
+   when you unzip a new Allegro distribution.
 <li>
    'veryclean'<br>
    Use with extreme caution! This target deletes absolutely all generated 
--- /cvs/allegro/makefile.all	Thu Oct 10 10:11:12 2002
+++ allegro/makefile.all	Sun Nov 17 15:14:10 2002
@@ -131,7 +131,13 @@
 
 default: msg lib $(PROGRAMS) docs
 	@echo The $(DESCRIPTION) $(PLATFORM) library has been compiled.
-	@echo Run make install to complete the installation.
+ifdef UNIX_TOOLS
+	@echo Run \"make install\" with the options you passed to \"make\"
+	@echo in order to complete the installation.
+else
+	@echo Run "make install" with the options you passed to "make"
+	@echo in order to complete the installation.
+endif
 
 all:
 	$(MAKE) msg lib
@@ -140,7 +146,13 @@
 	@echo Compiling utilities, examples and test programs. Please wait...
 	$(MAKE) $(PROGRAMS) docs
 	@echo All $(PLATFORM) library versions have been compiled.
-	@echo Run make installall to complete the installation.
+ifdef UNIX_TOOLS
+	@echo Run \"make installall\" with the options you passed to \"make all\"
+	@echo in order to complete the installation.
+else
+	@echo Run "make installall" with the options you passed to "make all"
+	@echo in order to complete the installation.
+endif
 
 installall:
 	$(MAKE) msg lib install
@@ -153,7 +165,11 @@
 
 docs: $(DOCS)
 	@echo HTML help files have been generated.
-	@echo To generate a .CHM version, run make chm-docs.
+ifdef UNIX_TOOLS
+	@echo To generate a .CHM version, run \"make chm-docs\".
+else
+	@echo To generate a .CHM version, run "make chm-docs".
+endif
 
 lib: $(LIB_NAME)
 


Mail converted by MHonArc 2.6.19+ http://listengine.tuxfamily.org/