use Makedefs rather than passing lots of things on make command line

diff --git a/sunos4/Makedefs b/sunos4/Makedefs
new file mode 100644 (file)
index 0000000..8b56a2b
--- /dev/null
+++ b/sunos4/Makedefs
@@ -0,0 +1,13 @@
+#
+# defines common to several Makefiles
+#
+
+INSTALL= install -o root -g daemon
+
+BINDIR = /usr/local/etc
+MANDIR = /usr/local/man
+ETCDIR = /etc/ppp
+
+# To use gcc, uncomment the next line.
+#CC = gcc
+COPTS = -O

diff --git a/sunos4/Makefile.top b/sunos4/Makefile.top
index a0d31a95737fd8d3cfbca3a14c0c4fa322e9b220..25c3e0f8206bf1dda8ba092409bf51f68a4c6305 100644 (file)
--- a/sunos4/Makefile.top
+++ b/sunos4/Makefile.top
@@ -2,27 +2,21 @@
 # ppp top level makefile
 #
 
-BINDIR = /usr/local/etc
-MANDIR = /usr/local/man
-ETCDIR = /etc/ppp
-
-INSTALL= install -o root -g daemon
-
-MOPTS = $(MFLAGS) CC=$(CC) BINDIR=$(BINDIR) MANDIR=$(MANDIR)
+include sunos4/Makedefs
 
 all:
-       cd chat; $(MAKE) $(MOPTS) all
-       cd pppd; $(MAKE) $(MOPTS) all
-       cd pppstats; $(MAKE) $(MOPTS) all
-       cd sunos4; $(MAKE) $(MOPTS) all
+       cd chat; $(MAKE) all
+       cd pppd; $(MAKE) all
+       cd pppstats; $(MAKE) all
+       cd sunos4; $(MAKE) all
 
 install: $(BINDIR) $(MANDIR)/man8 install-progs install-etcppp
 
 install-progs:
-       cd chat; $(MAKE) $(MOPTS) install
-       cd pppd; $(MAKE) $(MOPTS) install
-       cd pppstats; $(MAKE) $(MOPTS) install
-       cd sunos4; $(MAKE) $(MOPTS) install
+       cd chat; $(MAKE) install
+       cd pppd; $(MAKE) install
+       cd pppstats; $(MAKE) install
+       cd sunos4; $(MAKE) install
 
 install-etcppp: $(ETCDIR) $(ETCDIR)/options $(ETCDIR)/pap-secrets \
        $(ETCDIR)/chap-secrets

diff --git a/svr4/Makedefs b/svr4/Makedefs
new file mode 100644 (file)
index 0000000..5a0dc11
--- /dev/null
+++ b/svr4/Makedefs
@@ -0,0 +1,18 @@
+#
+# defines common to several Makefiles
+#
+
+INSTALL= /usr/sbin/install
+
+#BINDIR = /usr/local/bin
+#MANDIR = /usr/local/man
+BINDIR = /data/paulus/bin
+MANDIR = /data/paulus/man
+ETCDIR = /etc/ppp
+
+COPTS = -O -Xa -w
+
+# For compiling with gcc, comment out the COPTS definition above and
+# uncomment the next 2 definitions.
+#CC = gcc
+#COPTS = -O2

diff --git a/svr4/Makefile.sol2 b/svr4/Makefile.sol2
index b89540a6a6824bf86062f6d567797838326250b1..887d10aded3cbbc9986c7e9b93b014d4eeada70b 100644 (file)
--- a/svr4/Makefile.sol2
+++ b/svr4/Makefile.sol2
@@ -1,14 +1,10 @@
 #
 # Makefile for STREAMS modules for Solaris 2.
 #
-# $Id: Makefile.sol2,v 1.10 1997/03/04 03:45:00 paulus Exp $
+# $Id: Makefile.sol2,v 1.11 1998/02/04 01:43:22 paulus Exp $
 #
 
-COPTS = -O -Xa -w
-
-# If you prefer to use gcc...
-#CC = gcc
-#COPTS = -O2
+include Makedefs
 
 CFLAGS= -D_KERNEL -DSVR4 -DSOL2 -I.. $(COPTS) -DPRIOQ
 

diff --git a/svr4/Makefile.top b/svr4/Makefile.top
index ea84d2e79a8a2377f6c43b9d1e136a61b1830c8a..0d01d204a6608bde8fa5037c105dc0feaecc1946 100644 (file)
--- a/svr4/Makefile.top
+++ b/svr4/Makefile.top
@@ -1,36 +1,24 @@
 #
 # ppp top level makefile for SVR4 and Solaris 2
 #
-# $Id: Makefile.top,v 1.5 1996/09/26 06:18:16 paulus Exp $
+# $Id: Makefile.top,v 1.6 1998/02/04 01:43:23 paulus Exp $
 #
 
-BINDIR = /usr/local/bin
-MANDIR = /usr/local/man
-ETCDIR = /etc/ppp
-
-INSTALL= /usr/sbin/install
-
-COPTS = -O -Xa -w
-
-# If you want to use gcc...
-#CC = gcc
-#COPTS = -O2
-
-MARGS = BINDIR=$(BINDIR) MANDIR=$(MANDIR) CC=$(CC) COPTS="$(COPTS)"
+include svr4/Makedefs
 
 all:
-       cd chat; $(MAKE) $(MARGS) all
-       cd pppd; $(MAKE) $(MARGS) all
-       cd pppstats; $(MAKE) $(MARGS) all
-       cd svr4; $(MAKE) $(MARGS) all
+       cd chat; $(MAKE) all
+       cd pppd; $(MAKE) all
+       cd pppstats; $(MAKE) all
+       cd svr4; $(MAKE) all
 
 install: $(BINDIR) $(MANDIR)/man8 install-progs install-etcppp
 
 install-progs:
-       cd chat; $(MAKE) $(MARGS) install
-       cd pppd; $(MAKE) $(MARGS) install
-       cd pppstats; $(MAKE) $(MARGS) install
-       cd svr4; $(MAKE) $(MARGS) install
+       cd chat; $(MAKE) install
+       cd pppd; $(MAKE) install
+       cd pppstats; $(MAKE) install
+       cd svr4; $(MAKE) install
 
 install-etcppp: $(ETCDIR) $(ETCDIR)/options $(ETCDIR)/pap-secrets \
        $(ETCDIR)/chap-secrets
@@ -52,8 +40,8 @@ $(ETCDIR):
 
 clean:
        rm -f *~
-       cd chat; $(MAKE) $(MARGS) clean
-       cd pppd; $(MAKE) $(MARGS) clean
-       cd pppstats; $(MAKE) $(MARGS) clean
-       cd svr4; $(MAKE) $(MARGS) clean
+       cd chat; $(MAKE) clean
+       cd pppd; $(MAKE) clean
+       cd pppstats; $(MAKE) clean
+       cd svr4; $(MAKE) clean