Commit 66a3810a authored by Niels Möller's avatar Niels Möller
Browse files

*** empty log message ***

Rev: ChangeLog:1.282
Rev: Makefile.am.in:1.14
Rev: configure.in:1.96
Rev: misc/bootstrap-build.sh:1.2(DEAD)
Rev: src/Makefile.am.in:1.97
Rev: src/testsuite/Makefile.am:1.21
parent 8f3b7c0f
2000-12-23 Niels Mller <nisse@lysator.liu.se>
* src/getopt.c, src/getopt1.c, src/getopt.h: Removed.
2000-12-22 Niels Mller <nisse@lysator.liu.se>
* src/testsuite/Makefile.am (LDADD): Link with libargp.
($(srcdir)/%.c): Fix $(srcdir)-handling.
* src/Makefile.am.in (bootstrap): New target, replaces the
post-configure work previously done by misc/bootstrap.sh
* Makefile.am.in (bootstrap): New target.
2000-12-11 Niels Mller <nisse@cuckoo.localdomain> 2000-12-11 Niels Mller <nisse@cuckoo.localdomain>
* Removed getopt.c, getopt.h and getopt1.c from the src/argp * Removed getopt.c, getopt.h and getopt1.c from the src/argp
......
...@@ -29,6 +29,10 @@ $(DOTDISTS): depend ...@@ -29,6 +29,10 @@ $(DOTDISTS): depend
.PHONY: dotdists .PHONY: dotdists
dotdists: $(DOTDISTS) dotdists: $(DOTDISTS)
.PHONY: bootstrap
bootstrap:
(cd src && $(MAKE) bootstrap)
# FIXME: Have to figure out how to create dependency files recursively. # FIXME: Have to figure out how to create dependency files recursively.
# dist-hook: $(DOTDISTS) # dist-hook: $(DOTDISTS)
......
...@@ -442,6 +442,7 @@ fi ...@@ -442,6 +442,7 @@ fi
# liblsh.a, and we can't add an archive to an archive. # liblsh.a, and we can't add an archive to an archive.
LIBARGP="" LIBARGP=""
if test x$with_system_argp = xno ; then if test x$with_system_argp = xno ; then
# FIXME: Perhaps it's better to use an absolute path?
LIBARGP="argp/libargp.a" LIBARGP="argp/libargp.a"
fi fi
......
#! /bin/sh
# Build all automatically generated files that are not present in the
# CVS repository.
# This script is for use in the build directory, after you have run
# configure to create the needed Makefiles.
(cd src && for f in *.h *.c; do make $f.x; done)
rm -f src/*.xT
(cd src && make atoms_defines.h atoms_gperf.c atoms_table.c \
prime_table.h sexp_table.h digit_table.h packet_types.h)
...@@ -39,6 +39,15 @@ noinst_LIBRARIES = liblsh.a ...@@ -39,6 +39,15 @@ noinst_LIBRARIES = liblsh.a
generated_sources = atoms_defines.h atoms_gperf.c atoms_table.c \ generated_sources = atoms_defines.h atoms_gperf.c atoms_table.c \
prime_table.h sexp_table.h digit_table.h packet_types.h prime_table.h sexp_table.h digit_table.h packet_types.h
POTENTIAL_X_FILES = $(addsuffix .x,$(wildcard $(srcdir)/*.[ch]))
.PHONY: bootstrap
bootstrap: $(generated_sources)
# Not all potential .x files can be generated
-$(MAKE) -k $(POTENTIAL_X_FILES)
@rm -f $(addsuffix T,$(POTENTIAL_X_FILES))
liblsh_a_SOURCES = abstract_io.c abstract_crypto.c abstract_compress.c \ liblsh_a_SOURCES = abstract_io.c abstract_crypto.c abstract_compress.c \
algorithms.c alist.c arcfour.c atoms.c \ algorithms.c alist.c arcfour.c atoms.c \
bignum.c blocking_write.c blowfish.c \ bignum.c blocking_write.c blowfish.c \
...@@ -78,42 +87,42 @@ liblsh_a_SOURCES = abstract_io.c abstract_crypto.c abstract_compress.c \ ...@@ -78,42 +87,42 @@ liblsh_a_SOURCES = abstract_io.c abstract_crypto.c abstract_compress.c \
liblsh_a_LIBADD = @LIBOBJS@ liblsh_a_LIBADD = @LIBOBJS@
atoms_defines.h: atoms.in process_atoms $(srcdir)/atoms_defines.h: atoms.in process_atoms
$(BASH) $(srcdir)/process_atoms header <$(srcdir)/atoms.in >$@T $(BASH) $(srcdir)/process_atoms header <$< >$@T
test -s $@T && mv -f $@T $@ test -s $@T && mv -f $@T $@
# With the next version of gperf, add -F ", 0" # With the next version of gperf, add -F ", 0"
GPERF_FLAGS = -LANSI-C -t -c -C -l -k1,3,7,$$ -N gperf_atom GPERF_FLAGS = -LANSI-C -t -c -C -l -k1,3,7,$$ -N gperf_atom
atoms_gperf.c: atoms.in process_atoms $(srcdir)/atoms_gperf.c: atoms.in process_atoms
$(BASH) $(srcdir)/process_atoms gperf <$(srcdir)/atoms.in \ $(BASH) $(srcdir)/process_atoms gperf <$< \
| gperf >$@T $(GPERF_FLAGS) | gperf >$@T $(GPERF_FLAGS)
test -s $@T && mv -f $@T $@ test -s $@T && mv -f $@T $@
atoms_table.c: atoms.in process_atoms $(srcdir)/atoms_table.c: atoms.in process_atoms
$(BASH) $(srcdir)/process_atoms table <$(srcdir)/atoms.in >$@T $(BASH) $(srcdir)/process_atoms table <$< >$@T
test -s $@T && mv -f $@T $@ test -s $@T && mv -f $@T $@
PRIME_LIMIT = 1024 PRIME_LIMIT = 1024
prime_table.h: prime_table $(srcdir)/prime_table.h: prime_table
./prime_table $(PRIME_LIMIT) >$@T ./prime_table $(PRIME_LIMIT) >$@T
test -s $@T && mv -f $@T $(srcdir)/$@ test -s $@T && mv -f $@T $@
prime_table_LDADD = prime_table_LDADD =
sexp_table.h: sexp_chars.in $(srcdir)/scm/make-char-classes.scm $(srcdir)/sexp_table.h: sexp_chars.in $(srcdir)/scm/make-char-classes.scm
$(SCHEME) -e main -s $(srcdir)/scm/make-char-classes.scm <$< >$@T $(SCHEME) -e main -s $(srcdir)/scm/make-char-classes.scm <$< >$@T
test -s $@T && mv -f $@T $@ test -s $@T && mv -f $@T $@
digit_table_LDADD = digit_table_LDADD =
digit_table.h: digit_table $(srcdir)/digit_table.h: digit_table
./digit_table >$@T ./digit_table >$@T
test -s $@T && mv -f $@T $(srcdir)/$@ test -s $@T && mv -f $@T $@
packet_types.h: ssh.h invert-defs $(srcdir)/packet_types.h: ssh.h invert-defs
$(srcdir)/invert-defs <ssh.h >$@T $(srcdir)/invert-defs <ssh.h >$@T
test -s $@T && mv -f $@T $(srcdir)/$@ test -s $@T && mv -f $@T $@
lsh_krb_checkpw_LDADD=@KRB_LIBS@ lsh_krb_checkpw_LDADD=@KRB_LIBS@
...@@ -156,7 +165,7 @@ MAINTAINERCLEANFILES += $(DEP_FILES) ...@@ -156,7 +165,7 @@ MAINTAINERCLEANFILES += $(DEP_FILES)
# This is GNU make specific # This is GNU make specific
%.x: % $(srcdir)/scm/gaba.scm $(srcdir)/scm/compiler.scm $(srcdir)/%.x: % $(srcdir)/scm/gaba.scm $(srcdir)/scm/compiler.scm
$(SCHEME) -e main -l $(srcdir)/scm/compiler.scm \ $(SCHEME) -e main -l $(srcdir)/scm/compiler.scm \
-s $(srcdir)/scm/gaba.scm <$< >$@T -s $(srcdir)/scm/gaba.scm <$< >$@T
test -s $@T && mv -f $@T $@ test -s $@T && mv -f $@T $@
......
...@@ -23,7 +23,7 @@ TS_ALL = $(TS_PROGS) $(TS_SH) $(TS_MORE_PROGS) $(TS_MORE_SH) ...@@ -23,7 +23,7 @@ TS_ALL = $(TS_PROGS) $(TS_SH) $(TS_MORE_PROGS) $(TS_MORE_SH)
# SUFFIXES = .c .o # SUFFIXES = .c .o
noinst_PROGRAMS = $(TS_PROGS) noinst_PROGRAMS = $(TS_PROGS)
LDADD = ../liblsh.a ../symmetric/libsymmetric.a LDADD = ../liblsh.a ../symmetric/libsymmetric.a $(addprefix ../,@LIBARGP@)
EXTRA_DIST = macros.m4 $(SOURCES:.c=.m4) $(TS_SH) $(TS_MORE_SH) \ EXTRA_DIST = macros.m4 $(SOURCES:.c=.m4) $(TS_SH) $(TS_MORE_SH) \
functions.sh runtests key-1.private functions.sh runtests key-1.private
...@@ -32,9 +32,9 @@ all: ...@@ -32,9 +32,9 @@ all:
@echo make check to build testprograms. @echo make check to build testprograms.
M4FLAGS = -P #-s M4FLAGS = -P #-s
%.c: macros.m4 %.m4 $(srcdir)/%.c: macros.m4 %.m4
$(M4) $(M4FLAGS) $^ > $@T $(M4) $(M4FLAGS) $^ > $@T
test -s $@T && mv -f $@T $(srcdir)/$@ test -s $@T && mv -f $@T $@
.PHONY: check-some check-more .PHONY: check-some check-more
......
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