diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2002-11-03 00:38:07 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-11-03 00:38:07 -0800 |
| commit | 0605bb238b4469db0ed348b2dfed4eca07d37012 (patch) | |
| tree | 547281e6dbc0e95e937767a1b076ffd43d9efdf3 | |
| parent | 72882439aab1fbf7002d2876cd40db0ebd5e3080 (diff) | |
[PATCH] aic7xxx: Simplified cleaning, fixed firmware build
Cleaning simplified by descending down in aicasm when cleaning.
Fixed firmware build, someone made a spelling mistakei (aix -> aic).
No longer include Rules.make.
| -rw-r--r-- | drivers/scsi/aic7xxx/Makefile | 9 | ||||
| -rw-r--r-- | drivers/scsi/aic7xxx/aicasm/Makefile | 7 |
2 files changed, 6 insertions, 10 deletions
diff --git a/drivers/scsi/aic7xxx/Makefile b/drivers/scsi/aic7xxx/Makefile index 56b2736a6b9f..cf3a49b1ebba 100644 --- a/drivers/scsi/aic7xxx/Makefile +++ b/drivers/scsi/aic7xxx/Makefile @@ -1,6 +1,8 @@ # # Makefile for the Linux aic7xxx SCSI driver. # +# Let kbuild descend into aicasm when cleaning +subdir- += aicasm obj-$(CONFIG_SCSI_AIC7XXX) += aic7xxx.o @@ -23,11 +25,6 @@ endif # Files generated that shall be removed upon make clean clean-files := aic7xxx_seq.h aic7xxx_reg.h -# Command to be executed upon make clean -clean-rule := $(MAKE) -C $(src)/aicasm clean - -include $(TOPDIR)/Rules.make - # Dependencies for generated files need to be listed explicitly $(obj)/aic7xxx_core.o: $(obj)/aic7xxx_seq.h @@ -41,7 +38,7 @@ $(obj)/aic7xxx_seq.h: $(src)/aic7xxx.seq $(src)/aic7xxx.reg \ $(obj)/aicasm/aicasm -I$(obj) -r $(obj)/aic7xxx_reg.h \ -o $(obj)/aic7xxx_seq.h $(src)/aic7xxx.seq -$(obj)/aic7xxx_reg.h: $(obj)/aix7xxx_seq.h +$(obj)/aic7xxx_reg.h: $(obj)/aic7xxx_seq.h $(obj)/aicasm/aicasm: $(src)/aicasm/*.[chyl] $(MAKE) -C $(src)/aicasm diff --git a/drivers/scsi/aic7xxx/aicasm/Makefile b/drivers/scsi/aic7xxx/aicasm/Makefile index 39acae36dcac..1446a9c76575 100644 --- a/drivers/scsi/aic7xxx/aicasm/Makefile +++ b/drivers/scsi/aic7xxx/aicasm/Makefile @@ -7,7 +7,9 @@ GENSRCS= aicasm_gram.c aicasm_scan.c GENHDRS= y.tab.h aicdb.h SRCS= ${GENSRCS} ${CSRCS} -CLEANFILES= ${GENSRCS} ${GENHDRS} y.output + +# Cleaned up by make clean +clean-files := $(GENSRCS) $(GENHDRS) y.output $(PROG) # Override default kernel CFLAGS. This is a userland app. AICASM_CFLAGS:= -I/usr/include -I. -ldb YFLAGS= -d @@ -42,9 +44,6 @@ aicdb.h: echo "*** Install db development libraries"; \ fi -clean: - @rm -f $(CLEANFILES) $(PROG) - y.tab.h aicasm_gram.c: aicasm_gram.y $(YACC) $(YFLAGS) aicasm_gram.y mv y.tab.c aicasm_gram.c |