Commit e3bacacf authored by Niels Möller's avatar Niels Möller

*** empty log message ***

Rev: .cvsignore:1.1
Rev: Makefile.am.in:1.1
Rev: configure.in:1.1
Rev: doc/.cvsignore:1.2
Rev: install-sh:1.1
Rev: make_am:1.1
Rev: src/Makefile.am.in:1.27
Rev: src/acconfig.h:1.7(DEAD)
Rev: src/configure.in:1.28(DEAD)
Rev: src/install-sh:1.2(DEAD)
Rev: src/make_am:1.6(DEAD)
Rev: src/symmetric/Makefile.am.in:1.9
parent 14012ed6
Makefile
Makefile.am
Makefile.in
acconfig.h
aclocal.m4
config.cache
config.h
config.h.in
config.log
config.status
configure
stamp-h
stamp-h.in
......@@ -30,3 +30,16 @@ _$*
*.elc
*.ln
core
/Makefile
/Makefile.am
/Makefile.in
/acconfig.h
/aclocal.m4
/config.cache
/config.h
/config.h.in
/config.log
/config.status
/configure
/stamp-h
/stamp-h.in
## Process this file with make_am to produce Makefile.am
SUBDIRS: src doc
BODY:
AUTOMAKE_OPTIONS = foreign
Makefile.am: Makefile.am.in
$(BASH) make_am
# Is this rule needed?
all-recursive check-recursive: config.h
EXTRA_DIST = AUTHORS FAQ README COPYING ChangeLog NEWS
......@@ -2,7 +2,7 @@ dnl -*-shell-script-*-
dnl $Id$
dnl Process this file with autoconf to produce a configure script.
AC_INIT(keyexchange.h)
AC_INIT(src/lsh_types.h)
dnl No real versioning yet, use dated snapshots instead.
dnl AM_INIT_AUTOMAKE(lsh, snapshot-`date +%Y-%m-%d`)
......@@ -23,7 +23,7 @@ If this does not work, please use an absolute path to the configure script. ])
esac
# We want to compile the crypto lib for use with lsh
CPPFLAGS="$CPPFLAGS -I$srcdir/include -I$srcdir -DLSH"
CPPFLAGS="$CPPFLAGS -I$srcdir -I$srcdir/src -I$srcdir/src/symmetric/include -DLSH"
# GNU libc defaults to supplying the ISO C library functions only.
# initgroups() and strsignal() are extensions; the _GNU_SOURCE define
......@@ -67,6 +67,8 @@ AC_PROG_CC
AC_PROG_MAKE_SET
AC_PROG_RANLIB
AM_PROG_CC_STDC
AC_CHECK_PROG(SCHEME, scsh,, scsh)
AC_CHECK_PROG(BASH, bash,, bash)
if test x$am_cv_prog_cc_stdc = xno ; then
AC_ERROR([the C compiler doesn't handle ANSI-C])
......@@ -168,13 +170,13 @@ AC_CHECK_FUNCS(select socket strerror strtol)
AC_CHECK_FUNCS(getspnam)
AC_CHECK_FUNCS(vsnprintf inet_aton)
AC_CHECK_FUNCS(poll,,[LIBOBJS = jpoll.o $LIBOBJS])
AC_CHECK_FUNCS(poll,,[LIBOBJS="jpoll.o $LIBOBJS"])
dnl This macro is mentioned in the automake manual, but where is it
dnl supposed to be defined?
dnl AC_REPLACE_GNU_GETOPT
AC_CHECK_FUNCS(getopt_long,,[LIBOBJS = getopt.o getopt1.o $LIBOBJS])
AC_CHECK_FUNCS(getopt_long,,[LIBOBJS="getopt.o getopt1.o $LIBOBJS"])
dnl Check for broken shutdown
AC_CACHE_CHECK(for working shutdown on AF_UNIX sockets,
......@@ -290,4 +292,5 @@ if test x$GCC = xyes ; then
fi
AC_OUTPUT(Makefile lib/Makefile include/Makefile doc/Makefile)
AC_OUTPUT(Makefile doc/Makefile
src/Makefile src/symmetric/Makefile src/symmetric/include/Makefile)
Makefile
Makefile.am
Makefile.in
/Makefile
/Makefile.am
/Makefile.in
......@@ -94,25 +94,24 @@ while true; do
# comm -12 - <(./cvs_headers $dir) | sed 's/\$/ \\\\/';
if [ $rethink = yes ]; then
add_command "(echo $args = .dist_headers\\\\;
add_command "( (echo $args = .dist_headers;
comm -12 - <(./cvs_headers $dir) \\
| tee $dir/.dist_headers | tr '\\n' ' ';
| tee $dir/.dist_headers ) | tr '\\n' ' ';
echo) 1>&4"
else
(echo $args = .dist_headers \\
tr <$dir/.dist_headers '\n' ' '
( (echo $args = .dist_headers ' '
cat $dir/.dist_headers) | tr '\n' ' '
echo) 1>&4
fi
;;
CLASS_FILES)
( echo $args = .dist_classes \\;
( ( echo $args = .dist_classes;
if [ $rethink = yes ]; then
./used_headers .x $dir | tee $dir/.dist_classes \
| tr '\n' ' '
./used_headers .x $dir | tee $dir/.dist_classes
else
tr <$dir/.dist_classes '\n' ' '
fi
cat $dir/.dist_classes
fi) | tr '\n' ' '
echo) 1>&4
;;
SUBDIRS)
......
## Process this file with make_am to produce Makefile.am
SUBDIRS: lib include doc
SUBDIRS: symmetric
CVS_HEADERS: cvs_headers
CLASS_FILES: dist_x_files
BODY:
AUTOMAKE_OPTIONS = foreign
SUBDIRS = lib include
# To remake all Makefile.am-files, run
#
......@@ -18,7 +17,7 @@ SUBDIRS = lib include
# subdrectries.
Makefile.am: Makefile.am.in
./make_am
(cd $(top_srcdir); $(BASH) make_am)
bin_PROGRAMS = lsh lshd lsh_keygen lsh_writekey
noinst_PROGRAMS = prime_table digit_table sexp_test
......@@ -34,7 +33,7 @@ liblsh_a_SOURCES = abstract_io.c abstract_crypto.c abstract_compress.c \
algorithms.c alist.c arcfour.c atoms.c \
bignum.c blocking_write.c blowfish.c \
cascade.c cbc.c channel.c charset.c compress.c connection.c crypto.c \
debug.c des.c disconnect.c dss_keygen.c encrypt.c \
debug.c des.c disconnect.c dsa_keygen.c encrypt.c \
format.c gc.c hmac.c io.c keyexchange.c \
list.c md5.c packet_ignore.c pad.c parse.c password.c publickey_crypto.c \
randomness.c \
......@@ -53,14 +52,14 @@ lshd_SOURCES = lshd.c reaper.c server.c server_keyexchange.c \
lsh_keygen_SOURCES = lsh_keygen.c
atoms_defines.h: atoms.in process_atoms
bash $(srcdir)/process_atoms header <$(srcdir)/atoms.in >$@
$(BASH) $(srcdir)/process_atoms header <$(srcdir)/atoms.in >$@
atoms_gperf.c: atoms.in process_atoms
bash $(srcdir)/process_atoms gperf <$(srcdir)/atoms.in \
$(BASH) $(srcdir)/process_atoms gperf <$(srcdir)/atoms.in \
| gperf >$@ -LANSI-C -t -c -l -k1,7,$$ -N gperf_atom
atoms_table.c: atoms.in process_atoms
bash $(srcdir)/process_atoms table <$(srcdir)/atoms.in >$@
$(BASH) $(srcdir)/process_atoms table <$(srcdir)/atoms.in >$@
PRIME_LIMIT = 1024
......@@ -70,17 +69,17 @@ prime_table.h: prime_table
prime_table_LDADD =
sexp_table.h: sexp_chars.in $(srcdir)/make_char_classes
$(srcdir)/make_char_classes <$< >$@
$(SCHEME) $(srcdir)/make_char_classes <$< >$@
digit_table_LDADD =
digit_table.h: digit_table
./digit_table >$@
LDADD = @LIBOBJS@ liblsh.a lib/libsymmetric.a
LDADD = @LIBOBJS@ liblsh.a symmetric/libsymmetric.a
# Is this rule needed?
all-recursive check-recursive: config.h
# all-recursive check-recursive: config.h
# lsh_LDADD = @LIBOBJS@ liblsh.a lib/libsymmetric.a
# lshd_LDADD = @LIBOBJS@ liblsh.a lib/libsymmetric.a
......@@ -155,5 +154,5 @@ distclean-tags:
# This is GNU make specific
%.x: % $(srcdir)/make_class
$(srcdir)/make_class <$< >$@
$(SCHEME) $(srcdir)/make_class <$< >$@
/* The name and version of this software distribution. These
* originates from AM_INIT_AUTOMAKE in the configure.in file. */
#define PACKAGE "configure-generated"
#define VERSION "configure-generated"
/* Define to enable sanity checking on memory allocation and casting */
#undef DEBUG_ALLOC
/* Define if zlib should be used */
#undef WITH_ZLIB
/* Define to enable fallback to SSH1 */
#undef SSH1_FALLBACK
/* Location of the SSH1 daemon*/
#undef SSHD1
/* Define if IDEA should be used */
#undef WITH_IDEA
/* Define to indicate that shutdown seems to work properly */
#undef SHUTDOWN_WORKS_WITH_UNIX_SOCKETS
/* Define if the compiler understands __attribute__ */
#undef HAVE_ATTRIBUTE
## Process this file with make_am to produce Makefile.am
SUBDIRS: include
CVS_HEADERS: cvs_headers
BODY:
......@@ -7,6 +8,9 @@ AUTOMAKE_OPTIONS = foreign
noinst_LIBRARIES = libsymmetric.a
noinst_PROGRAMS = desTest desdata bf_test
Makefile.am: Makefile.am.in
(cd $(top_srcdir); $(BASH) make_am)
# When compiling with lsh, this is set to to -DLSH -I/path/to/lsh/include
# INCLUDES = @crypto_cpp_flags@
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment