Commit 7964631f authored by Niels Möller's avatar Niels Möller
Browse files

Hacked configure scripts, makefiles and crypto_types.h.

Rev: src/Makefile.in:1.8
Rev: src/configure.in:1.4
Rev: src/symmetric/Makefile.in:1.3
parent 4678abde
...@@ -4,7 +4,6 @@ srcdir = @srcdir@ ...@@ -4,7 +4,6 @@ srcdir = @srcdir@
VPATH = $(srcdir) VPATH = $(srcdir)
CC = @CC@ CC = @CC@
SCHEME = @SCHEME@
@SET_MAKE@ @SET_MAKE@
# INSTALL = @INSTALL@ # INSTALL = @INSTALL@
...@@ -13,15 +12,13 @@ SCHEME = @SCHEME@ ...@@ -13,15 +12,13 @@ SCHEME = @SCHEME@
# MAKEINFO = makeinfo # MAKEINFO = makeinfo
# TEXI2DVI = texi2dvi # TEXI2DVI = texi2dvi
DEFS = @DEFS@ export DEFS = @DEFS@
LIBS = @LIBS@ LIBS = @LIBS@
CFLAGS = -g -Wall # -O2 -fomit-frame-pointer CFLAGS = -g -Wall # -O2 -fomit-frame-pointer
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LOADLIBES = $(LIBS) CPPFLAGS = -DDEBUG_ALLOC -DLSH -I$(srcdir) -I$(srcdir)/include
CPPFLAGS = -DDEBUG_ALLOC
prefix = @prefix@ prefix = @prefix@
exec_prefix = $(prefix) exec_prefix = $(prefix)
...@@ -34,6 +31,8 @@ binprefix = ...@@ -34,6 +31,8 @@ binprefix =
#### End of system configuration section. #### #### End of system configuration section. ####
LOADLIBES = $(LIBS) lib/algorithms.a
COMMON_SRCS = atoms.c bignum.c connection.c crypto.c \ COMMON_SRCS = atoms.c bignum.c connection.c crypto.c \
debug.c encrypt.c format.c io.c packet_dispatch.c \ debug.c encrypt.c format.c io.c packet_dispatch.c \
pad.c parse.c read_data.c read_line.c read_packet.c \ pad.c parse.c read_data.c read_line.c read_packet.c \
...@@ -49,7 +48,7 @@ CLIENT_OBJS = $(CLIENT_SRCS:.c=.o) ...@@ -49,7 +48,7 @@ CLIENT_OBJS = $(CLIENT_SRCS:.c=.o)
SERVER_OBJS = $(SERVER_SRCS:.c=.o) SERVER_OBJS = $(SERVER_SRCS:.c=.o)
OBJS = $(SRCS:.c=.o) OBJS = $(SRCS:.c=.o)
all: lsh lshd all: algorithms lsh lshd
.PHONY: all .PHONY: all
...@@ -70,6 +69,12 @@ atoms_gperf.c: atoms.in process_atoms ...@@ -70,6 +69,12 @@ atoms_gperf.c: atoms.in process_atoms
atoms_table.c: atoms.in process_atoms atoms_table.c: atoms.in process_atoms
bash process_atoms table <atoms.in >atoms_table.c bash process_atoms table <atoms.in >atoms_table.c
algorithms:
cd lib; \
EXTRA_CPPFLAGS="-DLSH -I$(srcdir) -I$(srcdir)/include" \
EXTRA_VPATH="$(srcdir):$(srcdir)/include" \
$(MAKE) algorithms.a
clean: clean:
rm -f *.o rm -f *.o
......
...@@ -5,6 +5,18 @@ dnl AC_INIT_AUTOMAKE(lsh, 1.0) ...@@ -5,6 +5,18 @@ dnl AC_INIT_AUTOMAKE(lsh, 1.0)
AC_CONFIG_HEADER(config.h) AC_CONFIG_HEADER(config.h)
# We want an absolute path to the source-dir.
case "$srcdir" in
/*)
;;
*)
oldsrcdir="$srcdir"
srcdir="`cd \"$srcdir\";pwd`"
AC_MSG_WARN([ Converted $oldsrcdir to $srcdir,
If this does not work, please use an absolute path to the configure script. ])
;;
esac
dnl Checks for programs. dnl Checks for programs.
AC_PROG_CC AC_PROG_CC
AC_PROG_MAKE_SET AC_PROG_MAKE_SET
...@@ -28,4 +40,7 @@ AC_CHECK_LIB(xnet, inet_addr) ...@@ -28,4 +40,7 @@ AC_CHECK_LIB(xnet, inet_addr)
AC_CHECK_LIB(nsl, hostbyname) AC_CHECK_LIB(nsl, hostbyname)
AC_CHECK_LIB(socket, setsockopt) AC_CHECK_LIB(socket, setsockopt)
AC_CONFIG_SUBDIRS(lib)
AC_OUTPUT(Makefile, echo timestamp > stamp-h) AC_OUTPUT(Makefile, echo timestamp > stamp-h)
syscmd([cd lib && autoconf])
...@@ -174,3 +174,5 @@ config.status: configure ...@@ -174,3 +174,5 @@ config.status: configure
%.d: %.c %.d: %.c
$(SHELL) -ec '$(CC) -MM -MG $(CPPFLAGS) $(DEFS) $< \ $(SHELL) -ec '$(CC) -MM -MG $(CPPFLAGS) $(DEFS) $< \
| sed '\''s/\($*\)\.o:/\1\.o $@ : /g'\'' > $@' | sed '\''s/\($*\)\.o:/\1\.o $@ : /g'\'' > $@'
include $(SRCS:.c=.d)
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