*** Makefile.in.old	Tue Oct 22 02:26:19 1996
--- Makefile.in	Tue Oct 22 02:30:18 1996
***************
*** 159,170 ****
  SHELL = /bin/sh
  
  GMPDIR 		= gmp-2.0.2-ssh-2
! GMPLIBS 	= -L$(GMPDIR) -lgmp
! GMPDEP 		= $(GMPDIR)/gmp.h $(GMPDIR)/libgmp.a
  
  ZLIBDIR		= zlib-1.0.3
! ZLIBDEP		= $(ZLIBDIR)/libz.a
! ZLIBLIBS	= -L$(ZLIBDIR) -lz
  
  RSAREFDIR	= rsaref2
  RSAREFSRCDIR 	= $(RSAREFDIR)/source
--- 159,176 ----
  SHELL = /bin/sh
  
  GMPDIR 		= gmp-2.0.2-ssh-2
! # We have the same libgmp in the system, so use it instead
! GMPINCDIR       = /usr/include
! GMPLIBDIR       = /usr/lib
! GMPDEP		= $(GMPINCDIR)/gmp.h $(GMPLIBDIR)/libgmp.a
! GMPLIBS		= -L$(GMPLIBDIR) -lgmp
  
  ZLIBDIR		= zlib-1.0.3
! # We have newer libz in the system, so use it instead
! ZLIBINCDIR	= /usr/include
! ZLIBLIBDIR	= /usr/lib
! ZLIBDEP		= $(ZLIBINCDIR)/zlib.h $(ZLIBLIBDIR)/libz.a
! ZLIBLIBS	= -L$(ZLIBLIBDIR) -lz
  
  RSAREFDIR	= rsaref2
  RSAREFSRCDIR 	= $(RSAREFDIR)/source
***************
*** 248,254 ****
  	$(CC) -o rfc-pg rfc-pg.c
  
  .c.o:
! 	$(CC) -c -I. -I$(srcdir)/$(GMPDIR) -I$(srcdir)/$(ZLIBDIR) $(DEFS) -DHOST_KEY_FILE=\"$(HOST_KEY_FILE)\" -DHOST_CONFIG_FILE=\"$(HOST_CONFIG_FILE)\" -DSERVER_CONFIG_FILE=\"$(SERVER_CONFIG_FILE)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DETCDIR=\"$(etcdir)\" -DPIDDIR=\"$(piddir)\" -DSSH_BINDIR=\"$(bindir)\" $(CFLAGS) $(X_CFLAGS) $<
  
  sshd: $(SSHD_OBJS) $(GMPDEP) $(RSAREFDEP) $(ZLIBDEP)
  	-rm -f sshd
--- 254,260 ----
  	$(CC) -o rfc-pg rfc-pg.c
  
  .c.o:
! 	$(CC) -c -I. -I$(GMPINCDIR) -I$(ZLIBINCDIR) $(DEFS) -DHOST_KEY_FILE=\"$(HOST_KEY_FILE)\" -DHOST_CONFIG_FILE=\"$(HOST_CONFIG_FILE)\" -DSERVER_CONFIG_FILE=\"$(SERVER_CONFIG_FILE)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DETCDIR=\"$(etcdir)\" -DPIDDIR=\"$(piddir)\" -DSSH_BINDIR=\"$(bindir)\" $(CFLAGS) $(X_CFLAGS) $<
  
  sshd: $(SSHD_OBJS) $(GMPDEP) $(RSAREFDEP) $(ZLIBDEP)
  	-rm -f sshd
***************
*** 292,310 ****
  	./gen_minfd $(USER_SHELLS) > minfd.h~
  	mv -f minfd.h~ minfd.h
  
! GMP_COPY_SOURCES = mpz_gcd.c mpz_powm.c mpz_pow_ui.c mpz_add.c mpz_sub.c \
! 		mpz_mul.c mpz_cmp.c mpz_sqrtrem.c
! $(GMPDIR)/libgmp.a:
! 	cd $(GMPDIR); $(MAKE)
! 
! $(ZLIBDEP):
! 	-if test '!' -d $(ZLIBDIR); then \
! 	  mkdir $(ZLIBDIR); \
! 	  cp $(srcdir)/$(ZLIBDIR)/Makefile $(ZLIBDIR); \
! 	fi
! 	cd $(ZLIBDIR); $(MAKE) VPATH=$(srcdir)/$(ZLIBDIR):../$(srcdir)/$(ZLIBDIR) \
! 	  CC="$(CC)" CFLAGS="$(CFLAGS) -I. -I$(srcdir)/$(ZLIBDIR) \
! 	    -I../$(srcdir)/$(GMPDIR)" RANLIB="$(RANLIB)" libz.a
  
  $(RSAREFSRCDIR)/librsaref.a:
  	-if test '!' -d $(RSAREFDIR); then \
--- 298,316 ----
  	./gen_minfd $(USER_SHELLS) > minfd.h~
  	mv -f minfd.h~ minfd.h
  
! #GMP_COPY_SOURCES = mpz_gcd.c mpz_powm.c mpz_pow_ui.c mpz_add.c mpz_sub.c \
! #		mpz_mul.c mpz_cmp.c mpz_sqrtrem.c
! #$(GMPDIR)/libgmp.a:
! #	cd $(GMPDIR); $(MAKE)
! 
! #$(ZLIBDIR)/libz.a:
! #        -if test '!' -d $(ZLIBDIR); then \
! #          mkdir $(ZLIBDIR); \
! #          cp $(srcdir)/$(ZLIBDIR)/Makefile $(ZLIBDIR); \
! #        fi
! #        cd $(ZLIBDIR); $(MAKE) VPATH=$(srcdir)/$(ZLIBDIR):../$(srcdir)/$(ZLIBDIR) \
! #          CC="$(CC)" CFLAGS="$(CFLAGS) -I. -I$(srcdir)/$(ZLIBDIR) \
! #            -I../$(srcdir)/$(GMPDIR)" RANLIB="$(RANLIB)" libz.a
  
  $(RSAREFSRCDIR)/librsaref.a:
  	-if test '!' -d $(RSAREFDIR); then \
