aic7xxx/docbook Makefile fixes

PATCH New Sam Ravnborg 1 participant 1 message Nov 1, 2002

Subsystems (4)

Documentation SCSI Kbuild AIC7XXX / AIC79XX SCSI driver

lore

Share & tools

lore

Sam Ravnborg

author

2002-11-01 21:02 UTC #0 lore raw

PATCH 1/1 aic7xxx/docbook Makefile fixes

Fixes to aic7xxx:
- Get rid of clean-rule
- Fix firmware build

Fixes to docbook:
- Make the *docs target work againg after Rules.make got lethal
- Fix cleaning when htmldocs has been executed

Please apply,
Sam

 drivers/scsi/aic7xxx/Makefile        |    9 +++------
 drivers/scsi/aic7xxx/aicasm/Makefile |    7 +++----
 2 files changed, 6 insertions(+), 10 deletions(-)

 Documentation/DocBook/Makefile |    6 ++----
 Makefile                       |    2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

# 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.855 -> 1.856
# drivers/scsi/aic7xxx/aicasm/Makefile 1.5 -> 1.6
# drivers/scsi/aic7xxx/Makefile 1.14 -> 1.15
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/10/31 [email protected] 1.856
# scsi/aic7xxx: Avoid clean-rule usage in Makefile
# --------------------------------------------
#

drivers/scsi/aic7xxx/Makefile +3 -6

diff -Nru 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 @@
 # 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)/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

drivers/scsi/aic7xxx/aicasm/Makefile +3 -4

diff -Nru a/drivers/scsi/aic7xxx/aicasm/Makefile b/drivers/scsi/aic7xxx/aicasm/Makefile
@@ -7,7 +7,9 @@
 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

@@ -41,9 +43,6 @@
 	 else							\
 		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

# 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.856 -> 1.857
# Makefile 1.337 -> 1.338
# Documentation/DocBook/Makefile 1.36 -> 1.37
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/10/31 [email protected] 1.857
# docbook: *docs targets fixed, make clean works for docbook again # --------------------------------------------
#

Documentation/DocBook/Makefile +2 -4

diff -Nru a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
@@ -160,8 +160,6 @@
 	$(patsubst %.fig,%.png, $(IMG-parportbook)) \
 	$(C-procfs-example)
 
-ifneq ($(wildcard $(BOOKS)),)
-clean-rule := rm -rf $(wildcard $(BOOKS))
+ifneq ($(wildcard $(patsubst %.html,%,$(HTML))),)
+clean-rule := rm -rf $(wildcard $(patsubst %.html,%,$(HTML)))
 endif
-
-include $(TOPDIR)/Rules.make

Makefile +1 -1

diff -Nru a/Makefile b/Makefile
@@ -798,7 +798,7 @@
 # Documentation targets
 # ---------------------------------------------------------------------------
 sgmldocs psdocs pdfdocs htmldocs: scripts
-	$(Q)$(MAKE) -f Documentation/DocBook/Makefile $@
+	$(Q)$(MAKE) -f scripts/Makefile.build obj=Documentation/DocBook $@
 
 # Scripts to check various things for consistency
 # ---------------------------------------------------------------------------