mirror of
https://github.com/MariaDB/server.git
synced 2025-01-23 23:34:34 +01:00
37aad6bb4f
2. changed key_* to el_ley_* in the libedit key.h
(because it's in the conflict with the aix definitions)
3. use libedit_term.h instead of term.h in the cmd-line-utils/libedit/el.h
4. added definition of MIN in the cmd-line-utils/libedit/read.c
(if it wasn't defined yet)
5. discarded definition of SUNOS macro from configure.in
(now we don't include term.h in the el.h at all)
BitKeeper/deleted/.del-term.h~23716a5310508e0:
Delete: cmd-line-utils/libedit/term.h
cmd-line-utils/libedit/Makefile.am:
discarded term.h from the distribution
cmd-line-utils/libedit/el.c:
changed
key_init -> el_key_init
key_end -> el_key_end
cmd-line-utils/libedit/el.h:
change
#include "term.h"
to
#include "libedit_term.h"
cmd-line-utils/libedit/key.c:
changed functions key_... to el_key_...
because it's in conflict with the aix definitions
cmd-line-utils/libedit/key.h:
changed functions key_... to el_key_...
because it's in conflict with the aix definitions
cmd-line-utils/libedit/map.c:
changed functions key_... to el_key_...
because it's in conflict with the aix definitions
cmd-line-utils/libedit/read.c:
1. added definition of MIN
2. fixed problems with undefined uint
3. changed key_get to el_key_get
cmd-line-utils/libedit/term.c:
1. discarded #include "term.h" at all
2. changed functions key_* to el_key_*
3. add declaration of el_key__decode_str
cmd-line-utils/libedit/tty.c:
changed functions key_... to el_key_...
because it's in conflict with the aix definitions
configure.in:
discarded definition of SUNOS macro
(libedit doesn't require it anymore)
99 lines
2.8 KiB
Makefile
99 lines
2.8 KiB
Makefile
## Process this file with automake to create Makefile.in
|
|
# Makefile for the GNU readline library.
|
|
# Copyright (C) 1994,1996,1997 Free Software Foundation, Inc.
|
|
|
|
ASRC=vi.c emacs.c common.c
|
|
AHDR=vi.h emacs.h common.h
|
|
|
|
INCLUDES = -I$(top_srcdir)/include -I$(srcdir)/../.. -I..
|
|
|
|
noinst_LIBRARIES = libedit.a
|
|
|
|
libedit_a_SOURCES = chared.c el.c history.c map.c prompt.c readline.c \
|
|
search.c tokenizer.c vi.c common.c emacs.c \
|
|
hist.c key.c parse.c read.c refresh.c sig.c term.c \
|
|
tty.c help.c fcns.c
|
|
|
|
EXTRA_libedit_a_SOURCES = np/unvis.c np/strlcpy.c np/vis.c np/strlcat.c \
|
|
np/fgetln.c
|
|
|
|
libedit_a_LIBADD = @LIBEDIT_LOBJECTS@
|
|
libedit_a_DEPENDENCIES = @LIBEDIT_LOBJECTS@
|
|
|
|
pkginclude_HEADERS = readline/readline.h
|
|
|
|
noinst_HEADERS = chared.h el.h histedit.h key.h parse.h refresh.h sig.h \
|
|
sys.h tokenizer.h config.h hist.h map.h prompt.h read.h \
|
|
search.h tty.h libedit_term.h
|
|
|
|
EXTRA_DIST = makelist.sh np/unvis.c np/strlcpy.c np/vis.c np/vis.h np/strlcat.c np/fgetln.c
|
|
|
|
CLEANFILES = makelist common.h emacs.h vi.h fcns.h help.h fcns.c help.c
|
|
|
|
DEFS = -DUNDEF_THREADS_HACK -DHAVE_CONFIG_H -DNO_KILL_INTR
|
|
|
|
SUFFIXES = .sh
|
|
|
|
.sh:
|
|
@RM@ -f $@ $@-t
|
|
@SED@ \
|
|
-e 's!@''AWK''@!@AWK@!' \
|
|
$< > $@-t
|
|
@MV@ $@-t $@
|
|
|
|
vi.h: vi.c makelist
|
|
sh ./makelist -h ./vi.c > $@.tmp && \
|
|
mv $@.tmp $@
|
|
|
|
emacs.h: emacs.c makelist
|
|
sh ./makelist -h ./emacs.c > $@.tmp && \
|
|
mv $@.tmp $@
|
|
|
|
common.h: common.c makelist
|
|
sh ./makelist -h ./common.c > $@.tmp && \
|
|
mv $@.tmp $@
|
|
|
|
help.c: ${ASRC} makelist
|
|
sh ./makelist -bc ${ASRC} > $@.tmp && \
|
|
mv $@.tmp $@
|
|
|
|
help.h: ${ASRC} makelist
|
|
sh ./makelist -bh ${ASRC} > $@.tmp && \
|
|
mv $@.tmp $@
|
|
|
|
fcns.h: ${AHDR} makelist
|
|
sh ./makelist -fh ${AHDR} > $@.tmp && \
|
|
mv $@.tmp $@
|
|
|
|
fcns.c: ${AHDR} fcns.h makelist
|
|
sh ./makelist -fc ${AHDR} > $@.tmp && \
|
|
mv $@.tmp $@
|
|
|
|
#%.o: vi.h emacs.h common.h help.h fcns.h
|
|
#objects := $(patsubst %.c,%.o,$(wildcard *.c))
|
|
#$(objects): vi.h emacs.h
|
|
|
|
chared.o: vi.h emacs.h common.h help.h fcns.h
|
|
el.o: vi.h emacs.h common.h help.h fcns.h
|
|
history.o: vi.h emacs.h common.h help.h fcns.h
|
|
map.o: vi.h emacs.h common.h help.h fcns.h
|
|
prompt.o: vi.h emacs.h common.h help.h fcns.h
|
|
readline.o: vi.h emacs.h common.h help.h fcns.h
|
|
search.o: vi.h emacs.h common.h help.h fcns.h
|
|
tokenizer.o: vi.h emacs.h common.h help.h fcns.h
|
|
vi.o: vi.h emacs.h common.h help.h fcns.h
|
|
common.o: vi.h emacs.h common.h help.h fcns.h
|
|
emacs.o: vi.h emacs.h common.h help.h fcns.h
|
|
hist.o: vi.h emacs.h common.h help.h fcns.h
|
|
key.o: vi.h emacs.h common.h help.h fcns.h
|
|
parse.o: vi.h emacs.h common.h help.h fcns.h
|
|
read.o: vi.h emacs.h common.h help.h fcns.h
|
|
refresh.o: vi.h emacs.h common.h help.h fcns.h
|
|
sig.o: vi.h emacs.h common.h help.h fcns.h
|
|
term.o: vi.h emacs.h common.h help.h fcns.h
|
|
tty.o: vi.h emacs.h common.h help.h fcns.h
|
|
help.o: vi.h emacs.h common.h help.h fcns.h
|
|
fcns.o: vi.h emacs.h common.h help.h fcns.h
|
|
|
|
# Don't update the files from bitkeeper
|
|
%::SCCS/s.%
|