Modifed configure to point to 64-bit Makefile extension for Sol 7 and later

Added sparcv9 subdirectory into svr4/.cvsignore
Cleaned up svr4/Makefile.sol2
Added svr4/Makefile.sol2-64

diff --git a/configure b/configure
index cbb1d78f2ae596862c5b524b67b3ef88dbefa637..c8abdd50f091a3f43505b41a18985f144d1a0d74 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: configure,v 1.17 1999/05/13 00:31:34 paulus Exp $
+# $Id: configure,v 1.18 1999/09/13 20:57:53 masputra Exp $
 
 if [ -d /NextApps ]; then
   system="NeXTStep"
@@ -24,7 +24,8 @@ case $system in
     case $release in
       [0-3]*)  state="ancient";;
       4*)      state="known"; ksrc="sunos4"; makext="sunos4";;
-      5*)      state="known"; ksrc="svr4"; makext="sol2";;
+      5.[1-6]*)        state="known"; ksrc="svr4"; makext="sol2";;
+      5.[789]*)        state="known"; ksrc="svr4"; makext="sol2"; lp64="y";
     esac;;
   ULTRIX)
     makext="ultrix";
@@ -102,15 +103,25 @@ case $state in
     echo "in this distribution.  Sorry.";;
 esac
 
+orig_makext=$makext
+
 if [ -d "$ksrc" ]; then
   echo "Creating links to Makefiles."
   rm -f Makefile
   ln -s $ksrc/Makefile.top Makefile
   echo "  Makefile -> $ksrc/Makefile.top"
   if [ $ksrc = svr4 ]; then
+    # Point to 64-bit Makefile extension
+    if [ $lp64 = y ]; then 
+      makext=$makext-64 
+    fi
     rm -f $ksrc/Makefile
     ln -s Makefile.$makext $ksrc/Makefile
     echo "  $ksrc/Makefile -> Makefile.$makext"
+    # Restore extension
+    if [ $lp64 = y ]; then 
+      makext=$orig_makext 
+    fi
   fi
   for dir in pppd pppstats chat pppdump; do
     rm -f $dir/Makefile

diff --git a/svr4/.cvsignore b/svr4/.cvsignore
index f597ced5e5179b198562d66721780ca174407b16..4cbe14d41a2dee0db02bec80768f359d936f3991 100644 (file)
--- a/svr4/.cvsignore
+++ b/svr4/.cvsignore
@@ -2,3 +2,4 @@ ppp
 ppp_ahdl
 ppp_comp
 Makefile
+sparcv9

diff --git a/svr4/Makefile.sol2 b/svr4/Makefile.sol2
index b67ea69085a5ecf4fc301abbe8aec1e3529f36dd..01a017f176c45503d027c25a7a976990bd2c1b56 100644 (file)
--- a/svr4/Makefile.sol2
+++ b/svr4/Makefile.sol2
@@ -1,25 +1,29 @@
 #
 # Makefile for STREAMS modules for Solaris 2.
 #
-# $Id: Makefile.sol2,v 1.13 1999/02/26 10:53:28 paulus Exp $
+# $Id: Makefile.sol2,v 1.14 1999/09/13 20:57:54 masputra Exp $
 #
 
 include Makedefs
 
-CFLAGS= -D_KERNEL -DSVR4 -DSOL2 -I../include $(COPTS) -DPRIOQ -DDEBUG
+CFLAGS= -D_KERNEL -DSVR4 -DSOL2 -I../include -DPRIOQ -DDEBUG $(COPTS)
+
+COMP_OBJS = ppp_comp.o bsd-comp.o deflate.o zlib.o vjcompress.o \
+       ppp_comp_mod.o
 
 all:   ppp ppp_ahdl ppp_comp
 
 ppp:   ppp.o ppp_mod.o
        ld -r -o $@ ppp.o ppp_mod.o
+       chmod +x $@
 
 ppp_ahdl: ppp_ahdlc.o ppp_ahdlc_mod.o
        ld -r -o $@ ppp_ahdlc.o ppp_ahdlc_mod.o
+       chmod +x $@
 
-COMP_OBJS = ppp_comp.o bsd-comp.o deflate.o zlib.o vjcompress.o \
-       ppp_comp_mod.o
 ppp_comp: $(COMP_OBJS)
        ld -r -o $@ $(COMP_OBJS)
+       chmod +x $@
 
 bsd-comp.o: ../modules/bsd-comp.c
        $(CC) $(CFLAGS) -c $?

