Commit 0605bb23 authored by Sam Ravnborg's avatar Sam Ravnborg Committed by Linus Torvalds

[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.
parent 72882439
# #
# Makefile for the Linux aic7xxx SCSI driver. # Makefile for the Linux aic7xxx SCSI driver.
# #
# Let kbuild descend into aicasm when cleaning
subdir- += aicasm
obj-$(CONFIG_SCSI_AIC7XXX) += aic7xxx.o obj-$(CONFIG_SCSI_AIC7XXX) += aic7xxx.o
...@@ -23,11 +25,6 @@ endif ...@@ -23,11 +25,6 @@ endif
# Files generated that shall be removed upon make clean # Files generated that shall be removed upon make clean
clean-files := aic7xxx_seq.h aic7xxx_reg.h 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 # Dependencies for generated files need to be listed explicitly
$(obj)/aic7xxx_core.o: $(obj)/aic7xxx_seq.h $(obj)/aic7xxx_core.o: $(obj)/aic7xxx_seq.h
...@@ -41,7 +38,7 @@ $(obj)/aic7xxx_seq.h: $(src)/aic7xxx.seq $(src)/aic7xxx.reg \ ...@@ -41,7 +38,7 @@ $(obj)/aic7xxx_seq.h: $(src)/aic7xxx.seq $(src)/aic7xxx.reg \
$(obj)/aicasm/aicasm -I$(obj) -r $(obj)/aic7xxx_reg.h \ $(obj)/aicasm/aicasm -I$(obj) -r $(obj)/aic7xxx_reg.h \
-o $(obj)/aic7xxx_seq.h $(src)/aic7xxx.seq -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] $(obj)/aicasm/aicasm: $(src)/aicasm/*.[chyl]
$(MAKE) -C $(src)/aicasm $(MAKE) -C $(src)/aicasm
......
...@@ -7,7 +7,9 @@ GENSRCS= aicasm_gram.c aicasm_scan.c ...@@ -7,7 +7,9 @@ GENSRCS= aicasm_gram.c aicasm_scan.c
GENHDRS= y.tab.h aicdb.h GENHDRS= y.tab.h aicdb.h
SRCS= ${GENSRCS} ${CSRCS} 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. # Override default kernel CFLAGS. This is a userland app.
AICASM_CFLAGS:= -I/usr/include -I. -ldb AICASM_CFLAGS:= -I/usr/include -I. -ldb
YFLAGS= -d YFLAGS= -d
...@@ -42,9 +44,6 @@ aicdb.h: ...@@ -42,9 +44,6 @@ aicdb.h:
echo "*** Install db development libraries"; \ echo "*** Install db development libraries"; \
fi fi
clean:
@rm -f $(CLEANFILES) $(PROG)
y.tab.h aicasm_gram.c: aicasm_gram.y y.tab.h aicasm_gram.c: aicasm_gram.y
$(YACC) $(YFLAGS) aicasm_gram.y $(YACC) $(YFLAGS) aicasm_gram.y
mv y.tab.c aicasm_gram.c mv y.tab.c aicasm_gram.c
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment