Change some Makefile.linux files to use COPTS and CFLAGS the same way

that pppd/Makefile.linux does.

diff --git a/chat/Makefile.linux b/chat/Makefile.linux
index 6568cbb77f4cc4ef8215eb10ba1fa8ceab70a705..c4d6bf29721f9f8bb34f8a3b572bd75f0a77a141 100644 (file)
--- a/chat/Makefile.linux
+++ b/chat/Makefile.linux
@@ -1,4 +1,4 @@
-#      $Id: Makefile.linux,v 1.9 1999/08/13 01:54:32 paulus Exp $
+#      $Id: Makefile.linux,v 1.10 2004/01/13 03:57:55 paulus Exp $

 
 CDEF1= -DTERMIOS                       # Use the termios structure
 CDEF2= -DSIGTYPE=void                  # Standard definition
 
 CDEF1= -DTERMIOS                       # Use the termios structure
 CDEF2= -DSIGTYPE=void                  # Standard definition


@@ -6,7 +6,8 @@ CDEF3=  -UNO_SLEEP                      # Use the usleep function
 CDEF4= -DFNDELAY=O_NDELAY              # Old name value
 CDEFS= $(CDEF1) $(CDEF2) $(CDEF3) $(CDEF4)
 
 CDEF4= -DFNDELAY=O_NDELAY              # Old name value
 CDEFS= $(CDEF1) $(CDEF2) $(CDEF3) $(CDEF4)
 

-CFLAGS=        -O2 -g -pipe $(CDEFS)
+COPTS= -O2 -g -pipe $(CDEFS)
+CFLAGS=        $(COPTS) $(CDEFS)

 
 INSTALL= install
 
 
 INSTALL= install
 

diff --git a/pppd/plugins/Makefile.linux b/pppd/plugins/Makefile.linux
index a7cf5d82edf8d43ee6d42d12903b95527c6a9f21..2fabeba80eacb436014d472ef307cdb90746b0ba 100644 (file)
--- a/pppd/plugins/Makefile.linux
+++ b/pppd/plugins/Makefile.linux
@@ -1,5 +1,6 @@
 CC     = gcc
 CC     = gcc

-CFLAGS = -g -O2 -I.. -I../../include -fPIC
+COPTS  = -O2 -g
+CFLAGS = $(COPTS) -I.. -I../../include -fPIC

 LDFLAGS        = -shared
 INSTALL        = install -o root
 
 LDFLAGS        = -shared
 INSTALL        = install -o root
 

diff --git a/pppd/plugins/rp-pppoe/Makefile.linux b/pppd/plugins/rp-pppoe/Makefile.linux
index 078f1584c1e9ec4f5d32b0fb01c12611ca56fea2..bbb8ba9a7a4998ce4405dac9ffa07776aec757dd 100644 (file)
--- a/pppd/plugins/rp-pppoe/Makefile.linux
+++ b/pppd/plugins/rp-pppoe/Makefile.linux
@@ -10,13 +10,14 @@
 # This program may be distributed according to the terms of the GNU
 # General Public License, version 2 or (at your option) any later version.
 #
 # This program may be distributed according to the terms of the GNU
 # General Public License, version 2 or (at your option) any later version.
 #

-# $Id: Makefile.linux,v 1.1 2001/12/14 02:55:20 mostrows Exp $
+# $Id: Makefile.linux,v 1.2 2004/01/13 03:57:55 paulus Exp $

 #***********************************************************************
 
 # Version is set ONLY IN THE MAKEFILE!  Don't delete this!
 VERSION=3.3
 
 #***********************************************************************
 
 # Version is set ONLY IN THE MAKEFILE!  Don't delete this!
 VERSION=3.3
 

-CFLAGS+=-I../../../include/linux
+COPTS=-O2 -g
+CFLAGS=$(COPTS) -I../../../include/linux

 all: rp-pppoe.so
 
 rp-pppoe.so: libplugin.a plugin.o
 all: rp-pppoe.so
 
 rp-pppoe.so: libplugin.a plugin.o