Makefile: more cleanup/dist fixes

Even more fixes to the various clean and dist targets, sigh.

Signed-off-by: H. Peter Anvin <[email protected]>

Author: H. Peter Anvin

Makefile.in

@@ -171,9 +171,10 @@ LIBOBJ    = $(LIBOBJ_NW) $(WARNOBJ)
 ALLOBJ_NW = $(PROGOBJ) $(LIBOBJ_NW)
 ALLOBJ    = $(PROGOBJ) $(LIBOBJ)
 
-SUBDIRS  = stdlib nasmlib output asm disasm x86 common macros win
-XSUBDIRS = test doc nsis
-DEPDIRS  = . include config x86 $(SUBDIRS)
+SUBDIRS  = stdlib nasmlib include config output asm disasm x86 \
+	   common macros
+XSUBDIRS = test doc nsis win
+DEPDIRS  = . $(SUBDIRS)
 #-- End File Lists --#
 
 all: dirs
@@ -407,13 +408,7 @@ clean:
 	$(RM_F) nsis/arch.nsh
 	$(RM_F) perlbreq.si
 
-
-cleaner: clean
-	$(RM_F) $(PERLREQ_CL) *.1 nasm.spec
-	$(MAKE) -C doc clean
-	$(RM_F) *.dep */*.time
-
-distclean: clean | cleaner
+distclean: clean
 	for d in . $(SUBDIRS) $(XSUBDIRS); do \
 		$(RM_F) "$$d"/.\# "$$d"/\# "$$d"/*~ "$$d"/*.bak \
 			"$$d"/*.lst "$$d"/*.bin ; \
@@ -422,11 +417,14 @@ distclean: clean | cleaner
 	$(RM_F) *.dep
 	-sh autoconf/clean.sh || sh '$(srcdir)'/autoconf/clean.sh
 
-# This cleans up files generated by autogen.sh
-autoconf-clean: | distclean
-	$(RM_F) configure autoconf/aclocal.m4 autoconf/clean.sh
+cleaner:
+	$(RM_F) $(PERLREQ_CL) *.1 nasm.spec
+	$(MAKE) -C doc clean
+	$(MAKE) distclean
+	$(RM_F) */*.time
 
-spotless: cleaner distclean autoconf-clean
+spotless: cleaner
+	$(RM_F) configure autoconf/aclocal.m4 autoconf/clean.sh
 
 strip:
 	$(STRIP) --strip-unneeded $(PROGS)
@@ -463,7 +461,7 @@ install_everything: everything install install_doc
 
 dist:
 	$(MAKE) alldeps
-	$(MAKE) perlreq manpages spec $(MANPAGES)
+	$(MAKE) perlreq warnings spec $(MANPAGES)
 	$(MAKE) distclean
 	./autogen.sh
 

Mkfiles/msvc.mak

@@ -127,9 +127,10 @@ LIBOBJ    = $(LIBOBJ_NW) $(WARNOBJ)
 ALLOBJ_NW = $(PROGOBJ) $(LIBOBJ_NW)
 ALLOBJ    = $(PROGOBJ) $(LIBOBJ)
 
-SUBDIRS  = stdlib nasmlib output asm disasm x86 common macros win
-XSUBDIRS = test doc nsis
-DEPDIRS  = . include config x86 $(SUBDIRS)
+SUBDIRS  = stdlib nasmlib include config output asm disasm x86 \
+	   common macros
+XSUBDIRS = test doc nsis win
+DEPDIRS  = . $(SUBDIRS)
 #-- End File Lists --#
 
 NASMLIB = libnasm.$(A)

Mkfiles/openwcom.mak

@@ -115,9 +115,10 @@ LIBOBJ    = $(LIBOBJ_NW) $(WARNOBJ)
 ALLOBJ_NW = $(PROGOBJ) $(LIBOBJ_NW)
 ALLOBJ    = $(PROGOBJ) $(LIBOBJ)
 
-SUBDIRS  = stdlib nasmlib output asm disasm x86 common macros win
-XSUBDIRS = test doc nsis
-DEPDIRS  = . include config x86 $(SUBDIRS)
+SUBDIRS  = stdlib nasmlib include config output asm disasm x86 &
+	   common macros
+XSUBDIRS = test doc nsis win
+DEPDIRS  = . $(SUBDIRS)
 #-- End File Lists --#
 
 what:   .SYMBOLIC