From: Paul Mackerras <paulus@samba.org>
Date: Tue, 4 Mar 1997 03:45:38 +0000 (+0000)
Subject: mods from Steve Perkins
X-Git-Tag: RELEASE_2_3_6~237
X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=commitdiff_plain;h=3278b141bac31dce7c1e45136a3c85e07dee6815

mods from Steve Perkins
---

diff --git a/chat/Makefile.NeXT b/chat/Makefile.NeXT
index 799371f..e2d4c43 100644
--- a/chat/Makefile.NeXT
+++ b/chat/Makefile.NeXT
@@ -1,10 +1,10 @@
 #
 # Makefile for chat on NeXTs
 # 
-# $Id: Makefile.NeXT,v 1.1 1995/08/10 06:48:28 paulus Exp $
+# $Id: Makefile.NeXT,v 1.2 1997/03/04 03:45:38 paulus Exp $
 #
 
-ARCHFLAGS = -arch i386 -arch m68k
+ARCHFLAGS = 
 BINDIR = /usr/local/ppp/bin
 MANDIR = /usr/local/ppp/man
 
@@ -30,14 +30,5 @@ install:
 	install -c -m 444 -o root -g wheel chat.8 $(MANDIR)/man8
 
 clean:
-	rm -f *~ *.o chat .depend
+	rm -f *~ *.o chat
 
-depend:
-	cc -M $(CFLAGS) $(SRCS) > .depend
-
-#.depend:	$(SRCS)
-#	@echo Check dependencies if needed
-
-#	cc -M $(CFLAGS) $(SRCS) > .depend
-
-#include	.depend
diff --git a/pppstats/Makefile.NeXT b/pppstats/Makefile.NeXT
index f56650f..dd3451a 100644
--- a/pppstats/Makefile.NeXT
+++ b/pppstats/Makefile.NeXT
@@ -1,45 +1,30 @@
 #
 # pppstats makefile
-# $Id: Makefile.NeXT,v 1.1 1995/08/10 06:48:39 paulus Exp $
+# $Id: Makefile.NeXT,v 1.2 1997/03/04 03:44:38 paulus Exp $
 #
 
-ARCHFLAGS = -arch i386 -arch m68k
+ARCHFLAGS = 
 BINDIR = /usr/local/ppp/bin
 MANDIR = /usr/local/ppp/man
 
-PPPSTATSRCS = pppstats.c
-PPPSTATOBJS = pppstats.o
+CFLAGS = -O -posix $(ARCHFLAGS) -I..
 
-#CC = gcc
+SRCS = pppstats.c
+OBJS = pppstats.o
 
-COPTS = -O -posix $(ARCHFLAGS)
-COMPILE_FLAGS = 
-LIBS = 
+MANPAGES = chat.8
 
-#
-# The VJC/PPP_COMPRESS flag is required to ensure correct sizing of
-# some of the structures
-#
-CFLAGS = -I.. $(COPTS) $(COMPILE_FLAGS) #-DVJC -DPPP_COMPRESS -DDECOMP_OUT
 
 all: pppstats
 
+pppstats: $(OBJS)
+	$(CC) -o pppstats $(CFLAGS) $(OBJS)
+
 install:
-	/bin/mkdirs $(BINDIR) $(MANDIR)/man8
+	/bin/mkdirs $(MANDIR)/man8 $(BINDIR) 
 	install -c -s -m 555 -o root -g daemon pppstats $(BINDIR)/pppstats
 	install -c -m 444 -o root -g wheel pppstats.8 $(MANDIR)/man8
 
-
-pppstats: $(PPPSTATSRCS)
-	$(CC) $(CFLAGS) -o pppstats pppstats.c $(LIBS)
-
 clean:
-	rm -f pppstats *~ #* core
-
-depend:
-	cpp -M $(CFLAGS) $(PPPSTATSRCS) >.depend
-#	makedepend $(CFLAGS) $(PPPSTATSRCS)
+	rm -f pppstats *.o *~ core
 
-saber_pppstats:
-	#setopt load_flags $(CFLAGS)
-	#load $(PPPSTATSRCS)
diff --git a/pppstats/pppstats.c b/pppstats/pppstats.c
index d3fa15f..d6c63a8 100644
--- a/pppstats/pppstats.c
+++ b/pppstats/pppstats.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: pppstats.c,v 1.17 1996/09/26 06:16:51 paulus Exp $";
+static char rcsid[] = "$Id: pppstats.c,v 1.18 1997/03/04 03:44:47 paulus Exp $";
 #endif
 
 #include <stdio.h>
@@ -71,7 +71,7 @@ int	signalled;		/* set if alarm goes off "early" */
 char	*progname;
 char	*interface;
 
-#if defined(SUNOS4) || defined(ULTRIX)
+#if defined(SUNOS4) || defined(ULTRIX) || defined(NeXT)
 extern int optind;
 extern char *optarg;
 #endif