Merge in 1.3 and post 1.3 fixes; some of them might be applicable to

[ppp.git] / svr4 / Makefile.sol2

diff --git a/svr4/Makefile.sol2 b/svr4/Makefile.sol2
index 0ea1175d3ef38606ba2328d80f957c5b4d66aaf5..ac4f6f5192367e74115848118a4ae3e063a72305 100644 (file)
--- a/svr4/Makefile.sol2
+++ b/svr4/Makefile.sol2
@@ -1,10 +1,12 @@
 #
 # Makefile for STREAMS modules for Solaris 2.
 #
-# $Id: Makefile.sol2,v 1.2 1995/12/11 05:19:29 paulus Exp $
+# $Id: Makefile.sol2,v 1.12 1998/03/25 03:09:57 paulus Exp $
 #
 
-CFLAGS= -D_KERNEL -DSVR4 -DSOL2 -I.. -O -Xa
+include Makedefs
+
+CFLAGS= -D_KERNEL -DSVR4 -DSOL2 -I../include $(COPTS) -DPRIOQ
 
 all:   ppp ppp_ahdl ppp_comp
 
@@ -14,11 +16,15 @@ ppp:        ppp.o ppp_mod.o
 ppp_ahdl: ppp_ahdlc.o ppp_ahdlc_mod.o
        ld -r -o $@ ppp_ahdlc.o ppp_ahdlc_mod.o
 
-ppp_comp: ppp_comp.o bsd-comp.o vjcompress.o ppp_comp_mod.o
-       ld -r -o $@ ppp_comp.o bsd-comp.o vjcompress.o ppp_comp_mod.o
+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)
 
 bsd-comp.o: ../modules/bsd-comp.c
        $(CC) $(CFLAGS) -c $?
+deflate.o: ../modules/deflate.c
+       $(CC) $(CFLAGS) -c $?
 ppp.o: ../modules/ppp.c
        $(CC) $(CFLAGS) -c $?
 ppp_ahdlc.o: ../modules/ppp_ahdlc.c
@@ -27,12 +33,15 @@ ppp_comp.o: ../modules/ppp_comp.c
        $(CC) $(CFLAGS) -c $?
 vjcompress.o: ../modules/vjcompress.c
        $(CC) $(CFLAGS) -c $?
+zlib.o:        ../common/zlib.c
+       $(CC) $(CFLAGS) -c $?
 
 install: all
        cp ppp ppp.conf /kernel/drv
        cp ppp_comp ppp_ahdl /kernel/strmod
        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: