Makefile.in: .c.o rule needed, default one (under solaris) ignores CFLAGS

Makefile: it shouldn't be under cvs; given that it is, fix it too
arcs.c: fprintf used where printf should have been.
lookup.c: misdeclared calloc; use a cast instead.

diff --git a/gprof/Makefile b/gprof/Makefile
index b233afb4119c654218d9346db239f25ce2473520..30d13f0cea7369939f1980516762eff0a0ca2e11 100755 (executable)
--- a/gprof/Makefile
+++ b/gprof/Makefile
@@ -1,25 +1,46 @@
+# This file was generated automatically by configure.  Do not edit.
+VPATH = .
+links = 
+host_alias = sparc-sun-solaris
+host_cpu = sparc
+host_vendor = sun
+host_os = solaris
+target_alias = sparc-sun-solaris
+target_cpu = sparc
+target_vendor = sun
+target_os = solaris
+target_makefile_frag = ./config/mt-sparc
+ALL=all.internal
 #      @(#)Makefile    5.17 (Berkeley) 5/11/90
 
-CC=    gcc
-MACHINE=       sparc
+#### host and target dependent Makefile fragments come in here.
+MACHINE=sparc
+###
+
 PROG=  gprof
 SRCS=  gprof.c arcs.c dfn.c lookup.c ${MACHINE}.c hertz.c \
        printgprof.c printlist.c
 LIBS = ../bfd/libbfd.a ../libiberty/libiberty.a
 
-#CFLAGS+=-I${.CURDIR}/../../lib/csu.${MACHINE}
-CFLAGS=        -I. -I../include -O -g -DMACHINE_H=\"${MACHINE}.h\"
-
 OBJS=  gprof.o arcs.o dfn.o lookup.o ${MACHINE}.o hertz.o \
        printgprof.o printlist.o
 
+CFLAGS=        -I. -I../include -DMACHINE_H=\"${MACHINE}.h\" ${TCFLAGS} ${HCFLAGS}
+.c.o:
+       $(CC) -c $(CFLAGS) $<
+
 all:   ${PROG}
 
+.PHONY: check
+check:
+
 beforeinstall:
        install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
            ${.CURDIR}/gprof.flat ${.CURDIR}/gprof.callg \
            ${DESTDIR}/usr/share/misc
 
-#.include <bsd.prog.mk>
 $(PROG):       $(OBJS)
        $(CC) $(CFLAGS) $(OBJS) -o $(PROG) $(LIBS)
+
+clean:
+       -rm -f $(OBJS) core gprof nohup.out

diff --git a/gprof/Makefile.in b/gprof/Makefile.in
index 3b8935375d05e6cde8a43396fccc0fa76abe3b16..f13b34f8c515f42ea5a65ecf15582f8c27e8b7c6 100644 (file)
--- a/gprof/Makefile.in
+++ b/gprof/Makefile.in
@@ -12,6 +12,8 @@ OBJS= gprof.o arcs.o dfn.o lookup.o ${MACHINE}.o hertz.o \
        printgprof.o printlist.o
 
 CFLAGS=        -I. -I../include -DMACHINE_H=\"${MACHINE}.h\" ${TCFLAGS} ${HCFLAGS}
+.c.o:
+       $(CC) -c $(CFLAGS) $<
 
 all:   ${PROG}
 

diff --git a/gprof/arcs.c b/gprof/arcs.c
index 8cb6dad518bc7614826af72533998bfc75707c49..906114541dd74eb9923bc26809cf351595cf051e 100644 (file)
--- a/gprof/arcs.c
+++ b/gprof/arcs.c
@@ -31,7 +31,6 @@ addarc( parentp , childp , count )
     nltype     *childp;
     long       count;
 {
-    arctype            *calloc();
     arctype            *arcp;
 
 #   ifdef DEBUG
@@ -54,7 +53,7 @@ addarc( parentp , childp , count )
        arcp -> arc_count += count;
        return;
     }
-    arcp = calloc( 1 , sizeof *arcp );
+    arcp = (arctype *) calloc( 1 , sizeof *arcp );
     arcp -> arc_parentp = parentp;
     arcp -> arc_childp = childp;
     arcp -> arc_count = count;

diff --git a/gprof/lookup.c b/gprof/lookup.c
index 405f3205027271820af589281b020dc0aa4ce0b3..d08a162f9e7d84a31dec294a4282be77176c53d0 100644 (file)
--- a/gprof/lookup.c
+++ b/gprof/lookup.c
@@ -71,7 +71,7 @@ arclookup( parentp , childp )
     arctype    *arcp;
 
     if ( parentp == 0 || childp == 0 ) {
-       fprintf( "[arclookup] parentp == 0 || childp == 0\n" );
+       printf( "[arclookup] parentp == 0 || childp == 0\n" );
        return 0;
     }
 #   ifdef DEBUG