| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | From 5a793a1a9fb3477719aabf7e27ff22ed1acdf559 Mon Sep 17 00:00:00 2001 |
| 2 | From: Roy Li <rongqing.li@windriver.com> |
| 3 | Date: Tue, 19 May 2015 15:54:24 +0800 |
| 4 | Subject: [PATCH] fix a parallel building issue |
| 5 | |
| 6 | Fixed: |
| 7 | | src/lex_config.c:34:25: fatal error: yacc_config.h: No such file or directory |
| 8 | | |
| 9 | | #include "yacc_config.h" |
| 10 | | ^ |
| 11 | | compilation terminated. |
| 12 | |
| 13 | And: |
| 14 | Compiling lex_config.c. |
| 15 | src/lex_config.l:34:25: fatal error: yacc_config.h: No such file or directory |
| 16 | |
| 17 | Upstream-Status: Pending |
| 18 | |
| 19 | there are two Makefile rules to generate lex_config.o, one is to generate |
| 20 | lex_config.o other is to generate src/lex_config.o, so we can remove one. |
| 21 | and add the needed dependence for lex_config.o |
| 22 | |
| 23 | |
| 24 | Signed-off-by: Roy Li <rongqing.li@windriver.com> |
| 25 | --- |
| 26 | Makefile | 3 +-- |
| 27 | 1 file changed, 1 insertion(+), 2 deletions(-) |
| 28 | |
| 29 | diff --git a/Makefile b/Makefile |
| 30 | index d45fdc3..4c53bc2 100644 |
| 31 | --- a/Makefile |
| 32 | +++ b/Makefile |
| 33 | @@ -246,8 +246,7 @@ $(PCMCIA_SOCKET_STARTUP): $(LIBC) src/startup.o src/yacc_config.o src/lex_config |
| 34 | $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) src/startup.o src/yacc_config.o src/lex_config.o $(LIB_OBJS) $(ARCH_LIB_OBJS) |
| 35 | $(QUIET) $(STRIPCMD) $@ |
| 36 | |
| 37 | -yacc_config.o lex_config.o: %.o: %.c |
| 38 | - $(CC) -c -MD -O -pipe $(CPPFLAGS) $< |
| 39 | +src/lex_config.o:src/yacc_config.h |
| 40 | |
| 41 | debugtools: ccdv $(CBDUMP) $(CISDUMP) |
| 42 | |
| 43 | -- |
| 44 | 1.9.1 |
| 45 | |