allow for COPTS from Makefile.top

diff --git a/chat/Makefile.sol2 b/chat/Makefile.sol2
index e41b63000f5a9112655df5e25f2d3b8de8fd1e26..60b9b54036c87a19b984faeb167c21a020805bb9 100644 (file)
--- a/chat/Makefile.sol2
+++ b/chat/Makefile.sol2
@@ -7,7 +7,8 @@ MANDIR = /usr/local/man
 
 INSTALL= /usr/sbin/install
 
 
 INSTALL= /usr/sbin/install
 

-CFLAGS = -w -DNO_USLEEP
+COPTS = -O -Xa -w
+CFLAGS = $(COPTS) -DNO_USLEEP

 
 all:   chat
 
 
 all:   chat
 

diff --git a/chat/Makefile.svr4 b/chat/Makefile.svr4
index e41b63000f5a9112655df5e25f2d3b8de8fd1e26..6038a90ce0bfff18cc063374c81f54e30d55a279 100644 (file)
--- a/chat/Makefile.svr4
+++ b/chat/Makefile.svr4
@@ -7,7 +7,8 @@ MANDIR = /usr/local/man
 
 INSTALL= /usr/sbin/install
 
 
 INSTALL= /usr/sbin/install
 

-CFLAGS = -w -DNO_USLEEP
+COPTS = -O -Xa -w
+CFLAGS = -DNO_USLEEP $(COPTS)

 
 all:   chat
 
 
 all:   chat
 

diff --git a/pppd/Makefile.sol2 b/pppd/Makefile.sol2
index 7d7cafa8a3092a3eb4b3e00f08b11fa52018b6a8..85ab42aab50c24957dec70146c0c2e21f5e7ce9f 100644 (file)
--- a/pppd/Makefile.sol2
+++ b/pppd/Makefile.sol2
@@ -1,18 +1,18 @@
 #
 # Makefile for pppd under Solaris 2.
 #
 # Makefile for pppd under Solaris 2.

-# $Id: Makefile.sol2,v 1.7 1996/08/28 06:38:17 paulus Exp $
+# $Id: Makefile.sol2,v 1.8 1996/09/26 06:16:15 paulus Exp $

 #
 
 BINDIR = /usr/local/bin
 MANDIR = /usr/local/man
 
 #
 
 BINDIR = /usr/local/bin
 MANDIR = /usr/local/man
 

-COPTS = -g -O -Xa -w
+COPTS = -O -Xa -w

 
 # If you want to use gcc...
 #CC = gcc
 
 # If you want to use gcc...
 #CC = gcc

-#COPTS = -g -O2
+#COPTS = -O2

 
 

-CFLAGS = $(COPTS) -I.. -DSVR4
+CFLAGS = -DSVR4 -I.. $(COPTS)

 LIBS = -lsocket -lnsl
 
 INSTALL = /usr/sbin/install
 LIBS = -lsocket -lnsl
 
 INSTALL = /usr/sbin/install

diff --git a/pppd/Makefile.svr4 b/pppd/Makefile.svr4
index 053526bdb9eaa89362e70dcd5c05d6f5398777ea..fb6b0b6a672c5b5b849dfa43b58dfa6b14e5d0e9 100644 (file)
--- a/pppd/Makefile.svr4
+++ b/pppd/Makefile.svr4
@@ -1,18 +1,18 @@
 #
 # Makefile for pppd under Solaris 2.
 #
 # Makefile for pppd under Solaris 2.

-# $Id: Makefile.svr4,v 1.9 1996/09/14 05:14:05 paulus Exp $
+# $Id: Makefile.svr4,v 1.10 1996/09/26 06:16:16 paulus Exp $

 #
 
 BINDIR = /usr/local/bin
 MANDIR = /usr/local/man
 
 #
 
 BINDIR = /usr/local/bin
 MANDIR = /usr/local/man
 

-COPTS = -g -O -Xa -w
+COPTS = -O -Xa -w

 
 # If you want to use gcc...
 #CC = gcc
 
 # If you want to use gcc...
 #CC = gcc

-#COPTS = -g -O2
+#COPTS = -O2

 
 

-CFLAGS = $(COPTS) -I.. -DSVR4
+CFLAGS = -DSVR4 -I.. $(COPTS)

 LIBS = -lsocket -lnsl -lc -L/usr/ucblib -lucb
 
 INSTALL = /usr/sbin/install
 LIBS = -lsocket -lnsl -lc -L/usr/ucblib -lucb
 
 INSTALL = /usr/sbin/install

diff --git a/pppstats/Makefile.sol2 b/pppstats/Makefile.sol2
index 4ffb438091d6ae3ca978fec4395ce584b0ebab5a..e27c6355a7df3c28d9ebf24188c2dcda28b4f921 100644 (file)
--- a/pppstats/Makefile.sol2
+++ b/pppstats/Makefile.sol2
@@ -1,6 +1,6 @@
 #
 # pppstats Makefile for SVR4 systems
 #
 # pppstats Makefile for SVR4 systems

-# $Id: Makefile.sol2,v 1.5 1996/09/14 05:12:45 paulus Exp $
+# $Id: Makefile.sol2,v 1.6 1996/09/26 06:16:18 paulus Exp $

 #
 
 BINDIR = /usr/local/bin
 #
 
 BINDIR = /usr/local/bin


@@ -11,10 +11,9 @@ INSTALL = /usr/sbin/install
 #CC = gcc
 #COPTS = -g -O
 
 #CC = gcc
 #COPTS = -g -O
 

-# For sun c

 COPTS = -O -Xa
 
 COPTS = -O -Xa
 

-CFLAGS = -I.. $(COPTS) -DSTREAMS
+CFLAGS = -DSTREAMS -I.. $(COPTS)

 
 all: pppstats
 
 
 all: pppstats
 

diff --git a/pppstats/Makefile.svr4 b/pppstats/Makefile.svr4
index ac4fb0e30277eb1cba86d5e95600ae8211a2fa7b..7a7f6459f2cdc585be1b71d36c9ec28bc4f4c57e 100644 (file)
--- a/pppstats/Makefile.svr4
+++ b/pppstats/Makefile.svr4
@@ -1,6 +1,6 @@
 #
 # pppstats Makefile for SVR4 systems
 #
 # pppstats Makefile for SVR4 systems

-# $Id: Makefile.svr4,v 1.3 1996/08/28 06:43:18 paulus Exp $
+# $Id: Makefile.svr4,v 1.4 1996/09/26 06:16:18 paulus Exp $

 #
 
 BINDIR = /usr/local/bin
 #
 
 BINDIR = /usr/local/bin


@@ -8,11 +8,11 @@ MANDIR = /usr/local/man
 INSTALL = /usr/sbin/install
 
 #CC = gcc
 INSTALL = /usr/sbin/install
 
 #CC = gcc

-#COPTS = -g -O
+#COPTS = -O

 
 

-COPTS = -g -Xa
+COPTS = -O -Xa

 
 

-CFLAGS = -I.. $(COPTS) -DSTREAMS
+CFLAGS = -DSTREAMS -I.. $(COPTS)

 
 all: pppstats
 
 
 all: pppstats