Module Name: othersrc
Committed By: lukem
Date: Sun Jan 31 22:18:35 UTC 2016
Modified Files:
othersrc/usr.bin/tnftp: configure.ac
othersrc/usr.bin/tnftp/libedit: Makefile.am
Log Message:
libedit: adapt back to upstream makelist
Simplify syncing with upstream by adapting to the upstream makelist
(and previous config.h change to use tnftp.h).
Take advantage of automake's silent-rules.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 othersrc/usr.bin/tnftp/configure.ac
cvs rdiff -u -r1.3 -r1.4 othersrc/usr.bin/tnftp/libedit/Makefile.am
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/usr.bin/tnftp/configure.ac
diff -u othersrc/usr.bin/tnftp/configure.ac:1.32 othersrc/usr.bin/tnftp/configure.ac:1.33
--- othersrc/usr.bin/tnftp/configure.ac:1.32 Sun Jan 31 06:10:20 2016
+++ othersrc/usr.bin/tnftp/configure.ac Sun Jan 31 22:18:35 2016
@@ -1,4 +1,4 @@
-# $NetBSD: configure.ac,v 1.32 2016/01/31 06:10:20 lukem Exp $
+# $NetBSD: configure.ac,v 1.33 2016/01/31 22:18:35 lukem Exp $
#
# Process this file with autoconf to produce a configure script.
@@ -9,7 +9,7 @@ AC_COPYRIGHT([
Copyright (c) 1999-2016 The NetBSD Foundation, Inc.
All rights reserved.
])
-AC_REVISION([$Revision: 1.32 $])
+AC_REVISION([$Revision: 1.33 $])
AS_SHELL_SANITIZE()
@@ -450,7 +450,6 @@ AM_CONDITIONAL([USE_LIBEDIT], [test "$op
AC_CONFIG_FILES([
Makefile
libedit/Makefile
- libedit/makelist
libnetbsd/Makefile
src/Makefile
])
Index: othersrc/usr.bin/tnftp/libedit/Makefile.am
diff -u othersrc/usr.bin/tnftp/libedit/Makefile.am:1.3 othersrc/usr.bin/tnftp/libedit/Makefile.am:1.4
--- othersrc/usr.bin/tnftp/libedit/Makefile.am:1.3 Tue Jan 5 07:15:58 2010
+++ othersrc/usr.bin/tnftp/libedit/Makefile.am Sun Jan 31 22:18:35 2016
@@ -1,15 +1,16 @@
-## $NetBSD: Makefile.am,v 1.3 2010/01/05 07:15:58 lukem Exp $
+## $NetBSD: Makefile.am,v 1.4 2016/01/31 22:18:35 lukem Exp $
noinst_LTLIBRARIES = libedit.la
libedit_la_SOURCES = \
chared.c \
+ chartype.c \
common.c \
el.c \
emacs.c \
hist.c \
history.c \
- key.c \
+ keymacro.c \
map.c \
parse.c \
prompt.c \
@@ -17,7 +18,7 @@ libedit_la_SOURCES = \
refresh.c \
search.c \
sig.c \
- term.c \
+ terminal.c \
tokenizer.c \
tty.c \
vi.c
@@ -50,38 +51,33 @@ BUILT_SOURCES = \
CLEANFILES = \
$(generated_files)
+MAKELIST=AWK=$(AWK) $(SHELL) $(srcdir)/makelist
vi.h: vi.c
- @echo "Create $@"
- $(SHELL) ./makelist -h $(srcdir)/vi.c > $@
+ $(AM_V_GEN)$(MAKELIST) -h $(srcdir)/vi.c > $@
emacs.h: emacs.c
- @echo "Create $@"
- $(SHELL) ./makelist -h $(srcdir)/emacs.c > $@
+ $(AM_V_GEN)$(MAKELIST) -h $(srcdir)/emacs.c > $@
common.h: common.c
- @echo "Create $@"
- $(SHELL) ./makelist -h $(srcdir)/common.c > $@
+ $(AM_V_GEN)$(MAKELIST) -h $(srcdir)/common.c > $@
fcns.h: vi.h emacs.h common.h
- @echo "Create $@"
- $(SHELL) ./makelist -fh vi.h emacs.h common.h > $@
+ $(AM_V_GEN)$(MAKELIST) -fh vi.h emacs.h common.h > $@
-fcns.c: vi.h emacs.h common.h fcns.h
- @echo "Create $@"
- $(SHELL) ./makelist -fc vi.h emacs.h common.h > $@
+fcns.c: vi.h emacs.h common.h fcns.h help.h
+ $(AM_V_GEN)$(MAKELIST) -fc vi.h emacs.h common.h > $@
help.c: vi.c emacs.c common.c
- @echo "Create $@"
- $(SHELL) ./makelist -bc $(srcdir)/vi.c $(srcdir)/emacs.c $(srcdir)/common.c > $@
+ $(AM_V_GEN)$(MAKELIST) -bc $(srcdir)/vi.c $(srcdir)/emacs.c $(srcdir)/common.c > $@
help.h: vi.c emacs.c common.c
- @echo "Create $@"
- $(SHELL) ./makelist -bh $(srcdir)/vi.c $(srcdir)/emacs.c $(srcdir)/common.c > $@
+ $(AM_V_GEN)$(MAKELIST) -bh $(srcdir)/vi.c $(srcdir)/emacs.c $(srcdir)/common.c > $@
EXTRA_DIST = \
chared.h \
+ chartype.h \
editline.3 \
editrc.5 \
el.h \
@@ -89,7 +85,7 @@ EXTRA_DIST = \
filecomplete.h \
hist.h \
histedit.h \
- key.h \
+ keymacro.h \
map.h \
parse.h \
prompt.h \
@@ -100,5 +96,5 @@ EXTRA_DIST = \
search.h \
sig.h \
sys.h \
- term.h \
+ terminal.h \
tty.h
