diff --git a/config/Makefile b/config/Makefile index 9f24795a0a975acc537d167870e7844b81d49c9d..0dcb2b4124d4dd84428f88d68bffea6661dbcf4f 100644 --- a/config/Makefile +++ b/config/Makefile @@ -14,4 +14,7 @@ binaries:; clean: $(RM) $(GENERIC-CLEAN) +distclean: clean + $(RM) $(GENERIC-DIST-CLEAN) + depend:; diff --git a/config/balance-defs.make b/config/balance-defs.make index d710685ab0be37c9aef4cb53d0b0eee17293c361..3b92c044c4fe038cbf9648ab7c509c5aa26e5916 100644 --- a/config/balance-defs.make +++ b/config/balance-defs.make @@ -1,4 +1,4 @@ -# $Id: balance-defs.make,v 1.3 1991/09/08 21:09:06 ceder Exp $ +# $Id: balance-defs.make,v 1.4 1991/09/13 21:45:23 linus Exp $ # This file is included by all Makefiles in the LysKOM hierarchy. # It gives default values for all variables that is normally used. # TOPDIR and SCRIPTDIR must be set before this file is included. @@ -39,8 +39,9 @@ LYSKOMUSRBIN = /usr/local/bin -GENERIC-CLEAN = *~ *.o lib*.a dependencies core TAGS temp-Makefile \ - temp-?-Makefile Topdir.make +GENERIC-CLEAN = *~ *.o lib*.a core temp-Makefile temp-?-Makefile + +GENERIC-DIST-CLEAN = TAGS Topdir.make dependencies EXPORTS = diff --git a/config/sun4os4-defs.make b/config/sun4os4-defs.make index 915b7cbbdae9a7f51d5faec2afd8f4b13635e399..2c45b430ff60b1d1ebc7817d1c5e6568c3d6ce30 100644 --- a/config/sun4os4-defs.make +++ b/config/sun4os4-defs.make @@ -1,4 +1,4 @@ -# $Id: sun4os4-defs.make,v 1.4 1991/09/13 20:22:19 ceder Exp $ +# $Id: sun4os4-defs.make,v 1.5 1991/09/13 21:45:19 linus Exp $ # This file is included by all Makefiles in the LysKOM hierarchy. # It gives default values for all variables that is normally used. # TOPDIR and SCRIPTDIR must be set before this file is included. @@ -40,8 +40,9 @@ LYSKOMUSRBIN = /usr/local/bin -GENERIC-CLEAN = *~ *.o lib*.a dependencies core TAGS temp-Makefile \ - temp-?-Makefile Topdir.make +GENERIC-CLEAN = *~ *.o lib*.a core temp-Makefile temp-?-Makefile + +GENERIC-DIST-CLEAN = TAGS Topdir.make dependencies EXPORTS = diff --git a/doc/man/Makefile b/doc/man/Makefile index 97c8fe8ab34b14187bada17c9e27d365b6e4cf57..70ed938cbb139eeaa2c063120155d04675a16fca 100644 --- a/doc/man/Makefile +++ b/doc/man/Makefile @@ -17,6 +17,14 @@ clean: (cd man$$i; $(RM) *~ core) } \ done +distclean: clean + $(RM) $(GENERIC-DIST-CLEAN) + -for i in $(MANEXTS); \ + do \ + [ -d man$$i ] && { echo making clean in directory man$$i; \ + (cd man$$i; $(RM) *.ps *.cat *.man *.txt) } \ + done + install: for i in $(MANEXTS); \ do \ diff --git a/scripts/Makefile b/scripts/Makefile index ac6306c77df4217c2593e64889cf66bc1b2ab0cc..89467acad972ff78c8584d28d75da5ca9ae7ac5e 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -13,3 +13,6 @@ binaries:; clean: $(RM) $(GENERIC-CLEAN) + +distclean: clean + $(RM) $(GENERIC-DIST-CLEAN) diff --git a/scripts/sub-clean.make b/scripts/sub-clean.make index facec7de344dd3ac52b1e4996c8f87f50f74fc3d..56aee0371fdbb9beb754d4cac347dd944a89daa1 100644 --- a/scripts/sub-clean.make +++ b/scripts/sub-clean.make @@ -6,3 +6,11 @@ clean: [ -d $$i ] && { echo making clean in directory $$i; \ (cd $$i; $(MAKE) $(EXPORTS) clean) } \ done + +distclean: clean + $(RM) $(GENERIC-DIST-CLEAN) + -for i in $(SUBDIRS); \ + do \ + [ -d $$i ] && { echo making distclean in directory $$i; \ + (cd $$i; $(MAKE) $(EXPORTS) distclean) } \ + done diff --git a/src/include/Makefile b/src/include/Makefile index e762b945a00dbd7ebf2712ce389724414f044725..bf9edbeb2d9ebcb30293306249ebd21dd32607c7 100644 --- a/src/include/Makefile +++ b/src/include/Makefile @@ -35,4 +35,12 @@ clean: (cd $$i; $(MAKE) $(EXPORTS) clean); } \ done -depend:; \ No newline at end of file +distclean: clean + $(RM) $(GENERIC-DIST-CLEAN) + for i in $(SUBDIRS); \ + do \ + [ -d $$i ] && { echo making distclean in directory $$i; \ + (cd $$i; $(MAKE) $(EXPORTS) distclean); } \ + done + +depend:; diff --git a/src/libraries/libansi/Makefile b/src/libraries/libansi/Makefile index 7b6d7c792838126a5ecf71cbf981d5679b7e396b..4e06a59931a6d43cc90be4ee3e4dfeb4ff265905 100644 --- a/src/libraries/libansi/Makefile +++ b/src/libraries/libansi/Makefile @@ -25,6 +25,9 @@ binaries:; clean: $(RM) ${LIBOBJS} $(GENERIC-CLEAN) +distclean: clean + $(RM) $(GENERIC-DIST-CLEAN) + # Recreate the Makefile include $(SCRIPTDIR)/Single-depend.make diff --git a/src/libraries/libcommon/Makefile b/src/libraries/libcommon/Makefile index 9497ddcd11f83c577fd5877ed1510b1b35422639..da160b04d8942cd1913c846f8cddd879b36ddccf 100644 --- a/src/libraries/libcommon/Makefile +++ b/src/libraries/libcommon/Makefile @@ -43,6 +43,9 @@ liblyskom-client.a: client-dir clean: $(RM) $(GENERIC-CLEAN) $(LIBRARIES) + +distclean: clean + $(RM) $(GENERIC-DIST-CLEAN) $(RM) -r client-dir server-dir libraries: includes all diff --git a/src/libraries/libmisc/Makefile b/src/libraries/libmisc/Makefile index 87a7974113b3122851b58796fa85c6f6fee4079a..4df6d7245e0e3fc60acf20615fc3c1897c03ae3d 100644 --- a/src/libraries/libmisc/Makefile +++ b/src/libraries/libmisc/Makefile @@ -33,6 +33,9 @@ testnumlist: testnumlist.o numlist.o clean: $(RM) ${OBJECTS} $(GENERIC-CLEAN) Distfile testnumlist +distclean: clean + $(RM) $(GENERIC-DIST-CLEAN) + # Recreate the Makefile include $(SCRIPTDIR)/Single-depend.make diff --git a/src/server/Makefile b/src/server/Makefile index f3d16e7c0da50e145c1d705d42886a7afe74d8be..112a9f0208c39a179e5810a408fccf7264d314ab 100755 --- a/src/server/Makefile +++ b/src/server/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 0.12 1991/09/08 21:08:47 ceder Exp $ +# $Id: Makefile,v 0.13 1991/09/13 21:45:06 linus Exp $ include Topdir.make SCRIPTDIR = $(TOPDIR)/scripts @@ -114,7 +114,10 @@ install: $(PROGRAMS) # Don't strip ramkomd - we want debugging info! clean: - $(RM) $(GENERIC-CLEAN) $(PROGRAMS) $(SPECIALS) + $(RM) $(GENERIC-CLEAN) $(PROGRAMS) + +distclean: clean + $(RM) $(GENERIC-DIST-CLEAN) $(SPECIALS) specials: $(SPECIALS)