- markus@cvs.openbsd.org 2001/11/07 22:53:21

[openssh.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 3f1c387c6cc2ef716720f117029e028730effab0..d20bfca54efa0b60b0ef483b0827bd5d3ce96378 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -5,6 +5,7 @@ exec_prefix=@exec_prefix@
 bindir=@bindir@
 sbindir=@sbindir@
 libexecdir=@libexecdir@
+datadir=@datadir@
 mandir=@mandir@
 mansubdir=@mansubdir@
 sysconfdir=@sysconfdir@
@@ -45,7 +46,7 @@ INSTALL_SSH_PRNG_CMDS=@INSTALL_SSH_PRNG_CMDS@
 
 TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-agent$(EXEEXT) scp$(EXEEXT) $(SFTP_PROGS)
 
-LIBSSH_OBJS=atomicio.o authfd.o authfile.o bufaux.o buffer.o canohost.o channels.o cipher.o cli.o compat.o compress.o crc32.o deattack.o dh.o dispatch.o mac.o hostfile.o key.o kex.o kexdh.o kexgex.o log.o match.o misc.o mpaux.o nchan.o packet.o radix.o rijndael.o entropy.o readpass.o rsa.o ssh-dss.o ssh-rsa.o tildexpand.o ttymodes.o uidswap.o uuencode.o xmalloc.o 
+LIBSSH_OBJS=atomicio.o authfd.o authfile.o bufaux.o buffer.o canohost.o channels.o cipher.o compat.o compress.o crc32.o deattack.o dh.o dispatch.o mac.o hostfile.o key.o kex.o kexdh.o kexgex.o log.o match.o misc.o mpaux.o nchan.o packet.o radix.o rijndael.o entropy.o readpass.o rsa.o scard.o ssh-dss.o ssh-rsa.o tildexpand.o ttymodes.o uidswap.o uuencode.o xmalloc.o 
 
 SSHOBJS= ssh.o sshconnect.o sshconnect1.o sshconnect2.o sshtty.o readconf.o clientloop.o
 
@@ -55,8 +56,8 @@ MANPAGES      = scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.
 MANPAGES_IN    = scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1
 MANTYPE                = @MANTYPE@
 
-CONFIGFILES=sshd_config.out ssh_config.out primes.out
-CONFIGFILES_IN=sshd_config ssh_config primes
+CONFIGFILES=sshd_config.out ssh_config.out moduli.out
+CONFIGFILES_IN=sshd_config ssh_config moduli
 
 PATHSUBS       = \
        -D/etc/ssh_config=$(sysconfdir)/ssh_config \
@@ -68,7 +69,7 @@ PATHSUBS      = \
        -D/etc/ssh_host_dsa_key=$(sysconfdir)/ssh_host_dsa_key \
        -D/etc/ssh_host_rsa_key=$(sysconfdir)/ssh_host_rsa_key \
        -D/var/run/sshd.pid=$(piddir)/sshd.pid \
-       -D/etc/primes=$(sysconfdir)/primes \
+       -D/etc/moduli=$(sysconfdir)/moduli \
        -D/etc/sshrc=$(sysconfdir)/sshrc \
        -D/usr/X11R6/bin/xauth=$(XAUTH_PATH) \
        -D/usr/bin:/bin:/usr/sbin:/sbin=@user_path@
@@ -85,8 +86,9 @@ $(SSHDOBJS): config.h
        $(CC) $(CFLAGS) $(CPPFLAGS) -c $<
 
 LIBCOMPAT=openbsd-compat/libopenbsd-compat.a
-$(LIBCOMPAT): config.h
-       (cd openbsd-compat; $(MAKE))
+$(LIBCOMPAT): always
+       (cd openbsd-compat && $(MAKE))
+always:
 
 libssh.a: $(LIBSSH_OBJS)
        $(AR) rv $@ $(LIBSSH_OBJS)
@@ -111,7 +113,7 @@ ssh-keygen$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keygen.o
        $(LD) -o $@ ssh-keygen.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) 
 
 ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keyscan.o
-       $(LD) -o $@ ssh-keyscan.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) 
+       $(LD) -o $@ ssh-keyscan.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS) 
 
 sftp-server$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-common.o sftp-server.o
        $(LD) -o $@ sftp-server.o sftp-common.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) 
@@ -140,19 +142,28 @@ $(CONFIGFILES): $(CONFIGFILES_IN)
        $(FIXPATHSCMD) $(srcdir)/$${conffile} > $@
 
 clean:
-       (cd openbsd-compat; $(MAKE) clean)
+       rm -f *.o *.a $(TARGETS) logintest config.cache config.log 
+       rm -f *.out core 
+       (cd openbsd-compat && $(MAKE) clean)
+
+distclean:
        rm -f *.o *.a $(TARGETS) logintest config.cache config.log 
        rm -f *.out core
+       rm -f Makefile config.h config.status ssh_prng_cmds *~
+       rm -rf autom4te.cache
+       (cd openbsd-compat && $(MAKE) distclean)
+       (cd scard && $(MAKE) distclean)
 
-distclean: clean
-       (cd openbsd-compat; $(MAKE) distclean)
+veryclean:
+       rm -f configure config.h.in *.0
+       rm -f *.o *.a $(TARGETS) logintest config.cache config.log 
+       rm -f *.out core
        rm -f Makefile config.h config.status ssh_prng_cmds *~
+       (cd openbsd-compat && $(MAKE) distclean)
+       (cd scard && $(MAKE) distclean)
 
 mrproper: distclean
 
-veryclean: distclean
-       rm -f configure config.h.in *.0
-
 catman-do:
        @for f in $(MANPAGES_IN) ; do \
                base=`echo $$f | sed 's/\..*$$//'` ; \
@@ -163,13 +174,19 @@ catman-do:
 
 distprep: catman-do
        autoreconf
+       (cd scard && $(MAKE) -f Makefile.in distprep)
+
+install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files host-key
+install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files
 
-install: $(TARGETS) install-files host-key
+scard-install:
+       (cd scard && $(MAKE) DESTDIR=$(DESTDIR) install)
 
-install-files:
+install-files: scard-install
        $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
        $(srcdir)/mkinstalldirs $(DESTDIR)$(sbindir)
        $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)
+       $(srcdir)/mkinstalldirs $(DESTDIR)$(datadir)
        $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)1
        $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)8
        $(srcdir)/mkinstalldirs $(DESTDIR)$(libexecdir)
@@ -195,7 +212,7 @@ install-files:
        ln -s ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin
        -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
        ln -s ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1
-       @FILEPRIV@ -f dev,filesys,driver $(DESTDIR)$(bindir)/ssh $(DESTDIR)$(bindir)/slogin
+       #@FILEPRIV@ -f dev,filesys,driver $(DESTDIR)$(bindir)/ssh $(DESTDIR)$(bindir)/slogin
        if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \
                $(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \
        fi
@@ -217,10 +234,15 @@ install-files:
                        echo "$(DESTDIR)$(sysconfdir)/ssh_prng_cmds already exists, install will not overwrite"; \
                fi ; \
        fi
-       if [ ! -f $(DESTDIR)$(sysconfdir)/primes ]; then \
-               $(INSTALL) -m 644 primes.out $(DESTDIR)$(sysconfdir)/primes; \
+       if [ ! -f $(DESTDIR)$(sysconfdir)/moduli ]; then \
+               if [ -f $(DESTDIR)$(sysconfdir)/primes ]; then \
+                       echo "moving $(DESTDIR)$(sysconfdir)/primes to $(DESTDIR)$(sysconfdir)/moduli"; \
+                       mv "$(DESTDIR)$(sysconfdir)/primes" "$(DESTDIR)$(sysconfdir)/moduli"; \
+               else \
+                       $(INSTALL) -m 644 moduli.out $(DESTDIR)$(sysconfdir)/moduli; \
+               fi ; \
        else \
-               echo "$(DESTDIR)$(sysconfdir)/primes already exists, install will not overwrite"; \
+               echo "$(DESTDIR)$(sysconfdir)/moduli already exists, install will not overwrite"; \
        fi
 
 host-key: ssh-keygen$(EXEEXT)