[PATCH] Distributed clean

mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed

* [PATCH] Distributed clean
@ 2002-10-10 19:34 Sam Ravnborg
  2002-10-10 19:51 ` kbuild: Distributed clean infrastructure Sam Ravnborg
                   ` (4 more replies)
  0 siblings, 5 replies; 6+ messages in thread
From: Sam Ravnborg @ 2002-10-10 19:34 UTC (permalink / raw)
  To: Linus Torvalds, linux-kernel; +Cc: Kai Germaschewski

Here is a set of patches to implement distributed clean.
A cleanup of Documentation/DocBook is included as well.

See diffstat and changeset descriptions below.
Can be pulled from http://linux-sam.bkbits.net/kbuild2
Regular patches will follow this one.

The whole purpose with this is to move out the centralised list
of files that today is present in the top-level makefile
to the individual makefile where they originally are created.

During a make clean, all makefile are traversed recursively,
and for each makfile all files listed with
clean-files := file file
are deleted.
Furthermore all *.oas, .*.tmp .*.d files are deleted in all
directories looked into.

The list of directories are build upon the normal obj-$(CONFIG_XX)
rules, with the addition of empty "obj-" and negative "obj-n" directories
are searched as well.

The first patch implements the infrastructure only, and therefore Rules.make
is touched.
The subsequent patches introduce the usage in the kernel tree, and the
net result is that CLEAN_FILES is down to one line, and MRPROPER_FILES
is several lines shorter.

The only new behaviour introduced are that firmware files are now deleted
during make clean, as any other generated files.

Based on a concept originally by Kai Germaschewski.

Please apply,

	Sam

 Documentation/DocBook/Makefile           |   52 ++++++++++++-------------------
 Makefile                                 |   40 +----------------------
 drivers/atm/Makefile                     |    6 ++-
 drivers/char/Makefile                    |    3 +
 drivers/net/hamradio/soundmodem/Makefile |    6 +++
 drivers/pci/Makefile                     |    3 +
 drivers/scsi/Makefile                    |    6 ++-
 drivers/scsi/aic7xxx/Makefile            |   14 ++++++--
 drivers/scsi/aic7xxx/aicasm/Makefile     |    2 -
 drivers/video/Makefile                   |    3 +
 drivers/zorro/Makefile                   |    3 +
 init/Makefile                            |   10 ++++-
 sound/oss/Makefile                       |    4 ++
 13 files changed, 74 insertions(+), 78 deletions(-)

ChangeSet@1.748.1.1, 2002-10-10 20:24:45+02:00, sam@mars.ravnborg.org
  kbuild: Distributed clean infrastructure

  Today there is a huge list of files in the top-level Makefile that is
  deleted during make clean and make mrproper.
  This patch add infrastructure to get rid of this centralised list.

  Within a makefile simply use:
  clean-files := files-to-be-deleted
  or eventually
  clean-rule := command to be executed to delete files

  Files specified by host-progs and EXTRA_TARGETS are deleted during cleaning,
  and the same is all *.[oas] .*.cmd .*.tmp .*.d in the visited directories.

  Deleting core files is moved down to mrporper time

  Patches utilising this and the centralised list will dismiss.

  Based on a concept originally made by Kai Germaschewski

ChangeSet@1.748.1.2, 2002-10-10 20:44:28+02:00, sam@mars.ravnborg.org
  scsi+aic7xxx: Utilise distributed clean
  List files to be deleted during make clean where they are created

ChangeSet@1.748.1.3, 2002-10-10 20:50:19+02:00, sam@mars.ravnborg.org
  drivers/{atm,char,pci,video,zorro}: ditributed clean
  Move list of files to be deleted during make clean out where
  they are made. host-progs files taken care of automagically

ChangeSet@1.748.1.4, 2002-10-10 20:52:41+02:00, sam@mars.ravnborg.org
  drivers/net/hamradio/soundmodem: distributed clean
  Move list of files out where it belongs

