* M Makefile.in: Add -g to CFLAGS.

	Ads LDFLAGS and use in place of CFLAGS where appropriate.
	* configure.in:  Make a sysdep.hlink in the same way other
	bfd-based directories do.
	* gprof.h (UNIT):  Replace non-standard 'u_short' by 'unsigned
	short'.
	* gprof.h:  #include sysdep.h instead of a bunch of stuff.
	* gprof.c (main):  Fix typo gproff->gprof.

5 files changed, 24 insertions, 14 deletions

diff --git a/gprof/ChangeLog b/gprof/ChangeLog
index 0517907..61b7896 100644
--- a/gprof/ChangeLog
+++ b/gprof/ChangeLog
@@ -1,3 +1,14 @@
+Tue Apr 13 16:14:03 1993  Per Bothner  (bothner@cygnus.com)
+
+	* M Makefile.in:  Add -g to CFLAGS.
+	Ads LDFLAGS and use in place of CFLAGS where appropriate.
+	* configure.in:  Make a sysdep.hlink in the same way other
+	bfd-based directories do.
+	* gprof.h (UNIT):  Replace non-standard 'u_short' by 'unsigned
+	short'.
+	* gprof.h:  #include sysdep.h instead of a bunch of stuff.
+	* gprof.c (main):  Fix typo gproff->gprof.
+
 Thu Mar 25 19:00:37 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
 
 	* gprof.texi: add INFO-DIR-ENTRY
diff --git a/gprof/Makefile.in b/gprof/Makefile.in
index ed148e7..fa43826 100644
--- a/gprof/Makefile.in
+++ b/gprof/Makefile.in
@@ -40,9 +40,10 @@ OBJS=	gprof.o arcs.o dfn.o lookup.o $(MACHINE).o hertz.o \
 # Files that can be generated, but should be included in distribution.
 DISTSTUFF = flat_bl.c bsd_callg_bl.c fsf_callg_bl.c
 
-CFLAGS=	
+CFLAGS=-g
+LDFLAGS=
 .c.o:
-	$(CC) -c $(CFLAGS) -I$(srcdir) -I$(srcdir)/../include -DMACHINE_H=\"$(MACHINE).h\" $(TCFLAGS) $(HCFLAGS) $<
+	$(CC) -c $(CFLAGS) -I. -I$(srcdir) -I$(srcdir)/../include -I$(srcdir)/../bfd -DMACHINE_H=\"$(MACHINE).h\" $(TCFLAGS) $(HCFLAGS) $<
 
 all:	diststuff $(PROG)
 
@@ -90,7 +91,7 @@ install: all install-info
 	$(INSTALL_DATA) $(srcdir)/gprof.1 $(man1dir)/gprof.1
 
 $(PROG):	$(OBJS)
-	$(CC) $(CFLAGS) $(OBJS) -o $(PROG) $(LIBS)
+	$(CC) -o $(PROG) $(LDFLAGS) $(OBJS) $(LIBS)
 
 mostlyclean:
 	-rm -f *.o core gprof nohup.out gprof.info* \
diff --git a/gprof/configure.in b/gprof/configure.in
index f0698c3..fbec798 100644
--- a/gprof/configure.in
+++ b/gprof/configure.in
@@ -8,6 +8,12 @@ srcname="gprof"
 
 # per-host:
 
+. ${srcdir}/../bfd/configure.host
+
+# Set up to make a link between the host's include file and "sysdep.h".
+files="../bfd/hosts/${my_host}.h"
+links="sysdep.h"
+
 # per-target:
 case "${target}" in
 i386-*-*)	my_target=i386 ;;
@@ -21,6 +27,3 @@ target_makefile_frag=config/mt-${my_target}
 if [ ! -f ${srcdir}/${target_makefile_frag} ] ; then
 	target_makefile_frag=
 fi
-
-files=
-links=
diff --git a/gprof/gprof.c b/gprof/gprof.c
index afb5b86..8098438 100644
--- a/gprof/gprof.c
+++ b/gprof/gprof.c
@@ -112,7 +112,7 @@ main(argc, argv)
 	    zflag = TRUE;
 	    break;
 	default:
-	    fprintf (stderr, "usage:  gproff [-a] [-b] [-c] [-d[num]] \
+	    fprintf (stderr, "usage:  gprof [-a] [-b] [-c] [-d[num]] \
 [-E function-name] [-e function-name] \
 [-F function-name] [-f function-name] \
 [-k from to] [-s] [-T] [-z] [image-file] \
diff --git a/gprof/gprof.h b/gprof/gprof.h
index 28813a3..d10f50c 100644
--- a/gprof/gprof.h
+++ b/gprof/gprof.h
@@ -19,12 +19,7 @@
  *	@(#)gprof.h	5.9 (Berkeley) 6/1/90
  */
 
-#include <stdio.h>
-#ifdef	__STDC__
-#include <stdlib.h>
-#endif	/* __STDC__ */
-#include <sys/types.h>
-#include <sys/stat.h>
+#include "sysdep.h"
 #include "bfd.h"
 #include "gmon.h"
 
@@ -60,7 +55,7 @@ typedef int	bool;
      */
 long	hz;
 
-typedef	u_short UNIT;		/* unit of profiling */
+typedef	unsigned short UNIT;		/* unit of profiling */
 char	*a_outname;
 #define	A_OUTNAME		"a.out"