***************
*** 361,367 ****
  # (otherwise it can only log in as the user it runs as, and must be
  # bound to a non-privileged port).  Also, password authentication may
  # not be available if non-root and using shadow passwords.
! install: $(PROGRAMS) make-dirs generate-host-key install-configs
  	$(INSTALL_PROGRAM) -o root -m 04711 ssh $(install_prefix)$(bindir)/ssh
  	-if test "`echo ssh | sed '$(transform)'`" '!=' ssh; then \
  	  rm -f $(install_prefix)$(bindir)/`echo ssh | sed '$(transform)'`; \
--- 367,373 ----
  # (otherwise it can only log in as the user it runs as, and must be
  # bound to a non-privileged port).  Also, password authentication may
  # not be available if non-root and using shadow passwords.
! install: $(PROGRAMS) make-dirs install-configs
  	$(INSTALL_PROGRAM) -o root -m 04711 ssh $(install_prefix)$(bindir)/ssh
  	-if test "`echo ssh | sed '$(transform)'`" '!=' ssh; then \
  	  rm -f $(install_prefix)$(bindir)/`echo ssh | sed '$(transform)'`; \
***************
*** 462,488 ****
  
  clean:
  	-rm -f *.o gmon.out *core $(PROGRAMS) rfc-pg
! 	cd $(GMPDIR); $(MAKE) clean
  #	cd $(RSAREFSRCDIR); rm -f *.o *.a
! 	cd $(ZLIBDIR); $(MAKE) clean
  
  distclean: clean
  	-rm -f Makefile config.status config.cache config.log config.h
  	-rm -f ssh.1 sshd.8 make-ssh-known-hosts.1
! 	cd $(GMPDIR); $(MAKE) distclean
! 	cd $(ZLIBDIR); $(MAKE) distclean
  
  dist:
  	-rm -rf $(DISTNAME)
  	-mkdir $(DISTNAME)
  	cp $(DISTFILES) $(DISTNAME)
  	-rm $(DISTNAME)/config.h
! 	tar pcf - $(GMPDIR) | (cd $(DISTNAME); tar pxf -)
! 	cd $(DISTNAME)/$(GMPDIR); $(MAKE) distclean
  #	tar cf - $(RSAREFDIR) | (cd $(DISTNAME); tar xf -)
  #	cd $(DISTNAME)/$(RSAREFSRCDIR); rm -f *.o *.a
! 	tar pcf - $(ZLIBDIR) | (cd $(DISTNAME); tar pxf -)
! 	cd $(DISTNAME)/$(ZLIBDIR); rm -f *.o *.a
  	tar pcf $(DISTNAME).tar $(DISTNAME)
  	-rm -f $(DISTNAME).tar.gz
  	gzip $(DISTNAME).tar
--- 468,494 ----
  
  clean:
  	-rm -f *.o gmon.out *core $(PROGRAMS) rfc-pg
! #	cd $(GMPDIR); $(MAKE) clean
  #	cd $(RSAREFSRCDIR); rm -f *.o *.a
! #       cd $(ZLIBDIR); $(MAKE) clean
  
  distclean: clean
  	-rm -f Makefile config.status config.cache config.log config.h
  	-rm -f ssh.1 sshd.8 make-ssh-known-hosts.1
! #	cd $(GMPDIR); $(MAKE) distclean
! #       cd $(ZLIBDIR); $(MAKE) distclean
  
  dist:
  	-rm -rf $(DISTNAME)
  	-mkdir $(DISTNAME)
  	cp $(DISTFILES) $(DISTNAME)
  	-rm $(DISTNAME)/config.h
! #       tar pcf - $(GMPDIR) | (cd $(DISTNAME); tar pxf -)
! #	cd $(DISTNAME)/$(GMPDIR); $(MAKE) distclean
  #	tar cf - $(RSAREFDIR) | (cd $(DISTNAME); tar xf -)
  #	cd $(DISTNAME)/$(RSAREFSRCDIR); rm -f *.o *.a
! #       tar pcf - $(ZLIBDIR) | (cd $(DISTNAME); tar pxf -)
! #       cd $(DISTNAME)/$(ZLIBDIR); rm -f *.o *.a
  	tar cf $(DISTNAME).tar $(DISTNAME)
  	-rm -f $(DISTNAME).tar.gz
  	gzip $(DISTNAME).tar
***************
*** 494,500 ****
  	 (echo "s/\.$$old_version\"/.$$new_version\"/g"; echo w; echo q) | ed version.h >/dev/null
  
  depend:
! 	$(MAKEDEP) -I$(srcdir) -I. -I$(GMPDIR) -I$(ZLIBDIR) $(DEFS) $(SRCS)
  
  tags:
  	find config.h $(srcdir) -name '*.[chly]' -print | xargs etags -a
--- 500,506 ----
  	 (echo "s/\.$$old_version\"/.$$new_version\"/g"; echo w; echo q) | ed version.h >/dev/null
  
  depend:
! 	$(MAKEDEP) -I$(srcdir) -I. $(DEFS) $(SRCS)
  
  tags:
  	find config.h $(srcdir) -name '*.[chly]' -print | xargs etags -a