From: Paul Mackerras <paulus@samba.org>
Date: Thu, 26 Sep 1996 06:16:18 +0000 (+0000)
Subject: allow for COPTS from Makefile.top
X-Git-Tag: RELEASE_2_3_6~313
X-Git-Url: https://git.ozlabs.org/?p=ppp.git;a=commitdiff_plain;h=c2a92a1f6789e7ae568f18d9daa7f9117339174a

allow for COPTS from Makefile.top
---

diff --git a/chat/Makefile.sol2 b/chat/Makefile.sol2
index e41b630..60b9b54 100644
--- a/chat/Makefile.sol2
+++ b/chat/Makefile.sol2
@@ -7,7 +7,8 @@ MANDIR = /usr/local/man
 
 INSTALL= /usr/sbin/install
 
-CFLAGS = -w -DNO_USLEEP
+COPTS = -O -Xa -w
+CFLAGS = $(COPTS) -DNO_USLEEP
 
 all:	chat
 
diff --git a/chat/Makefile.svr4 b/chat/Makefile.svr4
index e41b630..6038a90 100644
--- a/chat/Makefile.svr4
+++ b/chat/Makefile.svr4
@@ -7,7 +7,8 @@ MANDIR = /usr/local/man
 
 INSTALL= /usr/sbin/install
 
-CFLAGS = -w -DNO_USLEEP
+COPTS = -O -Xa -w
+CFLAGS = -DNO_USLEEP $(COPTS)
 
 all:	chat
 
diff --git a/pppd/Makefile.sol2 b/pppd/Makefile.sol2
index 7d7cafa..85ab42a 100644
--- a/pppd/Makefile.sol2
+++ b/pppd/Makefile.sol2
@@ -1,18 +1,18 @@
 #
 # 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
 
-COPTS = -g -O -Xa -w
+COPTS = -O -Xa -w
 
 # 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
diff --git a/pppd/Makefile.svr4 b/pppd/Makefile.svr4
index 053526b..fb6b0b6 100644
--- a/pppd/Makefile.svr4
+++ b/pppd/Makefile.svr4
@@ -1,18 +1,18 @@
 #
 # 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
 
-COPTS = -g -O -Xa -w
+COPTS = -O -Xa -w
 
 # 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
diff --git a/pppstats/Makefile.sol2 b/pppstats/Makefile.sol2
index 4ffb438..e27c635 100644
--- a/pppstats/Makefile.sol2
+++ b/pppstats/Makefile.sol2
@@ -1,6 +1,6 @@
 #
 # 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
@@ -11,10 +11,9 @@ INSTALL = /usr/sbin/install
 #CC = gcc
 #COPTS = -g -O
 
-# For sun c
 COPTS = -O -Xa
 
-CFLAGS = -I.. $(COPTS) -DSTREAMS
+CFLAGS = -DSTREAMS -I.. $(COPTS)
 
 all: pppstats
 
diff --git a/pppstats/Makefile.svr4 b/pppstats/Makefile.svr4
index ac4fb0e..7a7f645 100644
--- a/pppstats/Makefile.svr4
+++ b/pppstats/Makefile.svr4
@@ -1,6 +1,6 @@
 #
 # 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
@@ -8,11 +8,11 @@ MANDIR = /usr/local/man
 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