From: borutr Date: Thu, 27 Jul 2006 17:32:43 +0000 (+0000) Subject: * device/lib/pic16/Makefile.in, device/lib/pic16/Makefile.subdir, X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=854dfe4e06cc12b924720f74273ca73142192f71;p=fw%2Fsdcc * device/lib/pic16/Makefile.in, device/lib/pic16/Makefile.subdir, device/lib/pic16/libio/Makefile.in: fixed bug [ 1438344 ] pic16 lib: clean doesn't work properly * doc/knownbugs.html removed [ 1438354 ] and [ 1438344 ] from the list git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@4306 4a8a32a2-be11-0410-ad9d-d568d2c75423 --- diff --git a/ChangeLog b/ChangeLog index 32491729..5601da47 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,10 @@ * device/lib/pic/Makefile.in, device/lib/pic/Makefile.subdir, device/lib/pic/libdev/Makefile.in: fixed bug [ 1438354 ] pic libsdcc: distclean doesn't work + * device/lib/pic16/Makefile.in, device/lib/pic16/Makefile.subdir, + device/lib/pic16/libio/Makefile.in: fixed bug + [ 1438344 ] pic16 lib: clean doesn't work properly + * doc/knownbugs.html removed [ 1438354 ] and [ 1438344 ] from the list 2006-07-26 Maarten Brock diff --git a/device/lib/pic16/Makefile.in b/device/lib/pic16/Makefile.in index 2cff4f49..865e065b 100644 --- a/device/lib/pic16/Makefile.in +++ b/device/lib/pic16/Makefile.in @@ -53,7 +53,9 @@ clean : recurse $(Q)-$(RMDIR) "$(top_pic16builddir)/$(builddir)" distclean: clean - $(RM) -f Makefile + $(Q)-$(RM) config.cache config.log config.status Makefile Makefile.common pics.build + $(Q)find $(SUBDIRS) -name Makefile -delete + $(Q)-[ ! -d bin ] || $(RMDIR) bin clean-intermediate : recurse diff --git a/device/lib/pic16/Makefile.subdir b/device/lib/pic16/Makefile.subdir index 5e318d1b..a941e982 100644 --- a/device/lib/pic16/Makefile.subdir +++ b/device/lib/pic16/Makefile.subdir @@ -66,6 +66,8 @@ clean : recurse $(Q)-$(RM) .dummy $(addprefix $(top_builddir)$(installdir)/,$(notdir $(TARGETS))) $(Q)-[ ! -d "$(top_builddir)$(builddir)" ] || $(RMDIR) "$(top_builddir)$(builddir)" +distclean : clean + clean-intermediate : recurse @-echo "dummy" > .dummy $(Q)-$(RM) .dummy $(foreach suf,p lst hex cod sym,$(OBJS:.o=.$(suf))) diff --git a/device/lib/pic16/libio/Makefile.in b/device/lib/pic16/libio/Makefile.in index 262da882..c3ac37fe 100644 --- a/device/lib/pic16/libio/Makefile.in +++ b/device/lib/pic16/libio/Makefile.in @@ -31,7 +31,14 @@ include $(top_builddir)Makefile.common # I create $(builddir)/$${arch} right here in order to prevent # the sub-make's `builddir´ rules from aborting if another sub-make # already created the above directory (happened on Alpha). -all clean clean-intermediate install : +all clean-intermediate install : libio-recurse + +clean : libio-recurse + $(Q)-[ ! -d "$(top_builddir)$(builddir)" ] || $(RMDIR) "$(top_builddir)$(builddir)" + +distclean : clean + +libio-recurse : $(Q)+cat $(top_builddir)pics.build \ | $(SED) -e "s,[ \t]*#.*$$,," \ | $(GREP) -v "^[ \t]*$$" \ diff --git a/doc/knownbugs.html b/doc/knownbugs.html index a99e4afa..995ac5ea 100644 --- a/doc/knownbugs.html +++ b/doc/knownbugs.html @@ -799,48 +799,6 @@ tecodev borutr - - - 1438354 - - - - pic libsdcc: distclean doesn't work - - - -   - 2006-02-24 13:16 - - - 5 - - - - nobody - bernhardheld - - - - 1438344 - - - - pic16 lib: clean doesn't work properly - - - -   - 2006-02-24 12:51 - - - 5 - - - - nobody - bernhardheld - 1433917