Revision: 2588
http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2588
Author: blusseau
Date: 2009-09-12 07:38:50 +0000 (Sat, 12 Sep 2009)
Log Message:
-----------
2009-09-12 Yves Blusseau <[email protected]>
Change clean rules to properly remove files
* genmk.rb: add new clean rules
* Makefile.in (clean): add the new targets
(mostlyclean): likewise
Modified Paths:
--------------
trunk/grub2/ChangeLog
trunk/grub2/Makefile.in
trunk/grub2/genmk.rb
Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog 2009-09-11 14:26:12 UTC (rev 2587)
+++ trunk/grub2/ChangeLog 2009-09-12 07:38:50 UTC (rev 2588)
@@ -1,3 +1,11 @@
+2009-09-12 Yves Blusseau <[email protected]>
+
+ Change clean rules to properly remove files
+
+ * genmk.rb: add new clean rules
+ * Makefile.in (clean): add the new targets
+ (mostlyclean): likewise
+
2009-09-11 Colin Watson <[email protected]>
* include/grub/ntfs.h (struct grub_fshelp_node): Change `size'
Modified: trunk/grub2/Makefile.in
===================================================================
--- trunk/grub2/Makefile.in 2009-09-11 14:26:12 UTC (rev 2587)
+++ trunk/grub2/Makefile.in 2009-09-12 07:38:50 UTC (rev 2588)
@@ -326,10 +326,10 @@
rm -f $(DESTDIR)$(libdir)/grub/$$dest; \
done
-clean:
+clean: $(CLEAN_IMAGE_TARGETS) $(CLEAN_MODULE_TARGETS) $(CLEAN_UTILITY_TARGETS)
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-mostlyclean: clean
+mostlyclean: clean $(MOSTLYCLEAN_IMAGE_TARGETS) $(MOSTLYCLEAN_MODULE_TARGETS)
$(MOSTLYCLEAN_UTILITY_TARGETS)
-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
distclean: mostlyclean
Modified: trunk/grub2/genmk.rb
===================================================================
--- trunk/grub2/genmk.rb 2009-09-11 14:26:12 UTC (rev 2587)
+++ trunk/grub2/genmk.rb 2009-09-12 07:38:50 UTC (rev 2588)
@@ -39,11 +39,13 @@
def initialize(dir, name)
@dir = dir
@name = name
+ @rule_count = 0
end
attr_reader :dir, :name
def rule(sources)
prefix = @name.to_var
+ @rule_count += 1
exe = @name.suffix('exec')
objs = sources.collect do |src|
raise "unknown source file `#{src}'" if /\.[cS]$/ !~ src
@@ -53,9 +55,17 @@
deps = objs.collect {|obj| obj.suffix('d')}
deps_str = deps.join(' ')
- "CLEANFILES += #...@name} #{exe} #{objs_str}
-MOSTLYCLEANFILES += #{deps_str}
+"
+clean-image...@name}.#{@rule_count}:
+ rm -f #...@name} #{exe} #{objs_str}
+CLEAN_IMAGE_TARGETS += clean-image...@name}.#{@rule_count}
+
+mostlyclean-image...@name}.#{@rule_count}:
+ rm -f #{deps_str}
+
+MOSTLYCLEAN_IMAGE_TARGETS += mostlyclean-image...@name}.#{@rule_count}
+
ifneq ($(TARGET_APPLE_CC),1)
#...@name}: #{exe}
$(OBJCOPY) -O $(#{prefix}_FORMAT) --strip-unneeded -R .note -R .comment
-R .note.gnu.build-id $< $@
@@ -94,11 +104,13 @@
def initialize(dir, name)
@dir = dir
@name = name
+ @rule_count = 0
end
attr_reader :dir, :name
def rule(sources)
prefix = @name.to_var
+ @rule_count += 1
objs = sources.collect do |src|
raise "unknown source file `#{src}'" if /\.[cS]$/ !~ src
prefix + '-' + src.to_obj
@@ -114,12 +126,23 @@
mod_name = File.basename(@name, '.mod')
symbolic_name = mod_name.sub(/\.[^\.]*$/, '')
- "CLEANFILES += #...@name} #{mod_obj} #{mod_src} #{pre_obj} #{objs_str}
#{undsym}
+"
+clean-module...@name}.#{@rule_count}:
+ rm -f #...@name} #{mod_obj} #{mod_src} #{pre_obj} #{objs_str} #{undsym}
+
+CLEAN_MODULE_TARGETS += clean-module...@name}.#{@rule_count}
+
ifneq ($(#{prefix}_EXPORTS),no)
-CLEANFILES += #{defsym}
+clean-module...@name}-symbol.#{@rule_count}:
+ rm -f #{defsym}
+
+CLEAN_MODULE_TARGETS += clean-module...@name}-symbol.#{@rule_count}
DEFSYMFILES += #{defsym}
endif
-MOSTLYCLEANFILES += #{deps_str}
+mostlyclean-module...@name}.#{@rule_count}:
+ rm -f #{deps_str}
+
+MOSTLYCLEAN_MODULE_TARGETS += mostlyclean-module...@name}.#{@rule_count}
UNDSYMFILES += #{undsym}
ifneq ($(TARGET_APPLE_CC),1)
@@ -164,6 +187,7 @@
" + objs.collect_with_index do |obj, i|
src = sources[i]
fake_obj = File.basename(src).suffix('o')
+ extra_target = obj.sub(/\.[^\.]*$/, '') + '-extra'
command = 'cmd-' + obj.suffix('lst')
fs = 'fs-' + obj.suffix('lst')
partmap = 'partmap-' + obj.suffix('lst')
@@ -178,7 +202,11 @@
$(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS)
#{extra_flags} $(TARGET_#{flag}) $(#{prefix}_#{flag}) -MD -c -o $@ $<
-include #{dep}
-CLEANFILES += #{command} #{fs} #{partmap} #{handler} #{parttool}
+clean-module-#{extra_target}...@rule_count}:
+ rm -f #{command} #{fs} #{partmap} #{handler} #{parttool}
+
+CLEAN_MODULE_TARGETS += clean-module-#{extra_target}...@rule_count}
+
COMMANDFILES += #{command}
FSFILES += #{fs}
PARTTOOLFILES += #{parttool}
@@ -219,6 +247,7 @@
def initialize(dir, name)
@dir = dir
@name = name
+ @rule_count = 0
end
def print_tail()
prefix = @name.to_var
@@ -231,6 +260,7 @@
def rule(sources)
prefix = @name.to_var
+ @rule_count += 1
objs = sources.collect do |src|
raise "unknown source file `#{src}'" if /\.[cS]$/ !~ src
prefix + '-' + src.to_obj
@@ -239,8 +269,17 @@
deps = objs.collect {|obj| obj.suffix('d')}
deps_str = deps.join(' ');
- "CLEANFILES += #...@name}$(EXEEXT) #{objs_str}
-MOSTLYCLEANFILES += #{deps_str}
+ "
+clean-utility...@name}.#{@rule_count}:
+ rm -f #...@name}$(EXEEXT) #{objs_str}
+
+CLEAN_UTILITY_TARGETS += clean-utility...@name}.#{@rule_count}
+
+mostlyclean-utility...@name}.#{@rule_count}:
+ rm -f #{deps_str}
+
+MOSTLYCLEAN_UTILITY_TARGETS += mostlyclean-utility...@name}.#{@rule_count}
+
#{prefix}_OBJECTS += #{objs_str}
" + objs.collect_with_index do |obj, i|
