From d684f11da759490a8d98d7b790796106285f4084 Mon Sep 17 00:00:00 2001
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Wed, 4 Apr 2018 04:21:19 +0000
Subject: Import Heimdal 7.5.0.

---
 lib/libedit/src/Makefile.am | 49 ++++++++++++++++-----------------------------
 1 file changed, 17 insertions(+), 32 deletions(-)

(limited to 'lib/libedit/src/Makefile.am')

diff --git a/lib/libedit/src/Makefile.am b/lib/libedit/src/Makefile.am
index 47e8a50265b7..f46c32839b24 100644
--- a/lib/libedit/src/Makefile.am
+++ b/lib/libedit/src/Makefile.am
@@ -1,56 +1,41 @@
 
-BUILT_SOURCES = vi.h emacs.h common.h fcns.h help.h fcns.c help.c
-if WIDECHAR
-BUILT_SOURCES += tokenizern.c historyn.c
-endif
+BUILT_SOURCES = vi.h emacs.h common.h fcns.h help.h func.h
 
 AHDR= vi.h emacs.h common.h 
 ASRC= $(srcdir)/vi.c $(srcdir)/emacs.c $(srcdir)/common.c
 
-vi.h: Makefile $(srcdir)/vi.c
+vi.h: Makefile $(srcdir)/makelist $(srcdir)/vi.c
 	AWK=$(AWK) sh $(srcdir)/makelist -h $(srcdir)/vi.c > $@
 
-emacs.h: Makefile $(srcdir)/emacs.c
+emacs.h: Makefile $(srcdir)/makelist $(srcdir)/emacs.c
 	AWK=$(AWK) sh $(srcdir)/makelist -h $(srcdir)/emacs.c > $@
 
-common.h: Makefile $(srcdir)/common.c
+common.h: Makefile $(srcdir)/makelist $(srcdir)/common.c
 	AWK=$(AWK) sh $(srcdir)/makelist -h $(srcdir)/common.c > $@
 
-fcns.h: Makefile $(AHDR)
+fcns.h: Makefile $(srcdir)/makelist $(AHDR)
 	AWK=$(AWK) sh $(srcdir)/makelist -fh $(AHDR) > $@
 
-help.h: Makefile $(ASRC)
-	AWK=$(AWK) sh $(srcdir)/makelist -bh $(ASRC) > $@
-
-fcns.c: Makefile $(AHDR)
+func.h: Makefile $(srcdir)/makelist $(AHDR)
 	AWK=$(AWK) sh $(srcdir)/makelist -fc $(AHDR) > $@
 
-help.c: Makefile $(ASRC)
-	AWK=$(AWK) sh $(srcdir)/makelist -bc $(ASRC) > $@
-
-tokenizern.c: Makefile $(srcdir)/tokenizer.c
-	AWK=$(AWK) sh $(srcdir)/makelist -n $(srcdir)/tokenizer.c > $@
-
-historyn.c: Makefile $(srcdir)/history.c
-	AWK=$(AWK) sh $(srcdir)/makelist -n $(srcdir)/history.c > $@
+help.h: Makefile $(srcdir)/makelist $(ASRC)
+	AWK=$(AWK) sh $(srcdir)/makelist -bh $(ASRC) > $@
 
 CLEANFILES = $(BUILT_SOURCES)
 
 lib_LTLIBRARIES    = libheimedit.la
-libheimedit_la_SOURCES = chared.c common.c el.c emacs.c hist.c key.c map.c chartype.c parse.c \
-							prompt.c read.c refresh.c search.c sig.c term.c tty.c vi.c \
-							fgetln.c strlcat.c strlcpy.c unvis.c vis.c wcsdup.c tokenizer.c \
-							history.c filecomplete.c readline.c chared.h el.h hist.h \
-							histedit.h key.h map.h chartype.h parse.h prompt.h read.h refresh.h \
-							search.h sig.h sys.h el_term.h tty.h vis.h filecomplete.h \
-							editline/readline.h
-if WIDECHAR
-libheimedit_la_SOURCES += eln.c
-endif
+libheimedit_la_SOURCES = \
+    chared.c chartype.c common.c el.c eln.c emacs.c filecomplete.c hist.c \
+    history.c historyn.c keymacro.c map.c parse.c prompt.c read.c readline.c \
+    refresh.c search.c sig.c terminal.c tokenizer.c tokenizern.c tty.c \
+    unvis.c vi.c vis.c wcsdup.c \
+    chared.h chartype.h readline/readline.h el.h filecomplete.h \
+    histedit.h hist.h keymacro.h map.h parse.h prompt.h read.h \
+    refresh.h search.h sig.h sys.h terminal.h tty.h vis.h
 
 EXTRA_DIST = makelist shlib_version
-#nobase_include_HEADERS = histedit.h editline/readline.h
-EXTRA_DIST += histedit.h editline/readline.h
+EXTRA_DIST += histedit.h readline/readline.h
 
 nodist_libheimedit_la_SOURCES = $(BUILT_SOURCES)
 
-- 
cgit v1.2.3