ChangeSet@1.748.1.5, 2002-10-10 20:57:03+02:00, sam@mars.ravnborg.org
  kbuild: Distributed clean, misc.
  o Move sound/oss file list to sound/oss/Makefile
  o Remove files non-existing in the tree (khttp,net/802/submenu)
  o scripts/* are handled by scripts makefile
  o Do not delete .config*, be more explicit
  o Add MC* - files generated by Menuconfig in toplevel dir

ChangeSet@1.748.1.6, 2002-10-10 21:04:21+02:00, sam@mars.ravnborg.org
  docbook: Makefile cleanup
  o Removed special rules for JBD, covered by the general mechanishm
  o Use $(obj)/ instead of Documentation/DocBook
  o Introduced usage of Distributed clean
  o No longer delete *~ files in top-level directory during clean

^ permalink raw reply	[flat|nested] 6+ messages in thread

* kbuild: Distributed clean infrastructure
  2002-10-10 19:34 [PATCH] Distributed clean Sam Ravnborg
@ 2002-10-10 19:51 ` Sam Ravnborg
  2002-10-10 19:52 ` scsi+aic7xxx: Utilise distributed clean Sam Ravnborg
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: Sam Ravnborg @ 2002-10-10 19:51 UTC (permalink / raw)
  To: linux-kernel

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.748   -> 1.748.1.1
#	            Makefile	1.318   -> 1.319  
#	          Rules.make	1.81    -> 1.82   
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/10/10	sam@mars.ravnborg.org	1.748.1.1
# kbuild: Distributed clean infrastructure
#   
# Today there is a huge list of files in the top-level Makefile that is
# deleted during make clean and make mrproper.
# This patch add infrastructure to get rid of this centralised list.
# 
# Within a makefile simply use:
# clean-files := files-to-be-deleted
# or eventually
# clean-rule := command to be executed to delete files
#   
# Files specified by host-progs and EXTRA_TARGETS are deleted during cleaning,
# and the same is all *.[oas] .*.cmd .*.tmp .*.d in the visited directories.
#   
# Deleting core files is moved down to mrporper time
# 
# Patches utilising this and the centralised list will dismiss.
# 
# Based on a concept originally made by Kai Germaschewski
# --------------------------------------------
#
diff -Nru a/Makefile b/Makefile
--- a/Makefile	Thu Oct 10 21:50:03 2002
+++ b/Makefile	Thu Oct 10 21:50:03 2002
@@ -661,10 +661,15 @@
 defconfig:
 	yes '' | $(CONFIG_SHELL) $(src)/scripts/Configure -d arch/$(ARCH)/config.in
 
-# Cleaning up
-# ---------------------------------------------------------------------------
+###
+# Cleaning is done on three levels.
+# make clean     Delete all automatically generated files, including
+#                tools and firmware.
+# make mrproper  Delete the current configuration, and related files
+#                Any core files spread around is deleted as well
+# make distclean Remove editor backup files, patch leftover files and the like
 
-#	files removed with 'make clean'
+# Files removed with 'make clean'
 CLEAN_FILES += \
 	include/linux/compile.h \
 	vmlinux System.map \
@@ -690,7 +695,7 @@
 	net/khttpd/make_times_h net/khttpd/times.h \
 	submenu*
 
-# 	files removed with 'make mrproper'
+# Files removed with 'make mrproper'
 MRPROPER_FILES += \
 	include/linux/autoconf.h include/linux/version.h \
 	drivers/net/hamradio/soundmodem/sm_tbl_{afsk1200,afsk2666,fsk9600}.h \
@@ -712,33 +717,43 @@
 	tags TAGS kernel.spec \
 	.tmp*
 
-# 	directories removed with 'make mrproper'
+# Directories removed with 'make mrproper'
 MRPROPER_DIRS += \
 	.tmp_export-objs \
 	include/config \
 	include/linux/modules
 
-clean:	archclean
-	@echo 'Cleaning up'
-	@find . $(RCS_FIND_IGNORE) \
-		\( -name \*.[oas] -o -name core -o -name .\*.cmd -o \
-		-name .\*.tmp -o -name .\*.d \) -type f -print \
-		| grep -v lxdialog/ | xargs rm -f
-	@rm -f $(CLEAN_FILES)
-	+@$(call descend,Documentation/DocBook,clean)
-
+# clean - Delete all intermidiate files
+#
+clean-dirs += $(ALL_SUBDIRS) Documentation/DocBook
+cleanprint:
+	@echo '  Cleaning the srctree'
+
+$(addprefix _clean_,$(clean-dirs)): cleanprint
+	+@$(call descend,$(patsubst _clean_%,%,$@), subdirclean)
+
+quiet_cmd_rmclean = RM  $$(CLEAN_FILES)
+cmd_rmclean	  = rm -f $(CLEAN_FILES)
+clean: archclean $(addprefix _clean_,$(clean-dirs))
+	$(call cmd,rmclean)
+
+# mrproper - delete configuration + modules + core files
+#
+quiet_cmd_mrproper = RM  $$(MRPROPER_DIRS) + $$(MRPROPER_FILES)
+cmd_mrproper = rm -rf $(MRPROPER_DIRS) && rm -f $(MRPROPER_FILES)
 mrproper: clean archmrproper
-	@echo 'Making mrproper'
+	@echo '  Making mrproper in the srctree'
 	@find . $(RCS_FIND_IGNORE) \
-		\( -name .depend -o -name .\*.cmd \) \
+		\( -name .depend -o -name .\*.cmd -o -name core \) \
 		-type f -print | xargs rm -f
-	@rm -rf $(MRPROPER_DIRS)
-	@rm -f $(MRPROPER_FILES)
+	$(call cmd,mrproper)
 	+@$(call descend,scripts,mrproper)
 	+@$(call descend,Documentation/DocBook,mrproper)
 
+# distclean - remove all temporaries left behind by patch, vi, emacs etc.
+#
 distclean: mrproper
-	@echo 'Making distclean'
+	@echo '  Making distclean in the srctree'
 	@find . $(RCS_FIND_IGNORE) \
 		\( -not -type d \) -and \
 	 	\( -name '*.orig' -o -name '*.rej' -o -name '*~' \
diff -Nru a/Rules.make b/Rules.make
--- a/Rules.make	Thu Oct 10 21:50:03 2002
+++ b/Rules.make	Thu Oct 10 21:50:03 2002
@@ -87,6 +87,7 @@
 # Subdirectories we need to descend into
 
 subdir-ym	:= $(sort $(subdir-y) $(subdir-m))
+subdir-ymn      := $(sort $(subdir-ym) $(subdir-n) $(subdir-))
 
 # export.o is never a composite object, since $(export-objs) has a
 # fixed meaning (== objects which EXPORT_SYMBOL())
@@ -113,6 +114,10 @@
 # Only build module versions for files which are selected to be built
 export-objs := $(filter $(export-objs),$(real-objs-y) $(real-objs-m))
 
+host-progs-single     := $(foreach m,$(host-progs),$(if $($(m)-objs),,$(m)))
+host-progs-multi      := $(foreach m,$(host-progs),$(if $($(m)-objs),$(m)))
+host-progs-multi-objs := $(foreach m,$(host-progs-multi),$($(m)-objs))
+
 # Add subdir path
 
 EXTRA_TARGETS	:= $(addprefix $(obj)/,$(EXTRA_TARGETS))
@@ -127,12 +132,19 @@
 multi-objs-y	:= $(addprefix $(obj)/,$(multi-objs-y))
 multi-objs-m	:= $(addprefix $(obj)/,$(multi-objs-m))
 subdir-ym	:= $(addprefix $(obj)/,$(subdir-ym))
+subdir-ymn	:= $(addprefix $(obj)/,$(subdir-ymn))
+clean-files	:= $(addprefix $(obj)/,$(clean-files))
+host-progs	:= $(addprefix $(obj)/,$(host-progs))
+host-progs-single     := $(addprefix $(obj)/,$(host-progs-single))
+host-progs-multi      := $(addprefix $(obj)/,$(host-progs-multi))
+host-progs-multi-objs := $(addprefix $(obj)/,$(host-progs-multi-objs))
 
 # The temporary file to save gcc -MD generated dependencies must not
 # contain a comma
 depfile = $(subst $(comma),_,$(@D)/.$(@F).d)
 
-# We're called for one of three purposes:
+# We're called for one of four purposes:
+# o subdirclean: Delete intermidiate files in the current directory
 # o fastdep: build module version files (.ver) for $(export-objs) in
 #   the current directory
 # o modules_install: install the modules in the current directory
@@ -142,6 +154,13 @@
 #   When targets are given directly (like foo.o), we just build these
 #   targets (That happens when someone does make some/dir/foo.[ois])
 
+ifeq ($(MAKECMDGOALS),subdirclean)
+subdirclean: $(subdir-ymn)
+	@/bin/true
+	@rm -f $(EXTRA_TARGETS) $(host-progs) $(clean-files) \
+        $(addprefix $(obj)/,*.[oas] .*.cmd .*.tmp .*.d)
+	@$(clean-rule)
+else
 ifeq ($(MAKECMDGOALS),fastdep)
 
 # ===========================================================================
@@ -399,14 +418,6 @@
 # Compile programs on the host
 # ===========================================================================
 
-host-progs-single     := $(foreach m,$(host-progs),$(if $($(m)-objs),,$(m)))
-host-progs-multi      := $(foreach m,$(host-progs),$(if $($(m)-objs),$(m)))
-host-progs-multi-objs := $(foreach m,$(host-progs-multi),$($(m)-objs))
-host-progs	      := $(addprefix $(obj)/,$(host-progs))
-host-progs-single     := $(addprefix $(obj)/,$(host-progs-single))
-host-progs-multi      := $(addprefix $(obj)/,$(host-progs-multi))
-host-progs-multi-objs := $(addprefix $(obj)/,$(host-progs-multi-objs))
-
 quiet_cmd_host_cc__c  = HOSTCC  $(echo_target)
 cmd_host_cc__c        = $(HOSTCC) -Wp,-MD,$(depfile) \
 			$(HOSTCFLAGS) $(HOST_EXTRACFLAGS) \
@@ -431,6 +442,7 @@
 
 targets += $(host-progs-single) $(host-progs-multi-objs) $(host-progs-multi) 
 
+endif # ! subdirclean
 endif # ! modules_install
 endif # ! fastdep
 
@@ -480,9 +492,9 @@
 # Descending
 # ---------------------------------------------------------------------------
 
-.PHONY: $(subdir-ym)
+.PHONY: $(subdir-ymn)
 
-$(subdir-ym):
+$(subdir-ymn):
 	+@$(call descend,$@,$(MAKECMDGOALS))
 
 # Add FORCE to the prequisites of a target to force it to be always rebuilt.

^ permalink raw reply	[flat|nested] 6+ messages in thread

* scsi+aic7xxx: Utilise distributed clean
  2002-10-10 19:34 [PATCH] Distributed clean Sam Ravnborg
  2002-10-10 19:51 ` kbuild: Distributed clean infrastructure Sam Ravnborg
@ 2002-10-10 19:52 ` Sam Ravnborg
  2002-10-10 19:52 ` drivers/{atm,char,pci,video,zorro}: ditributed clean Sam Ravnborg
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: Sam Ravnborg @ 2002-10-10 19:52 UTC (permalink / raw)
  To: linux-kernel

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.748.1.1 -> 1.748.1.2
#	            Makefile	1.319   -> 1.320  
#	drivers/scsi/Makefile	1.26    -> 1.27   
#	drivers/scsi/aic7xxx/aicasm/Makefile	1.4     -> 1.5    
#	drivers/scsi/aic7xxx/Makefile	1.12    -> 1.13   
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/10/10	sam@mars.ravnborg.org	1.748.1.2
# scsi+aic7xxx: Utilise distributed clean
# List files to be deleted during make clean where they are created
# --------------------------------------------
#
diff -Nru a/Makefile b/Makefile
--- a/Makefile	Thu Oct 10 21:22:19 2002
+++ b/Makefile	Thu Oct 10 21:22:19 2002
@@ -681,15 +681,6 @@
 	drivers/zorro/devlist.h drivers/zorro/gen-devlist \
 	sound/oss/bin2hex sound/oss/hex2hex \
 	drivers/atm/fore200e_mkfirm drivers/atm/{pca,sba}*{.bin,.bin1,.bin2} \
-	drivers/scsi/aic7xxx/aic7xxx_seq.h \
-	drivers/scsi/aic7xxx/aic7xxx_reg.h \
-	drivers/scsi/aic7xxx/aicasm/aicasm_gram.c \
-	drivers/scsi/aic7xxx/aicasm/aicasm_scan.c \
-	drivers/scsi/aic7xxx/aicasm/y.tab.h \
-	drivers/scsi/aic7xxx/aicasm/aicasm \
-	drivers/scsi/53c700_d.h drivers/scsi/sim710_d.h \
-	drivers/scsi/53c7xx_d.h drivers/scsi/53c7xx_u.h \
-	drivers/scsi/53c8xx_d.h drivers/scsi/53c8xx_u.h \
 	net/802/cl2llc.c net/802/transit/pdutr.h net/802/transit/timertr.h \
 	net/802/pseudo/pseudocode.h \
 	net/khttpd/make_times_h net/khttpd/times.h \
diff -Nru a/drivers/scsi/Makefile b/drivers/scsi/Makefile
--- a/drivers/scsi/Makefile	Thu Oct 10 21:22:19 2002
+++ b/drivers/scsi/Makefile	Thu Oct 10 21:22:19 2002
@@ -132,6 +132,10 @@
 cpqfc-objs	:= cpqfcTSinit.o cpqfcTScontrol.o cpqfcTSi2c.o \
 		   cpqfcTSworker.o cpqfcTStrigger.o
 
+# Files generated that shall be removed upon make clean
+clean-files :=	53c8xx_d.h  53c7xx_d.h sim710_d.h  53c700_d.h	\
+		53c8xx_u.h  53c7xx_u.h sim710_u.h 53c700_u.h
+
 include $(TOPDIR)/Rules.make
 
 $(obj)/53c7,8xx.o: $(obj)/53c8xx_d.h $(obj)/53c8xx_u.h
@@ -162,4 +166,4 @@
 $(obj)/53c700_d.h: $(src)/53c700.scr $(src)/script_asm.pl
 	$(PERL) -s $(src)/script_asm.pl -ncr7x0_family $@ $(@:_d.h=_u.h) < $<
 
-endif
\ No newline at end of file
+endif
diff -Nru a/drivers/scsi/aic7xxx/Makefile b/drivers/scsi/aic7xxx/Makefile
--- a/drivers/scsi/aic7xxx/Makefile	Thu Oct 10 21:22:19 2002
+++ b/drivers/scsi/aic7xxx/Makefile	Thu Oct 10 21:22:19 2002
@@ -20,6 +20,13 @@
 
 #EXTRA_CFLAGS += -g
 
+# Files generated that shall be removed upon make clean
+clean-files := aic7xxx_seq.h aic7xxx_reg.h
+
+# Command to be executed upon make clean
+# Note: Assignment without ':' to force late evaluation of $(src)
+clean-rule = @$(MAKE) -C $(src)/aicasm clean
+
 include $(TOPDIR)/Rules.make
 
 # Dependencies for generated files need to be listed explicitly
@@ -30,11 +37,12 @@
 
 ifeq ($(CONFIG_AIC7XXX_BUILD_FIRMWARE),y)
 
-$(obj)/aic7xxx_seq.h $(obj)/aic7xxx_reg.h: $(src)/aic7xxx.seq \
-					   $(src)/aic7xxx.reg \
-					   $(obj)/aicasm/aicasm
+$(obj)/aic7xxx_seq.h: $(src)/aic7xxx.seq $(src)/aic7xxx.reg \
+		      $(obj)/aicasm/aicasm
 	$(obj)/aicasm/aicasm -I. -r $(obj)/aic7xxx_reg.h \
 				 -o $(obj)/aic7xxx_seq.h $(src)/aic7xxx.seq
+
+$(obj)/aic7xxx_reg.h: $(obj)/aix7xxx_seq.h
 
 $(obj)/aicasm/aicasm: $(src)/aicasm/*.[chyl]
 	$(MAKE) -C $(src)/aicasm
diff -Nru a/drivers/scsi/aic7xxx/aicasm/Makefile b/drivers/scsi/aic7xxx/aicasm/Makefile
--- a/drivers/scsi/aic7xxx/aicasm/Makefile	Thu Oct 10 21:22:19 2002
+++ b/drivers/scsi/aic7xxx/aicasm/Makefile	Thu Oct 10 21:22:19 2002
@@ -43,7 +43,7 @@
 	 fi
 
 clean:
-	rm -f $(CLEANFILES) $(PROG)
+	@rm -f $(CLEANFILES) $(PROG)
 
 y.tab.h aicasm_gram.c: aicasm_gram.y
 	$(YACC) $(YFLAGS) aicasm_gram.y

^ permalink raw reply	[flat|nested] 6+ messages in thread

* drivers/{atm,char,pci,video,zorro}: ditributed clean
  2002-10-10 19:34 [PATCH] Distributed clean Sam Ravnborg
  2002-10-10 19:51 ` kbuild: Distributed clean infrastructure Sam Ravnborg
  2002-10-10 19:52 ` scsi+aic7xxx: Utilise distributed clean Sam Ravnborg
@ 2002-10-10 19:52 ` Sam Ravnborg
  2002-10-10 19:53 ` drivers/net/hamradio/soundmodem: distributed clean Sam Ravnborg
  2002-10-10 19:53 ` kbuild: Distributed clean, misc Sam Ravnborg
  4 siblings, 0 replies; 6+ messages in thread
From: Sam Ravnborg @ 2002-10-10 19:52 UTC (permalink / raw)
  To: linux-kernel

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.748.1.2 -> 1.748.1.3
#	drivers/atm/Makefile	1.12    -> 1.13   
#	            Makefile	1.320   -> 1.321  
#	drivers/video/Makefile	1.36    -> 1.37   
#	drivers/zorro/Makefile	1.6     -> 1.7    
#	drivers/pci/Makefile	1.15    -> 1.16   
#	drivers/char/Makefile	1.39    -> 1.40   
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/10/10	sam@mars.ravnborg.org	1.748.1.3
# drivers/{atm,char,pci,video,zorro}: ditributed clean
# Move list of files to be deleted during make clean out where
# they are made. host-progs files taken care of automagically
# --------------------------------------------
#
diff -Nru a/Makefile b/Makefile
--- a/Makefile	Thu Oct 10 21:22:24 2002
+++ b/Makefile	Thu Oct 10 21:22:24 2002
@@ -673,14 +673,8 @@
 CLEAN_FILES += \
 	include/linux/compile.h \
 	vmlinux System.map \
-	drivers/char/consolemap_deftbl.c drivers/video/promcon_tbl.c \
-	drivers/char/conmakehash \
 	drivers/char/drm/*-mod.c \
-	drivers/char/defkeymap.c drivers/char/qtronixmap.c \
-	drivers/pci/devlist.h drivers/pci/classlist.h drivers/pci/gen-devlist \
-	drivers/zorro/devlist.h drivers/zorro/gen-devlist \
 	sound/oss/bin2hex sound/oss/hex2hex \
-	drivers/atm/fore200e_mkfirm drivers/atm/{pca,sba}*{.bin,.bin1,.bin2} \
 	net/802/cl2llc.c net/802/transit/pdutr.h net/802/transit/timertr.h \
 	net/802/pseudo/pseudocode.h \
 	net/khttpd/make_times_h net/khttpd/times.h \
@@ -698,7 +692,6 @@
 	sound/oss/msndperm.c \
 	sound/oss/pndsperm.c \
 	sound/oss/pndspini.c \
-	drivers/atm/fore200e_*_fw.c drivers/atm/.fore200e_*.fw \
 	.version .config* config.in config.old \
 	scripts/tkparse scripts/kconfig.tk scripts/kconfig.tmp \
 	scripts/lxdialog/*.o scripts/lxdialog/lxdialog \
diff -Nru a/drivers/atm/Makefile b/drivers/atm/Makefile
--- a/drivers/atm/Makefile	Thu Oct 10 21:22:24 2002
+++ b/drivers/atm/Makefile	Thu Oct 10 21:22:24 2002
@@ -8,6 +8,10 @@
 fore_200e-objs	:= fore200e.o
 host-progs	:= fore200e_mkfirm
 
+# Files generated that shall be removed upon make clean
+clean-files := {atmsar11,pca200e,pca200e_ecd,sba200e_ecd}.{bin,bin1,bin2}
+# Firmware generated that shall be removed upon make clean
+clean-files += fore200e_pca_fw.c fore200e_sba_fw.c
 
 obj-$(CONFIG_ATM_ZATM)		+= zatm.o uPD98402.o
 obj-$(CONFIG_ATM_NICSTAR)	+= nicstar.o
@@ -61,6 +65,6 @@
 	  -i $(CONFIG_ATM_FORE200E_SBA_FW) -o $@
 
 # deal with the various suffixes of the binary firmware images
-$(obj)/%.bin $(obj)/%.bin1 $(obj)/%.bin2: $(obj)/%.data
+$(obj)/%.bin $(obj)/%.bin1 $(obj)/%.bin2: $(src)/%.data
 	objcopy -Iihex $< -Obinary $@.gz
 	gzip -df $@.gz
diff -Nru a/drivers/char/Makefile b/drivers/char/Makefile
--- a/drivers/char/Makefile	Thu Oct 10 21:22:24 2002
+++ b/drivers/char/Makefile	Thu Oct 10 21:22:24 2002
@@ -103,6 +103,9 @@
 obj-$(CONFIG_DRM) += drm/
 obj-$(CONFIG_PCMCIA) += pcmcia/
 
+# Files generated that shall be removed upon make clean
+clean-files := consolemap_deftbl.c defkeymap.c qtronixmap.c
+
 include $(TOPDIR)/Rules.make
 
 $(obj)/consolemap_deftbl.c: $(src)/$(FONTMAPFILE)
diff -Nru a/drivers/pci/Makefile b/drivers/pci/Makefile
--- a/drivers/pci/Makefile	Thu Oct 10 21:22:24 2002
+++ b/drivers/pci/Makefile	Thu Oct 10 21:22:24 2002
@@ -31,6 +31,9 @@
 
 host-progs := gen-devlist
 
+# Files generated that shall be removed upon make clean
+clean-files := devlist.h classlist.h
+
 include $(TOPDIR)/Rules.make
 
 # Dependencies on generated files need to be listed explicitly
diff -Nru a/drivers/video/Makefile b/drivers/video/Makefile
--- a/drivers/video/Makefile	Thu Oct 10 21:22:24 2002
+++ b/drivers/video/Makefile	Thu Oct 10 21:22:24 2002
@@ -119,6 +119,9 @@
 obj-$(CONFIG_FBCON_STI)           += fbcon-sti.o
 obj-$(CONFIG_FBCON_ACCEL)	  += fbcon-accel.o
 
+# Files generated that shall be removed upon make clean
+clean-files := promcon_tbl.c
+
 include $(TOPDIR)/Rules.make
 
 $(obj)/promcon_tbl.c: $(src)/prom.uni
diff -Nru a/drivers/zorro/Makefile b/drivers/zorro/Makefile
--- a/drivers/zorro/Makefile	Thu Oct 10 21:22:24 2002
+++ b/drivers/zorro/Makefile	Thu Oct 10 21:22:24 2002
@@ -9,6 +9,9 @@
 
 host-progs 		:= gen-devlist
 
+# Files generated that shall be removed upon make clean
+clean-files := devlist.h
+
 include $(TOPDIR)/Rules.make
 
 # Dependencies on generated files need to be listed explicitly

^ permalink raw reply	[flat|nested] 6+ messages in thread

* drivers/net/hamradio/soundmodem: distributed clean
  2002-10-10 19:34 [PATCH] Distributed clean Sam Ravnborg
                   ` (2 preceding siblings ...)
  2002-10-10 19:52 ` drivers/{atm,char,pci,video,zorro}: ditributed clean Sam Ravnborg
@ 2002-10-10 19:53 ` Sam Ravnborg
  2002-10-10 19:53 ` kbuild: Distributed clean, misc Sam Ravnborg
  4 siblings, 0 replies; 6+ messages in thread
From: Sam Ravnborg @ 2002-10-10 19:53 UTC (permalink / raw)
  To: linux-kernel

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.748.1.3 -> 1.748.1.4
#	drivers/net/hamradio/soundmodem/Makefile	1.7     -> 1.8    
#	            Makefile	1.321   -> 1.322  
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/10/10	sam@mars.ravnborg.org	1.748.1.4
# drivers/net/hamradio/soundmodem: distributed clean
# Move list of files out where it belongs
# --------------------------------------------
#
diff -Nru a/Makefile b/Makefile
--- a/Makefile	Thu Oct 10 21:22:31 2002
+++ b/Makefile	Thu Oct 10 21:22:31 2002
@@ -683,10 +683,6 @@
 # Files removed with 'make mrproper'
 MRPROPER_FILES += \
 	include/linux/autoconf.h include/linux/version.h \
-	drivers/net/hamradio/soundmodem/sm_tbl_{afsk1200,afsk2666,fsk9600}.h \
-	drivers/net/hamradio/soundmodem/sm_tbl_{hapn4800,psk4800}.h \
-	drivers/net/hamradio/soundmodem/sm_tbl_{afsk2400_7,afsk2400_8}.h \
-	drivers/net/hamradio/soundmodem/gentbl \
 	sound/oss/*_boot.h sound/oss/.*.boot \
 	sound/oss/msndinit.c \
 	sound/oss/msndperm.c \
diff -Nru a/drivers/net/hamradio/soundmodem/Makefile b/drivers/net/hamradio/soundmodem/Makefile
--- a/drivers/net/hamradio/soundmodem/Makefile	Thu Oct 10 21:22:31 2002
+++ b/drivers/net/hamradio/soundmodem/Makefile	Thu Oct 10 21:22:31 2002
@@ -19,6 +19,12 @@
 host-progs := gentbl
 HOST_LOADLIBES := -lm
 
+# Files generated that shall be removed upon make clean
+clean-files  :=	sm_tbl_afsk1200.h   sm_tbl_afsk2400_7.h	\
+		sm_tbl_afsk2400_8.h sm_tbl_afsk2666.h	\
+		sm_tbl_psk4800.h    sm_tbl_hapn4800.h	\
+		sm_tbl_fsk9600.h
+
 include $(TOPDIR)/Rules.make
 
 # Dependencies on generates files need to be listed explicitly

^ permalink raw reply	[flat|nested] 6+ messages in thread

* kbuild: Distributed clean, misc.
  2002-10-10 19:34 [PATCH] Distributed clean Sam Ravnborg
                   ` (3 preceding siblings ...)
  2002-10-10 19:53 ` drivers/net/hamradio/soundmodem: distributed clean Sam Ravnborg
@ 2002-10-10 19:53 ` Sam Ravnborg
  4 siblings, 0 replies; 6+ messages in thread
From: Sam Ravnborg @ 2002-10-10 19:53 UTC (permalink / raw)
  To: linux-kernel

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.748.1.4 -> 1.748.1.5
#	            Makefile	1.322   -> 1.323  
#	  sound/oss/Makefile	1.16    -> 1.17   
#	       init/Makefile	1.10    -> 1.11   
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/10/10	sam@mars.ravnborg.org	1.748.1.5
# kbuild: Distributed clean, misc.
# o Move sound/oss file list to sound/oss/Makefile
# o Remove files non-existing in the tree (khttp,net/802/submenu)
# o scripts/* are handled by scripts makefile
# o Do not delete .config*, be more explicit
# o Add MC* - files generated by Menuconfig in toplevel dir
# --------------------------------------------
#
diff -Nru a/Makefile b/Makefile
--- a/Makefile	Thu Oct 10 21:22:36 2002
+++ b/Makefile	Thu Oct 10 21:22:36 2002
@@ -670,27 +670,12 @@
 # make distclean Remove editor backup files, patch leftover files and the like
 
 # Files removed with 'make clean'
-CLEAN_FILES += \
-	include/linux/compile.h \
-	vmlinux System.map \
-	drivers/char/drm/*-mod.c \
-	sound/oss/bin2hex sound/oss/hex2hex \
-	net/802/cl2llc.c net/802/transit/pdutr.h net/802/transit/timertr.h \
-	net/802/pseudo/pseudocode.h \
-	net/khttpd/make_times_h net/khttpd/times.h \
-	submenu*
+CLEAN_FILES += vmlinux System.map MC*
 
 # Files removed with 'make mrproper'
 MRPROPER_FILES += \
 	include/linux/autoconf.h include/linux/version.h \
-	sound/oss/*_boot.h sound/oss/.*.boot \
-	sound/oss/msndinit.c \
-	sound/oss/msndperm.c \
-	sound/oss/pndsperm.c \
-	sound/oss/pndspini.c \
-	.version .config* config.in config.old \
-	scripts/tkparse scripts/kconfig.tk scripts/kconfig.tmp \
-	scripts/lxdialog/*.o scripts/lxdialog/lxdialog \
+	.version .config .config.old config.in config.old \
 	.menuconfig.log \
 	include/asm \
 	.hdepend include/linux/modversions.h \
diff -Nru a/init/Makefile b/init/Makefile
--- a/init/Makefile	Thu Oct 10 21:22:36 2002
+++ b/init/Makefile	Thu Oct 10 21:22:36 2002
@@ -4,17 +4,21 @@
 
 obj-y    := main.o version.o do_mounts.o
 
+# files to be removed upon make clean
+clean-files := ../include/linux/compile.h
+
 include $(TOPDIR)/Rules.make
 
 # dependencies on generated files need to be listed explicitly
 
-$(obj)/version.o: $(objtree)/include/linux/compile.h
+$(obj)/version.o: $(obj)/../include/linux/compile.h
 
 # compile.h changes depending on hostname, generation number, etc,
 # so we regenerate it always.
 # mkcompile_h will make sure to only update the
 # actual file if its content has changed.
 
-$(objtree)/include/linux/compile.h: FORCE
-	@echo -n '  Generating $@'
+$(obj)/../include/linux/compile.h: FORCE
+	@echo -n '  Generating $(echo_target)'
 	@$(srctree)/scripts/mkcompile_h $@ "$(ARCH)" "$(CONFIG_SMP)" "$(CC) $(CFLAGS)"
+
diff -Nru a/sound/oss/Makefile b/sound/oss/Makefile
--- a/sound/oss/Makefile	Thu Oct 10 21:22:36 2002
+++ b/sound/oss/Makefile	Thu Oct 10 21:22:36 2002
@@ -96,6 +96,10 @@
 
 host-progs	:= bin2hex hex2hex
 
+# Files generated that shall be removed upon make clean
+clean-files := maui_boot.h msndperm.c msndinit.c pndsperm.c pndspini.c \
+               pss_boot.h trix_boot.h
+
 include $(TOPDIR)/Rules.make
 
 # Firmware files that need translation

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2002-10-10 19:49 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2002-10-10 19:34 [PATCH] Distributed clean Sam Ravnborg
2002-10-10 19:51 ` kbuild: Distributed clean infrastructure Sam Ravnborg
2002-10-10 19:52 ` scsi+aic7xxx: Utilise distributed clean Sam Ravnborg
2002-10-10 19:52 ` drivers/{atm,char,pci,video,zorro}: ditributed clean Sam Ravnborg
2002-10-10 19:53 ` drivers/net/hamradio/soundmodem: distributed clean Sam Ravnborg
2002-10-10 19:53 ` kbuild: Distributed clean, misc Sam Ravnborg

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®