diff options
| author |  Kurtis Rader <krader@skepticism.us> | 2016-05-06 21:22:28 -0700 |
|---|---|---|
| committer | Kurtis Rader <krader@skepticism.us> | 2016-05-10 14:11:30 -0700 |
| commit | b055b8440c87c69e7f92a81f114ee77f48940f66 (patch) | |
| tree | 5e686c338bb775fac7277be9f82ffa18e89b3cdb /Makefile.in | |
| parent | 14d7b1a0fa4e9890a1d576cc0c5e04cca37e9ec7 (diff) | |
enhance the key_reader program
The original `key_reader` program was useful but didn't do much that `xxd`
or `od -tx1z` didn't do. Furthermore, it wasn't built and installed by
default. This change adds features that make it superior to those programs
for decoding interactive key presses and makes it a first-class citizen
like the `fish_indent` program that is always available.
Fixes #2991
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/Makefile.in b/Makefile.in index 6172721e..4bb0998c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -119,7 +119,7 @@ FISH_TESTS_OBJS := $(FISH_OBJS) obj/fish_tests.o # (that is, are not themselves #included in other source files) # FISH_ALL_OBJS := $(sort $(FISH_OBJS) $(FISH_INDENT_OBJS) $(FISH_TESTS_OBJS) \ - obj/fish.o obj/key_reader.o) + obj/fish.o obj/fish_key_reader.o) # # Files containing user documentation @@ -170,7 +170,7 @@ FUNCTIONS_DIR_FILES := $(wildcard share/functions/*.fish) # # Programs to install # -PROGRAMS := fish fish_indent +PROGRAMS := fish fish_indent fish_key_reader # # Manual pages to install @@ -795,9 +795,11 @@ fish_indent: $(FISH_INDENT_OBJS) $(EXTRA_PCRE2) $(CXX) $(CXXFLAGS) $(LDFLAGS) $(FISH_INDENT_OBJS) $(LIBS) -o $@ # -# Neat little program to show output from terminal +# Build the fish_key_reader program to show input from the terminal. Note that +# fish_key_reader doesn't need all of the object files that fish does but it +# does need a significant number so it's easier to just use the same list. # -key_reader: $(FISH_OBJS) $(EXTRA_PCRE2) obj/key_reader.o +fish_key_reader: $(FISH_OBJS) $(EXTRA_PCRE2) obj/fish_key_reader.o $(CXX) $(CXXFLAGS) $(LDFLAGS_FISH) $^ $(LIBS) -o $@ # @@ -866,7 +868,7 @@ clean: rm -f obj/*.o *.o doc.h doc.tmp rm -f doc_src/*.doxygen doc_src/*.cpp doc_src/*.o doc_src/commands.hdr rm -f tests/tmp.err tests/tmp.out tests/tmp.status tests/foo.txt - rm -f $(PROGRAMS) fish_tests key_reader + rm -f $(PROGRAMS) fish_tests fish_key_reader rm -f command_list.txt command_list_toc.txt toc.txt rm -f doc_src/index.hdr doc_src/commands.hdr rm -f lexicon_filter lexicon.txt lexicon.log @@ -1019,8 +1021,8 @@ obj/io.o: src/fallback.h config.h src/signal.h src/wutil.h src/common.h obj/io.o: src/exec.h src/io.h obj/iothread.o: src/signal.h src/iothread.h src/common.h config.h obj/iothread.o: src/fallback.h -obj/key_reader.o: src/common.h config.h src/fallback.h src/signal.h -obj/key_reader.o: src/input_common.h +obj/fish_key_reader.o: src/common.h config.h src/fallback.h src/signal.h +obj/fish_key_reader.o: src/input_common.h obj/kill.o: src/fallback.h config.h src/signal.h src/kill.h src/common.h obj/kill.o: src/env.h src/exec.h src/path.h obj/output.o: config.h src/fallback.h src/signal.h src/wutil.h src/common.h |