diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | Makerules | 5 |
3 files changed, 15 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 29a2c500f0..e94f763a4e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +1998-03-30 13:28 Ulrich Drepper <drepper@cygnus.com> + + * Makefile (parent-mostlyclean): Use object-suffixes-for-libc for + determining libs to remove. + (postclean): Add soversions.mk. + * Makerules (common-mostlyclean): Add tests-static and generated + files. + 1998-03-30 12:53 Ulrich Drepper <drepper@cygnus.com> * sysdeps/i386/i486/bits/string.h (__strcat_c) [__i686__]: Correct diff --git a/Makefile b/Makefile index 813ffc4ef0..83b167846a 100644 --- a/Makefile +++ b/Makefile @@ -261,13 +261,14 @@ $(all-subdirs-targets): # Subroutines of all cleaning targets. parent-mostlyclean: common-mostlyclean # common-mostlyclean is in Makerules. - -rm -f $(foreach o,$(object-suffixes),\ + -rm -f $(foreach o,$(object-suffixes-for-libc),\ $(common-objpfx)$(patsubst %,$(libtype$o),c)) \ $(addprefix $(objpfx),$(install-lib)) parent-clean: parent-mostlyclean common-clean postclean = $(addprefix $(common-objpfx),$(postclean-generated)) \ - $(addprefix $(objpfx),sysd-Makefile sysd-dirs sysd-rules) + $(addprefix $(objpfx),sysd-Makefile sysd-dirs sysd-rules) \ + $(objpfx)soversions.mk clean: parent-clean # This is done this way rather than having `subdir_clean' be a diff --git a/Makerules b/Makerules index 3a34da4150..359f6d1cc6 100644 --- a/Makerules +++ b/Makerules @@ -935,9 +935,12 @@ mostlyclean: common-mostlyclean # Remove the object files. common-mostlyclean: -rm -f $(addprefix $(objpfx),$(tests) $(test-srcs) $(others) \ + $(tests-static) \ $(addsuffix .o,$(tests) $(test-srcs) \ + $(tests-static) \ $(others)) \ - $(addsuffix .out,$(tests) $(test-srcs))) + $(addsuffix .out,$(tests) $(test-srcs)) \ + $(addsuffix .sout,$(tests-static))) -rm -f $(addprefix $(objpfx),$(extra-objs) $(install-lib) \ $(install-lib.so) \ $(install-lib.so:%.so=%_pic.a)) |