| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | Upstream-Status: Backport |
| 2 | |
| 3 | Backport patch to fix parallel build failure and update context to make patch |
| 4 | coulde be applied. |
| 5 | |
| 6 | http://git.savannah.gnu.org/cgit/screen.git/commit?id=c0de6dd |
| 7 | |
| 8 | Signed-off-by: Kai Kang <kai.kang@windriver.com> |
| 9 | --- |
| 10 | From c0de6dd7970b2c7b426a5c39dcbc31c2bef87232 Mon Sep 17 00:00:00 2001 |
| 11 | From: =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?= <amade@asmblr.net> |
| 12 | Date: Thu, 2 Jan 2014 18:18:06 +0100 |
| 13 | Subject: [PATCH] fix for multijob build |
| 14 | MIME-Version: 1.0 |
| 15 | Content-Type: text/plain; charset=UTF-8 |
| 16 | Content-Transfer-Encoding: 8bit |
| 17 | |
| 18 | make sure that comm.sh script generates comm.h header before doing |
| 19 | anything else |
| 20 | |
| 21 | Signed-off-by: Amadeusz Sławiński <amade@asmblr.net> |
| 22 | --- |
| 23 | Makefile.in | 10 +++++----- |
| 24 | 1 file changed, 5 insertions(+), 5 deletions(-) |
| 25 | |
| 26 | diff --git a/Makefile.in b/Makefile.in |
| 27 | index ce86cbc..dea16d8 100644 |
| 28 | --- a/Makefile.in |
| 29 | +++ b/Makefile.in |
| 30 | @@ -298,7 +298,7 @@ search.o: layout.h viewport.h canvas.h search.c config.h screen.h os.h osdef.h a |
| 31 | comm.h layer.h term.h image.h display.h window.h mark.h extern.h |
| 32 | tty.o: layout.h viewport.h canvas.h tty.c config.h screen.h os.h osdef.h ansi.h acls.h comm.h \ |
| 33 | layer.h term.h image.h display.h window.h extern.h |
| 34 | -term.o: layout.h viewport.h canvas.h term.c term.h |
| 35 | +term.o: layout.h viewport.h canvas.h term.c term.h comm.h |
| 36 | window.o: layout.h viewport.h canvas.h window.c config.h screen.h os.h osdef.h ansi.h acls.h \ |
| 37 | comm.h layer.h term.h image.h display.h window.h extern.h logfile.h |
| 38 | utmp.o: layout.h viewport.h canvas.h utmp.c config.h screen.h os.h osdef.h ansi.h acls.h \ |
| 39 | @@ -324,7 +324,7 @@ canvas.o: layout.h viewport.h canvas.h canvas.c config.h screen.h os.h osdef.h a |
| 40 | comm.h layer.h term.h image.h display.h window.h extern.h \ |
| 41 | braille.h |
| 42 | comm.o: layout.h viewport.h canvas.h comm.c config.h acls.h comm.h |
| 43 | -kmapdef.o: layout.h viewport.h canvas.h kmapdef.c config.h |
| 44 | +kmapdef.o: layout.h viewport.h canvas.h kmapdef.c config.h comm.h |
| 45 | acls.o: layout.h viewport.h canvas.h acls.c config.h screen.h os.h osdef.h ansi.h acls.h comm.h \ |
| 46 | layer.h term.h image.h display.h window.h extern.h |
| 47 | braille.o: layout.h viewport.h canvas.h braille.c config.h screen.h os.h osdef.h ansi.h acls.h \ |
| 48 | @@ -350,7 +350,7 @@ layout.o: layout.h viewport.h canvas.h layout.c config.h screen.h os.h osdef.h a |
| 49 | viewport.o: layout.h viewport.h canvas.h viewport.c config.h screen.h os.h osdef.h ansi.h acls.h \ |
| 50 | comm.h layer.h term.h image.h display.h window.h extern.h \ |
| 51 | braille.h |
| 52 | -list_generic.o: list_generic.h list_generic.c layer.h screen.h osdef.h |
| 53 | -list_display.o: list_generic.h list_display.c layer.h screen.h osdef.h |
| 54 | -list_window.o: list_generic.h list_window.c window.h layer.h screen.h osdef.h |
| 55 | +list_generic.o: list_generic.h list_generic.c layer.h screen.h osdef.h comm.h |
| 56 | +list_display.o: list_generic.h list_display.c layer.h screen.h osdef.h comm.h |
| 57 | +list_window.o: list_generic.h list_window.c window.h layer.h screen.h osdef.h comm.h |
| 58 | |