diff --git a/svr4/Makefile.sol2-64 b/svr4/Makefile.sol2-64
new file mode 100644 (file)
index 0000000..64cc9b7
--- /dev/null
+++ b/svr4/Makefile.sol2-64
@@ -0,0 +1,71 @@
+#
+# Makefile for 64-bit STREAMS modules for Solaris 2.
+#
+# $Id: Makefile.sol2-64,v 1.1 1999/09/13 20:57:54 masputra Exp $
+#
+
+include Makedefs
+
+COPTS += -xarch=v9
+LP64DIR = sparcv9
+STD_MAKE = Makefile.sol2
+
+CFLAGS= -D_KERNEL -DSVR4 -DSOL2 -I../include -DPRIOQ -DDEBUG $(COPTS)
+
+COMP_OBJS =    $(LP64DIR)/ppp_comp.o $(LP64DIR)/bsd-comp.o $(LP64DIR)/deflate.o        \
+               $(LP64DIR)/zlib.o $(LP64DIR)/vjcompress.o $(LP64DIR)/ppp_comp_mod.o
+
+all:   std_objs $(LP64DIR) ppp ppp_ahdl ppp_comp
+
+std_objs:
+       $(MAKE) -f $(STD_MAKE) all
+
+ppp:   $(LP64DIR)/ppp.o $(LP64DIR)/ppp_mod.o
+       ld -r -o $(LP64DIR)/$@ $(LP64DIR)/ppp.o $(LP64DIR)/ppp_mod.o
+       chmod +x $(LP64DIR)/$@
+
+ppp_ahdl: $(LP64DIR)/ppp_ahdlc.o $(LP64DIR)/ppp_ahdlc_mod.o
+       ld -r -o $(LP64DIR)/$@ $(LP64DIR)/ppp_ahdlc.o $(LP64DIR)/ppp_ahdlc_mod.o
+       chmod +x $(LP64DIR)/$@
+
+ppp_comp: $(COMP_OBJS)
+       ld -r -o $(LP64DIR)/$@ $(COMP_OBJS)
+       chmod +x $(LP64DIR)/$@
+
+$(LP64DIR)/bsd-comp.o: ../modules/bsd-comp.c
+       $(CC) $(CFLAGS) -c $? -o $@
+$(LP64DIR)/deflate.o: ../modules/deflate.c
+       $(CC) $(CFLAGS) -c $? -o $@
+$(LP64DIR)/ppp.o:      ../modules/ppp.c
+       $(CC) $(CFLAGS) -c $? -o $@
+$(LP64DIR)/ppp_mod.o:  ppp_mod.c
+       $(CC) $(CFLAGS) -c $? -o $@
+$(LP64DIR)/ppp_ahdlc_mod.o: ppp_ahdlc_mod.c
+       $(CC) $(CFLAGS) -c $? -o $@
+$(LP64DIR)/ppp_ahdlc.o: ../modules/ppp_ahdlc.c
+       $(CC) $(CFLAGS) -c $? -o $@
+$(LP64DIR)/ppp_comp.o: ../modules/ppp_comp.c
+       $(CC) $(CFLAGS) -c $? -o $@
+$(LP64DIR)/ppp_comp_mod.o: ppp_comp_mod.c
+       $(CC) $(CFLAGS) -c $? -o $@
+$(LP64DIR)/vjcompress.o: ../modules/vjcompress.c
+       $(CC) $(CFLAGS) -c $? -o $@
+$(LP64DIR)/zlib.o:     ../common/zlib.c
+       $(CC) $(CFLAGS) -c $? -o $@
+
+$(LP64DIR):
+       mkdir -m 755 -p $@
+
+install:
+       cp ppp ppp.conf /kernel/drv
+       cp ppp_comp ppp_ahdl /kernel/strmod
+       cp $(LP64DIR)/ppp /kernel/drv/$(LP64DIR)
+       cp $(LP64DIR)/ppp_comp $(LP64DIR)/ppp_ahdl /kernel/strmod/$(LP64DIR)
+       if grep clone:ppp /etc/minor_perm; then :; else \
+         echo clone:ppp 0644 root sys >>/etc/minor_perm; fi
+       /usr/sbin/rem_drv ppp 2>/dev/null || true
+       /usr/sbin/add_drv ppp
+
+clean:
+       $(MAKE) -f $(STD_MAKE) clean
+       rm -f $(LP64DIR)/ppp $(LP64DIR)/ppp_comp $(LP64DIR)/ppp_ahdl $(LP64DIR)/*.o $(LP64DIR)/*~ $(LP64DIR)/core