mods from Steve Perkins

diff --git a/chat/Makefile.NeXT b/chat/Makefile.NeXT
index 799371f7735f983dc30440ea38a02806fbe38730..e2d4c43a9d874ae48abb568416704e8364fbf39d 100644 (file)
--- a/chat/Makefile.NeXT
+++ b/chat/Makefile.NeXT
@@ -1,10 +1,10 @@
 #
 # Makefile for chat on NeXTs
 # 
 #
 # 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
 
 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:
        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 f56650fbca8ee53a5a34223c1aaf7f5fa940236d..dd3451ab4e4c6d94736283c9059690b4700a979c 100644 (file)
--- a/pppstats/Makefile.NeXT
+++ b/pppstats/Makefile.NeXT
@@ -1,45 +1,30 @@
 #
 # pppstats makefile
 #
 # 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
 
 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
 
 
 all: pppstats
 

+pppstats: $(OBJS)
+       $(CC) -o pppstats $(CFLAGS) $(OBJS)
+

 install:
 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
 
        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:
 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 d3fa15f5e6725de1753134430122c1b8109063c1..d6c63a87206de6aeb558256198e0252d64af3723 100644 (file)
--- a/pppstats/pppstats.c
+++ b/pppstats/pppstats.c
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
  */
 
 #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>
 #endif
 
 #include <stdio.h>


@@ -71,7 +71,7 @@ int   signalled;              /* set if alarm goes off "early" */
 char   *progname;
 char   *interface;
 
 char   *progname;
 char   *interface;
 

-#if defined(SUNOS4) || defined(ULTRIX)
+#if defined(SUNOS4) || defined(ULTRIX) || defined(NeXT)

 extern int optind;
 extern char *optarg;
 #endif
 extern int optind;
 extern char *optarg;
 #endif