From: Paul Mackerras <paulus@samba.org>
Date: Wed, 4 Feb 1998 01:43:23 +0000 (+0000)
Subject: use Makedefs rather than passing lots of things on make command line
X-Git-Tag: RELEASE_2_3_6~124
X-Git-Url: https://git.ozlabs.org/?p=ppp.git;a=commitdiff_plain;h=91fc199e719dbc63e285c677a2d559bf3894bbab;ds=inline

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

diff --git a/sunos4/Makedefs b/sunos4/Makedefs
new file mode 100644
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 a0d31a9..25c3e0f 100644
--- 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
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 b89540a..887d10a 100644
--- 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 ea84d2e..0d01d20 100644
--- 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