Bug#13106585 PUSH FOR "WL#5945 : IMPROVE LIBEDIT LIBRARY"
BREAKS SOURCE RELEASE BUILD Some of the required files were not getting copied while performing 'make dist' and hence the build failed for the created distribution source. Added the missing files to Makefile.am.
This commit is contained in:
parent
ccd019dd26
commit
0b3077b6ef
@ -7,8 +7,8 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include
|
||||
|
||||
noinst_LIBRARIES = libedit.a
|
||||
|
||||
libedit_a_SOURCES = chared.c el.c eln.c history.c historyn.c map.c prompt.c readline.c \
|
||||
search.c tokenizer.c tokenizern.c vi.c common.c emacs.c \
|
||||
libedit_a_SOURCES = chared.c el.c eln.c history.c historyn.c map.c prompt.c chartype.c \
|
||||
readline.c search.c tokenizer.c tokenizern.c vi.c common.c emacs.c \
|
||||
hist.c keymacro.c parse.c read.c refresh.c sig.c terminal.c \
|
||||
tty.c help.c fcns.c filecomplete.c \
|
||||
np/unvis.c np/strlcpy.c np/vis.c np/strlcat.c \
|
||||
@ -19,8 +19,8 @@ libedit_a_DEPENDENCIES = @LIBEDIT_LOBJECTS@
|
||||
|
||||
pkginclude_HEADERS = readline/readline.h
|
||||
|
||||
noinst_HEADERS = chared.h el.h el_terminal.h histedit.h keymacro.h parse.h refresh.h sig.h \
|
||||
sys.h config.h hist.h map.h prompt.h read.h \
|
||||
noinst_HEADERS = chared.h chartype.h el.h el_terminal.h histedit.h keymacro.h parse.h \
|
||||
refresh.h sig.h sys.h config.h hist.h map.h prompt.h read.h \
|
||||
search.h tty.h filecomplete.h np/vis.h
|
||||
|
||||
EXTRA_DIST = makelist.sh
|
||||
@ -74,6 +74,7 @@ eln.o: vi.h emacs.h common.h help.h fcns.h
|
||||
history.o: vi.h emacs.h common.h help.h fcns.h
|
||||
historyn.o: vi.h emacs.h common.h help.h fcns.h
|
||||
map.o: vi.h emacs.h common.h help.h fcns.h
|
||||
chartype.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
|
||||
|
@ -258,9 +258,6 @@ out:
|
||||
return NULL;
|
||||
}
|
||||
|
||||
#ifdef WIDECHAR
|
||||
int wcwidth(wchar_t wc); // Signature.
|
||||
#endif
|
||||
|
||||
protected int
|
||||
ct_visual_width(Char c)
|
||||
|
@ -247,15 +247,6 @@ int tok_str(Tokenizer *, const char *,
|
||||
/*
|
||||
* Begin Wide Character Support
|
||||
*/
|
||||
#ifdef __linux__
|
||||
/* Apparently we need _GNU_SOURCE defined to get access to wcsdup on Linux */
|
||||
#ifndef _GNU_SOURCE
|
||||
#define _GNU_SOURCE
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#include <wchar.h>
|
||||
#include <wctype.h>
|
||||
|
||||
/*
|
||||
* Wide character versions
|
||||
|
@ -40,8 +40,6 @@ static char sccsid[] = "@(#)refresh.c 8.1 (Berkeley) 6/4/93";
|
||||
#endif
|
||||
#endif /* not lint && not SCCSID */
|
||||
|
||||
#include "chartype.c" /* XXXMYSQL */
|
||||
|
||||
/*
|
||||
* refresh.c: Lower level screen refreshing functions
|
||||
*/
|
||||
|
@ -92,8 +92,21 @@ size_t strlcpy(char *dst, const char *src, size_t size);
|
||||
char *fgetln(FILE *fp, size_t *len);
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_WCSDUP
|
||||
#ifdef __linux__
|
||||
/* Apparently we need _GNU_SOURCE defined to get access to wcsdup on Linux */
|
||||
#ifndef _GNU_SOURCE
|
||||
#define _GNU_SOURCE
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifndef __USE_XOPEN
|
||||
#define __USE_XOPEN
|
||||
#endif
|
||||
|
||||
#include <wchar.h>
|
||||
#include <wctype.h>
|
||||
|
||||
#ifndef HAVE_WCSDUP
|
||||
wchar_t *wcsdup(const wchar_t *);
|
||||
#endif
|
||||
|
||||
|
@ -636,9 +636,6 @@ mc_again:
|
||||
el->el_cursor.h = where; /* now where is here */
|
||||
}
|
||||
|
||||
#ifdef WIDECHAR
|
||||
int wcwidth(wchar_t); // Signature.
|
||||
#endif
|
||||
|
||||
/* terminal_overwrite():
|
||||
* Overstrike num characters
|
||||
|
Loading…
x
Reference in New Issue
Block a user