Update of /cvsroot/alsa/alsa-driver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23376
Modified Files:
Makefile Rules.make
Log Message:
fixed "make clean" on 2.6.x kernel without invoking the standard "make clean"
to avoid clean-up of files in the kernel tree.
Index: Makefile
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/Makefile,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- Makefile 14 May 2004 13:44:13 -0000 1.108
+++ Makefile 27 May 2004 18:24:57 -0000 1.109
@@ -198,9 +198,8 @@
.PHONY: clean
clean: clean1
ifdef NEW_KBUILD
- find . \( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' -o -name '.*.d' -o
-name '.*.tmp' -o -name '*.mod.c' \) -type f -print | xargs rm -f
rm -rf kbuild/.tmp_versions
- @for d in $(SUBDIRS); do if ! $(MAKE) -C $(CONFIG_SND_KERNELDIR)
SUBDIRS=$(MAINSRCDIR)/$$d clean; then exit 1; fi; done
+ @for d in $(SUBDIRS); do if ! $(MAKE) -C $$d cleanup; then exit 1; fi; done
else
@for d in $(SUBDIRS); do if ! $(MAKE) -C $$d clean; then exit 1; fi; done
endif
Index: Rules.make
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/Rules.make,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- Rules.make 30 Jan 2004 11:44:58 -0000 1.38
+++ Rules.make 27 May 2004 18:24:57 -0000 1.39
@@ -27,13 +27,21 @@
modules_install:
ifneq "$(strip $(ALL_MOBJS))" ""
mkdir -p $(DESTDIR)$(moddir)/$(MODCURDIR)
- cp $(ALL_MOBJS:.o=.ko) $(DESTDIR)$(moddir)/$(MODCURDIR)
+ cp $(sort $(ALL_MOBJS:.o=.ko)) $(DESTDIR)$(moddir)/$(MODCURDIR)
endif
@for d in $(patsubst %/,%,$(filter %/, $(obj-y))) \
$(patsubst %/,%,$(filter %/, $(obj-m))) DUMMY; do \
if [ $$d != DUMMY ]; then $(MAKE) -C $$d modules_install; fi; \
done
+# apply patches beforehand
+cleanup:
+ rm -f *.[oas] *.ko .*.cmd .*.d .*.tmp *.mod.c $(clean-files)
+ @for d in $(patsubst %/,%,$(filter %/, $(obj-y))) \
+ $(patsubst %/,%,$(filter %/, $(obj-m))) DUMMY; do \
+ if [ $$d != DUMMY ]; then $(MAKE) -C $$d cleanup; fi; \
+ done
+
else
TOPDIR = $(MAINSRCDIR)
-------------------------------------------------------
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g.
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149&alloc_id=8166&op=click
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
