From: Andreas Bombe <andreas.bombe@munich.netsurf.de>
To: Linus Torvalds <torvalds@transmeta.com>
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH] fixed Makefile fix for ieee1394
Date: Tue, 2 Jan 2001 21:39:16 +0100 [thread overview]
Message-ID: <20010102213916.B2103@storm.local> (raw)
In-Reply-To: <20010102064357.A493@storm.local>
In-Reply-To: <20010102064357.A493@storm.local>; from andreas.bombe@munich.netsurf.de on Tue, Jan 02, 2001 at 06:43:57AM +0100
On Tue, Jan 02, 2001 at 06:43:57AM +0100, Andreas Bombe wrote:
> Now that I've had the time to understand the new kernel makefile
> structure the patch Kai Germaschewski posted is indeed the correct fix
> (move include line up). Furthermore it builds an .o object in the
> static compiled case now. I don't see any reason to choose the .a
> format and most other drivers also do .o.
The first patch had spaces where a tab should be and so failed to apply
cleanly. This one with the trivial fix should work better (the O_TARGET
is now also defined with ':=' ).
diff -ruN linux-2.4.orig/Makefile linux-2.4.linus/Makefile
--- linux-2.4.orig/Makefile Tue Jan 2 03:38:50 2001
+++ linux-2.4.linus/Makefile Tue Jan 2 05:12:36 2001
@@ -145,7 +145,7 @@
DRIVERS-$(CONFIG_ATM) += drivers/atm/atm.o
DRIVERS-$(CONFIG_IDE) += drivers/ide/idedriver.o
DRIVERS-$(CONFIG_SCSI) += drivers/scsi/scsidrv.o
-DRIVERS-$(CONFIG_IEEE1394) += drivers/ieee1394/ieee1394.a
+DRIVERS-$(CONFIG_IEEE1394) += drivers/ieee1394/ieee1394drv.o
ifneq ($(CONFIG_CD_NO_IDESCSI)$(CONFIG_BLK_DEV_IDECD)$(CONFIG_BLK_DEV_SR)$(CONFIG_PARIDE_PCD),)
DRIVERS-y += drivers/cdrom/driver.o
diff -ruN linux-2.4.orig/drivers/ieee1394/Makefile linux-2.4.linus/drivers/ieee1394/Makefile
--- linux-2.4.orig/drivers/ieee1394/Makefile Tue Jan 2 03:38:59 2001
+++ linux-2.4.linus/drivers/ieee1394/Makefile Tue Jan 2 05:12:38 2001
@@ -8,7 +8,7 @@
# Note 2! The CFLAGS definitions are now in the main makefile.
#
-L_TARGET := ieee1394.a
+O_TARGET := ieee1394drv.o
export-objs := ieee1394_syms.o
@@ -23,7 +23,7 @@
obj-$(CONFIG_IEEE1394_VIDEO1394) += video1394.o
obj-$(CONFIG_IEEE1394_RAWIO) += raw1394.o
+include $(TOPDIR)/Rules.make
+
ieee1394.o: $(ieee1394-objs)
$(LD) -r -o $@ $(ieee1394-objs)
-
-include $(TOPDIR)/Rules.make
--
Andreas E. Bombe <andreas.bombe@munich.netsurf.de> DSA key 0x04880A44
http://home.pages.de/~andreas.bombe/ http://linux1394.sourceforge.net/
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
Please read the FAQ at http://www.tux.org/lkml/
next prev parent reply other threads:[~2001-01-02 21:46 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2001-01-02 5:43 [PATCH] Makefile fix for ieee1394 Andreas Bombe
2001-01-02 20:39 ` Andreas Bombe [this message]
2001-01-05 8:58 ` IEEE1394 2.4.0 (final) compile problems Dax Kelson
2001-01-05 9:14 ` Arjan van de Ven
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=20010102213916.B2103@storm.local \
--to=andreas.bombe@munich.netsurf.de \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox