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

[openssh.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 2109e8af9f05eaa35066630cdf08971c36e9dbb2..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@
@@ -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) 
@@ -141,21 +143,24 @@ $(CONFIGFILES): $(CONFIGFILES_IN)
 
 clean:
        rm -f *.o *.a $(TARGETS) logintest config.cache config.log 
-       rm -f *.out core
-       (cd openbsd-compat; $(MAKE) clean)
+       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 *~
-       (cd openbsd-compat; $(MAKE) distclean)
+       rm -rf autom4te.cache
+       (cd openbsd-compat && $(MAKE) distclean)
+       (cd scard && $(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 openbsd-compat && $(MAKE) distclean)
+       (cd scard && $(MAKE) distclean)
 
 mrproper: distclean
 
@@ -169,14 +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-files:
+scard-install:
+       (cd scard && $(MAKE) DESTDIR=$(DESTDIR) install)
+
+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)
@@ -202,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