Allow multi-line editing and drop libedit support.

[cycript.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 343b0500a3b9a38c8730189cf4cc128a3a204072..3a71b357e0e25c9fda599cb0d0f893bea8798c68 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,7 +41,7 @@ lib_LTLIBRARIES =
 
 lib_LTLIBRARIES += libcycript.la
 libcycript_la_LDFLAGS = $(CY_LDFLAGS)
-libcycript_la_LIBADD = $(LTLIBFFI) $(LTLIBGCC) -ldl
+libcycript_la_LIBADD = $(LTLIBUV) $(LTLIBFFI) $(LTLIBGCC) -ldl
 
 libcycript_la_SOURCES = ConvertUTF.c Decode.cpp Driver.cpp Highlight.cpp Library.cpp Network.cpp Output.cpp Replace.cpp Syntax.cpp
 libcycript_la_SOURCES += Parser.cpp Scanner.cpp
@@ -50,7 +50,7 @@ filters =
 
 if CY_CONSOLE
 bin_PROGRAMS = cycript
-cycript_SOURCES = Console.cpp Display.cpp
+cycript_SOURCES = Console.cpp
 cycript_LDADD = libcycript.la $(LTLIBREADLINE) $(LTLIBTERMCAP) $(LTLIBGCC) $(PTHREAD_CFLAGS) -ldl
 libcycript_la_SOURCES += Complete.cpp
 endif
@@ -105,7 +105,7 @@ Scanner.lpp: Scanner.lpp.in UnicodeIDStart.l UnicodeIDContinue.l
 
 CLEANFILES += Scanner.cpp Scanner.output lex.backup
 Scanner.cpp: Scanner.lpp
-       $(FLEX) -o $@ -T $< 2>Scanner.output || (grep -F '$<:' Scanner.output; false)
+       $(FLEX) $(LFLAGS) -o $@ -T $< 2>Scanner.output || (grep -F '$<:' Scanner.output; false)
        grep -E '^(No backing up\.|Compressed tables always back up\.)$$' lex.backup >/dev/null
        ! grep -F ': warning, ' Scanner.output || true