Fix rules to allow for local cleanup in sub-directories

Author: th-otto

Makefile

@@ -75,9 +75,11 @@ install-headers: install-include-recursive
 
 install-man: all install-man-recursive
 
-clean: clean-recursive
+clean:: clean-recursive
 	rm -rf .deps includepath CFILES
 
+distclean:: distclean-recursive
+
 bakclean: bakclean-recursive
 
 checkclean: checkclean-recursive
@@ -155,7 +157,7 @@ bindistdir: $(BINDISTFILES)
 	    || exit 1; \
 	done
 
-all-recursive clean-recursive bakclean-recursive \
+all-recursive clean-recursive distclean-recursive bakclean-recursive \
 install-recursive uninstall-recursive install-lib-recursive \
 install-include-recursive install-man-recursive uninstall-lib-recursive \
 uninstall-include-recursive uninstall-man-recursive:

rules

@@ -4,9 +4,6 @@ include $(srcdir)/BINFILES
 include $(srcdir)/SRCFILES
 include $(srcdir)/EXTRAFILES
 include $(srcdir)/MISCFILES
--include $(srcdir)/RPCSVCCFILES
--include $(srcdir)/RPCGENCFILES
--include $(srcdir)/RPCINFOCFILES
 
 mkinstalldirs = $(top_srcdir)/mkinstalldirs
 MOVEIFCHANGE = $(top_srcdir)/move-if-change
@@ -17,11 +14,13 @@ bakclean:
 	rm -f *~ *# *.BAK *.bak
 	rm -f *.orig *.rej
 
-clean:
+clean::
 	rm -f *.o lib*.a *.tmp
 	rm -f core report nohup.out errlog
 	rm -rf .deps 
 
+distclean:: clean
+
 install: all-here install-include install-lib install-man \
 install-recursive
 

sunrpc/Makefile

@@ -34,6 +34,9 @@ endif
 
 dont_install_libs = yes
 include $(top_srcdir)/rules $(top_srcdir)/phony
+include $(srcdir)/RPCSVCCFILES
+include $(srcdir)/RPCGENCFILES
+include $(srcdir)/RPCINFOCFILES
 
 # FIXME: Tests still missing.
 TESTS = dummy

syscall/Makefile

@@ -37,7 +37,11 @@ include $(top_srcdir)/checkrules
 cflags = -O -Wall
 type = 
 
-# FIXME: adjust rules in toplevel to cleanup .stmp.pars, syscalls.stmp and other generated files
+distclean::
+	$(RM) SRCFILES.traps syscalls.stmp .stmp.pars pars.c pars.h scan.c
+
+clean::
+	$(RM) gen-syscall
 
 syscalls.stmp: gen-syscall0 syscalls.master
 	echo "TRAPS=" > SRCFILES.traps