[patch] 2.4.19-pre8-ac2 kbuild 2.4 tmp_include_depends

From: Keith Owens (kaos@ocs.com.au)
Date: Sat May 11 2002 - 21:11:24 EST


make clean dep works, make dep clean deletes the .tmp file created by
make dep and complains 'no rule to make .tmp_include_depends'. Change
the filenames to avoid make clean and add them to mrproper.

diff -urN 2.4.19-pre8-ac2/Makefile 2.4.19-pre8-ac2-test/Makefile
--- 2.4.19-pre8-ac2/Makefile Sun May 12 11:24:45 2002
+++ 2.4.19-pre8-ac2-test/Makefile Sun May 12 12:00:26 2002
@@ -226,6 +226,7 @@
 # files removed with 'make mrproper'
 MRPROPER_FILES = \
         include/linux/autoconf.h include/linux/version.h \
+ tmp* \
         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 \
@@ -353,13 +354,13 @@
 
 comma := ,
 
-init/version.o: init/version.c include/linux/compile.h .tmp_include_depends
+init/version.o: init/version.c include/linux/compile.h tmp_include_depends
         $(CC) $(CFLAGS) $(CFLAGS_KERNEL) -DUTS_MACHINE='"$(ARCH)"' -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) -c -o init/version.o init/version.c
 
-init/main.o: init/main.c .tmp_include_depends
+init/main.o: init/main.c tmp_include_depends
         $(CC) $(CFLAGS) $(CFLAGS_KERNEL) $(PROFILING) -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) -c -o $*.o $<
 
-init/do_mounts.o: init/do_mounts.c .tmp_include_depends
+init/do_mounts.o: init/do_mounts.c tmp_include_depends
         $(CC) $(CFLAGS) $(CFLAGS_KERNEL) $(PROFILING) -DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) -c -o $*.o $<
 
 fs lib mm ipc kernel drivers net: dummy
@@ -386,7 +387,7 @@
 modules: $(patsubst %, _mod_%, $(SUBDIRS))
 
 .PHONY: $(patsubst %, _mod_%, $(SUBDIRS))
-$(patsubst %, _mod_%, $(SUBDIRS)) : include/linux/version.h .tmp_include_depends
+$(patsubst %, _mod_%, $(SUBDIRS)) : include/linux/version.h tmp_include_depends
         $(MAKE) -C $(patsubst _mod_%, %, $@) CFLAGS="$(CFLAGS) $(MODFLAGS)" MAKING_MODULES=1 modules
 
 .PHONY: modules_install
@@ -491,13 +492,13 @@
 ifdef CONFIG_MODVERSIONS
         $(MAKE) update-modverfile
 endif
- (find $(TOPDIR) \( -name .depend -o -name .hdepend \) -print | xargs $(AWK) -f scripts/include_deps) > .tmp_include_depends
- sed -ne 's/^\([^ ].*\):.*/ \1 \\/p' .tmp_include_depends > .tmp_include_depends_1
- (echo ""; echo "all: \\"; cat .tmp_include_depends_1; echo "") >> .tmp_include_depends
- rm .tmp_include_depends_1
+ (find $(TOPDIR) \( -name .depend -o -name .hdepend \) -print | xargs $(AWK) -f scripts/include_deps) > tmp_include_depends
+ sed -ne 's/^\([^ ].*\):.*/ \1 \\/p' tmp_include_depends > tmp_include_depends_1
+ (echo ""; echo "all: \\"; cat tmp_include_depends_1; echo "") >> tmp_include_depends
+ rm tmp_include_depends_1
 
-.tmp_include_depends: include/config/MARKER dummy
- $(MAKE) -r -f .tmp_include_depends all
+tmp_include_depends: include/config/MARKER dummy
+ $(MAKE) -r -f tmp_include_depends all
 
 ifdef CONFIG_MODVERSIONS
 MODVERFILE := $(TOPDIR)/include/linux/modversions.h

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Tue May 14 2002 - 12:00:17 EST