Re: sim/arm/Makefile.in fix for non-GNU make

Re: sim/arm/Makefile.in fix for non-GNU make

[Michael Elizabeth Chastain]

Ben Harris writes:

> sim/arm/Makefile.in currently uses $< in a non-implicit rule.  This
> doesn't work with non-GNU makes (at least NetBSD's one) since $< isn't set
> for non-implicit rules.

I got curious, so I checked the Single Unix Spec for make:

  http://www.opengroup.org/onlinepubs/007908799/xcu/make.html

It says:

   $<
          In  an  inference  rule,  $<  evaluates  to  the filename whose
          existence  allowed  the  inference  rule  to  be chosen for the
          target.  In  the  .DEFAULT  rule, the $< macro evaluates to the
          current  target  name.  The  $<  macro  is  evaluated  only for
          inference  rules.  For  example, in the .c.a inference rule, $<
          represents the prerequisite .c file.

So I think this is a good patch.

My two cents,

Michael C

sim/arm/Makefile.in fix for non-GNU make

[Ben Harris]

[ Now with a ChangeLog entry ]

sim/arm/Makefile.in currently uses $< in a non-implicit rule.  This
doesn't work with non-GNU makes (at least NetBSD's one) since $< isn't set
for non-implicit rules.  This patch fixes the problem:

Index: Makefile.in
===================================================================
RCS file: /cvsroot/gnusrc/gnu/dist/toolchain/sim/arm/Makefile.in,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile.in
--- Makefile.in	2000/07/26 00:34:28	1.1.1.1
+++ Makefile.in	2001/11/15 14:57:19
@@ -31,10 +31,10 @@
 armcopro.o: armcopro.c armdefs.h

 armemu26.o: armemu.c armdefs.h armemu.h
-	$(CC) -c $< -o armemu26.o $(ALL_CFLAGS)
+	$(CC) -c $(srcdir)/armemu.c -o armemu26.o $(ALL_CFLAGS)

 armemu32.o: armemu.c armdefs.h armemu.h
-	$(CC) -c $< -o armemu32.o -DMODE32 $(ALL_CFLAGS)
+	$(CC) -c $(srcdir)/armemu.c -o armemu32.o -DMODE32 $(ALL_CFLAGS)

 arminit.o: arminit.c armdefs.h armemu.h


ChangeLog entry (suspiciously similar to one from 1997):

2001-11-15  Ben Harris  <bjh21@netbsd.org>

        * Makefile.in (armemu32.o): Replace $< with autoconf recommended
        $(srcdir)/....
        (armemu26.o): Ditto.

-- 
Ben Harris                                                   <bjh21@netbsd.org>
Portmaster, NetBSD/arm26               <URL:http://www.netbsd.org/Ports/arm26/>

Re: sim/arm/Makefile.in fix for non-GNU make

[Andrew Cagney]

> [ Now with a ChangeLog entry ]

In the wrong place :-)

> sim/arm/Makefile.in currently uses $< in a non-implicit rule.  This
> doesn't work with non-GNU makes (at least NetBSD's one) since $< isn't set
> for non-implicit rules.  This patch fixes the problem:

Yes, thanks, it can go in.  If you find more of these the I think they 
can be considered obvious.

Can you also, separatly, add yourself to the MAINTAINERS file as an 
``obvious fix'' (ie still post the change).

enjoy,
Andrew


> Index: Makefile.in
> ===================================================================
> RCS file: /cvsroot/gnusrc/gnu/dist/toolchain/sim/arm/Makefile.in,v
> retrieving revision 1.1.1.1
> diff -u -r1.1.1.1 Makefile.in
> --- Makefile.in	2000/07/26 00:34:28	1.1.1.1
> +++ Makefile.in	2001/11/15 14:57:19
> @@ -31,10 +31,10 @@
>  armcopro.o: armcopro.c armdefs.h
> 
>  armemu26.o: armemu.c armdefs.h armemu.h
> -	$(CC) -c $< -o armemu26.o $(ALL_CFLAGS)
> +	$(CC) -c $(srcdir)/armemu.c -o armemu26.o $(ALL_CFLAGS)
> 
>  armemu32.o: armemu.c armdefs.h armemu.h
> -	$(CC) -c $< -o armemu32.o -DMODE32 $(ALL_CFLAGS)
> +	$(CC) -c $(srcdir)/armemu.c -o armemu32.o -DMODE32 $(ALL_CFLAGS)
> 
>  arminit.o: arminit.c armdefs.h armemu.h
> 
> 
> ChangeLog entry (suspiciously similar to one from 1997):
> 
> 2001-11-15  Ben Harris  <bjh21@netbsd.org>
> 
> * Makefile.in (armemu32.o): Replace $< with autoconf recommended
>         $(srcdir)/....
>         (armemu26.o): Ditto.
> 
> 

sim/arm/Makefile.in fix for non-GNU make

[Ben Harris]

I'm not sure where to send sim patches, but since it's distributed with
GDB:

sim/arm/Makefile.in currently uses $< in a non-implicit rule.  This
doesn't work with non-GNU makes (at least NetBSD's one) since $< isn't set
for non-implicit rules.  This patch fixes the problem:

Index: Makefile.in
===================================================================
RCS file: /cvsroot/gnusrc/gnu/dist/toolchain/sim/arm/Makefile.in,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile.in
--- Makefile.in	2000/07/26 00:34:28	1.1.1.1
+++ Makefile.in	2001/11/15 14:57:19
@@ -31,10 +31,10 @@
 armcopro.o: armcopro.c armdefs.h

 armemu26.o: armemu.c armdefs.h armemu.h
-	$(CC) -c $< -o armemu26.o $(ALL_CFLAGS)
+	$(CC) -c $(srcdir)/armemu.c -o armemu26.o $(ALL_CFLAGS)

 armemu32.o: armemu.c armdefs.h armemu.h
-	$(CC) -c $< -o armemu32.o -DMODE32 $(ALL_CFLAGS)
+	$(CC) -c $(srcdir)/armemu.c -o armemu32.o -DMODE32 $(ALL_CFLAGS)

 arminit.o: arminit.c armdefs.h armemu.h


-- 
Ben Harris                                                   <bjh21@netbsd.org>
Portmaster, NetBSD/arm26               <URL:http://www.netbsd.org/Ports/arm26/>