From: Sam Ravnborg <sam@ravnborg.org>
To: Linus Torvalds <torvalds@transmeta.com>
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH] aic7xxx/docbook Makefile fixes
Date: Fri, 1 Nov 2002 21:10:14 +0100 [thread overview]
Message-ID: <20021101201014.GA1937@mars.ravnborg.org> (raw)
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 sam@mars.ravnborg.org 1.856
# scsi/aic7xxx: Avoid clean-rule usage in Makefile
# --------------------------------------------
#
diff -Nru a/drivers/scsi/aic7xxx/Makefile b/drivers/scsi/aic7xxx/Makefile
--- a/drivers/scsi/aic7xxx/Makefile Fri Nov 1 21:04:53 2002
+++ b/drivers/scsi/aic7xxx/Makefile Fri Nov 1 21:04:53 2002
@@ -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
diff -Nru a/drivers/scsi/aic7xxx/aicasm/Makefile b/drivers/scsi/aic7xxx/aicasm/Makefile
--- a/drivers/scsi/aic7xxx/aicasm/Makefile Fri Nov 1 21:04:53 2002
+++ b/drivers/scsi/aic7xxx/aicasm/Makefile Fri Nov 1 21:04:53 2002
@@ -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 sam@mars.ravnborg.org 1.857
# docbook: *docs targets fixed, make clean works for docbook again
# --------------------------------------------
#
diff -Nru a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
--- a/Documentation/DocBook/Makefile Fri Nov 1 21:05:12 2002
+++ b/Documentation/DocBook/Makefile Fri Nov 1 21:05:12 2002
@@ -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
diff -Nru a/Makefile b/Makefile
--- a/Makefile Fri Nov 1 21:05:12 2002
+++ b/Makefile Fri Nov 1 21:05:12 2002
@@ -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
# ---------------------------------------------------------------------------
reply other threads:[~2002-11-01 21:02 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20021101201014.GA1937@mars.ravnborg.org \
--to=sam@ravnborg.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@transmeta.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.