[PATCH] fix ATM makefile for out-of-source-tree builds

[PATCH] fix ATM makefile for out-of-source-tree builds

[Jan Beulich]

[-- Attachment #1: Type: text/plain, Size: 1152 bytes --]

(Note: Patch also attached because the inline version is certain to get
line wrapped.)

Adjust ATM makefile to account for building outside of the source tree.

Signed-off-by: Jan Beulich <jbeulich@novell.com>

diff -Npru linux-2.6.12-rc4.base/drivers/atm/Makefile linux-2.6.12-rc4/drivers/atm/Makefile
--- linux-2.6.12-rc4.base/drivers/atm/Makefile	2005-03-02 08:38:34.000000000 +0100
+++ linux-2.6.12-rc4/drivers/atm/Makefile	2005-03-15 14:39:36.000000000 +0100
@@ -39,7 +39,8 @@ ifeq ($(CONFIG_ATM_FORE200E_PCA),y)
   fore_200e-objs		+= fore200e_pca_fw.o
   # guess the target endianess to choose the right PCA-200E firmware image
   ifeq ($(CONFIG_ATM_FORE200E_PCA_DEFAULT_FW),y)
-    CONFIG_ATM_FORE200E_PCA_FW = $(shell if test -n "`$(CC) -E -dM $(src)/../../include/asm/byteorder.h | grep ' __LITTLE_ENDIAN '`"; then echo $(obj)/pca200e.bin; else echo $(obj)/pca200e_ecd.bin2; fi)
+    byteorder.h			:= include$(if $(patsubst $(srctree),,$(objtree)),2)/asm/byteorder.h
+    CONFIG_ATM_FORE200E_PCA_FW	:= $(obj)/pca200e$(if $(shell $(CC) -E -dM $(byteorder.h) | grep ' __LITTLE_ENDIAN '),.bin,_ecd.bin2)
   endif
 endif
 



[-- Attachment #2: linux-2.6.12-rc4-atm-make.patch --]
[-- Type: text/plain, Size: 1128 bytes --]

(Note: Patch also attached because the inline version is certain to get
line wrapped.)

Adjust ATM makefile to account for building outside of the source tree.

Signed-off-by: Jan Beulich <jbeulich@novell.com>

diff -Npru linux-2.6.12-rc4.base/drivers/atm/Makefile linux-2.6.12-rc4/drivers/atm/Makefile
--- linux-2.6.12-rc4.base/drivers/atm/Makefile	2005-03-02 08:38:34.000000000 +0100
+++ linux-2.6.12-rc4/drivers/atm/Makefile	2005-03-15 14:39:36.000000000 +0100
@@ -39,7 +39,8 @@ ifeq ($(CONFIG_ATM_FORE200E_PCA),y)
   fore_200e-objs		+= fore200e_pca_fw.o
   # guess the target endianess to choose the right PCA-200E firmware image
   ifeq ($(CONFIG_ATM_FORE200E_PCA_DEFAULT_FW),y)
-    CONFIG_ATM_FORE200E_PCA_FW = $(shell if test -n "`$(CC) -E -dM $(src)/../../include/asm/byteorder.h | grep ' __LITTLE_ENDIAN '`"; then echo $(obj)/pca200e.bin; else echo $(obj)/pca200e_ecd.bin2; fi)
+    byteorder.h			:= include$(if $(patsubst $(srctree),,$(objtree)),2)/asm/byteorder.h
+    CONFIG_ATM_FORE200E_PCA_FW	:= $(obj)/pca200e$(if $(shell $(CC) -E -dM $(byteorder.h) | grep ' __LITTLE_ENDIAN '),.bin,_ecd.bin2)
   endif
 endif
 

Re: [PATCH] fix ATM makefile for out-of-source-tree builds

[Christoph Hellwig]

On Thu, May 12, 2005 at 10:29:35AM +0200, Jan Beulich wrote:
> (Note: Patch also attached because the inline version is certain to get
> line wrapped.)
> 
> Adjust ATM makefile to account for building outside of the source tree.

Btw, if someone still has the hardware it would be really nice to convert
the atm drivers to use the userspace firmware loader.

Re: [PATCH] fix ATM makefile for out-of-source-tree builds

[chas williams - CONTRACTOR]

dave, 

please apply to 2.6 head -- thanks!


[ATM]: fix ATM makefile for out-of-source-tree builds

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>

---
commit 70ac1c1be822318a3b706d00397b2bf24ffe0a6e
tree fe56ec270cfb1155e9370731e49900172ec73de6
parent ff0d2f90fdc4b564d47a7c26b16de81a16cfa28e
author chas williams <chas@relax.(none)> Tue, 17 May 2005 14:39:55 -0400
committer chas williams <chas@relax.(none)> Tue, 17 May 2005 14:39:55 -0400

 atm/Makefile |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

Index: drivers/atm/Makefile
===================================================================
--- 6bb5a1cf91bbda8308ec7e6d900cb89071907dcd/drivers/atm/Makefile  (mode:100644)
+++ fe56ec270cfb1155e9370731e49900172ec73de6/drivers/atm/Makefile  (mode:100644)
@@ -39,7 +39,8 @@
   fore_200e-objs		+= fore200e_pca_fw.o
   # guess the target endianess to choose the right PCA-200E firmware image
   ifeq ($(CONFIG_ATM_FORE200E_PCA_DEFAULT_FW),y)
-    CONFIG_ATM_FORE200E_PCA_FW = $(shell if test -n "`$(CC) -E -dM $(src)/../../include/asm/byteorder.h | grep ' __LITTLE_ENDIAN '`"; then echo $(obj)/pca200e.bin; else echo $(obj)/pca200e_ecd.bin2; fi)
+    byteorder.h			:= include$(if $(patsubst $(srctree),,$(objtree)),2)/asm/byteorder.h
+    CONFIG_ATM_FORE200E_PCA_FW	:= $(obj)/pca200e$(if $(shell $(CC) -E -dM $(byteorder.h) | grep ' __LITTLE_ENDIAN '),.bin,_ecd.bin2)
   endif
 endif
 

Re: [PATCH] fix ATM makefile for out-of-source-tree builds

[David S. Miller]

From: "chas williams - CONTRACTOR" <chas@cmf.nrl.navy.mil>
Date: Wed, 18 May 2005 17:50:18 -0400

> [ATM]: fix ATM makefile for out-of-source-tree builds
> 
> Signed-off-by: Jan Beulich <jbeulich@novell.com>
> Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>

Applied, thanks Chas.