From 4e8e5c4ac523dd13db9832f3ed43c19d7e935646 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Tue, 5 Apr 1994 06:48:56 +0000 Subject: [PATCH] * Makefile.in (MY_MACHINE): Renamed from MACHINE to avoid losing makes (osf1) in which the value of MACHINE can not be changed. * config/*.mt: Changed appropriately. --- gprof/ChangeLog | 6 ++++++ gprof/Makefile.in | 8 ++++---- gprof/config/mt-dummy | 2 +- gprof/config/mt-i386 | 2 +- gprof/config/mt-sparc | 2 +- gprof/config/mt-tahoe | 2 +- gprof/config/mt-vax | 2 +- 7 files changed, 15 insertions(+), 9 deletions(-) diff --git a/gprof/ChangeLog b/gprof/ChangeLog index 611e379a792..d7de2228e69 100644 --- a/gprof/ChangeLog +++ b/gprof/ChangeLog @@ -1,3 +1,9 @@ +Mon Apr 4 23:47:30 1994 Jeffrey A. Law (law@snake.cs.utah.edu) + + * Makefile.in (MY_MACHINE): Renamed from MACHINE to avoid losing + makes (osf1) in which the value of MACHINE can not be changed. + * config/*.mt: Changed appropriately. + Wed Mar 30 16:12:40 1994 Ian Lance Taylor (ian@tweedledumb.cygnus.com) * gprof.c (getsymtab): Change nosyms to long. Rename diff --git a/gprof/Makefile.in b/gprof/Makefile.in index 133e59c3f36..c6f6e3c1443 100644 --- a/gprof/Makefile.in +++ b/gprof/Makefile.in @@ -32,11 +32,11 @@ texidir = $(srcdir)/../texinfo ### PROG= gprof -SRCS= gprof.c arcs.c dfn.c lookup.c $(MACHINE).c hertz.c \ +SRCS= gprof.c arcs.c dfn.c lookup.c $(MY_MACHINE).c hertz.c \ printgprof.c printlist.c LIBS = ../bfd/libbfd.a ../libiberty/libiberty.a -OBJS= gprof.o arcs.o dfn.o lookup.o $(MACHINE).o hertz.o \ +OBJS= gprof.o arcs.o dfn.o lookup.o $(MY_MACHINE).o hertz.o \ printgprof.o printlist.o \ flat_bl.o bsd_callg_bl.o fsf_callg_bl.o @@ -46,7 +46,7 @@ DISTSTUFF = flat_bl.c bsd_callg_bl.c fsf_callg_bl.c CFLAGS=-g LDFLAGS= .c.o: - $(CC) -c $(CFLAGS) -I. -I$(srcdir) -I../bfd -I$(srcdir)/../include -I$(srcdir)/../bfd -DMACHINE_H=\"$(MACHINE).h\" $(TCFLAGS) $(HCFLAGS) $< + $(CC) -c $(CFLAGS) -I. -I$(srcdir) -I../bfd -I$(srcdir)/../include -I$(srcdir)/../bfd -DMACHINE_H=\"$(MY_MACHINE).h\" $(TCFLAGS) $(HCFLAGS) $< all: diststuff $(PROG) @@ -113,7 +113,7 @@ gprof.o: gprof.c arcs.o: arcs.c dfn.o: dfn.c lookup.o: lookup.c -$(MACHINE).o: $(MACHINE).c +$(MY_MACHINE).o: $(MY_MACHINE).c hertz.o: hertz.c printgprof.o: printgprof.c printlist.o: printlist.c diff --git a/gprof/config/mt-dummy b/gprof/config/mt-dummy index 51b65369dfa..a36fdf9d694 100644 --- a/gprof/config/mt-dummy +++ b/gprof/config/mt-dummy @@ -1 +1 @@ -MACHINE=dummy +MY_MACHINE=dummy diff --git a/gprof/config/mt-i386 b/gprof/config/mt-i386 index 5b457984f7f..d8680a02a2c 100644 --- a/gprof/config/mt-i386 +++ b/gprof/config/mt-i386 @@ -1 +1 @@ -MACHINE=i386 +MY_MACHINE=i386 diff --git a/gprof/config/mt-sparc b/gprof/config/mt-sparc index b88bc27e5a9..0b3b806cc7a 100644 --- a/gprof/config/mt-sparc +++ b/gprof/config/mt-sparc @@ -1 +1 @@ -MACHINE=sparc +MY_MACHINE=sparc diff --git a/gprof/config/mt-tahoe b/gprof/config/mt-tahoe index cbdd9dc9b2a..fcf35f3955b 100644 --- a/gprof/config/mt-tahoe +++ b/gprof/config/mt-tahoe @@ -1 +1 @@ -MACHINE=tahoe +MY_MACHINE=tahoe diff --git a/gprof/config/mt-vax b/gprof/config/mt-vax index 522190dcec1..ff91c309265 100644 --- a/gprof/config/mt-vax +++ b/gprof/config/mt-vax @@ -1 +1 @@ -MACHINE=vax +MY_MACHINE=vax -- 2.30.2