blob: 766162110955950a3f4c23822bf59c05bbcb5bc8 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
|
From: Michael Olbrich <m.olbrich@pengutronix.de>
Date: Fri, 30 Mar 2018 16:35:56 +0200
Subject: [PATCH] fix parallel building
Just use the original config.h instead of copying it. The directory is
already in the include path anyways. This is easier than adding all missing
dependencies on config.h.
Make sure that the elfdir is created before using it.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
modules/Makefile.in | 4 +---
src/Makefile.in | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/modules/Makefile.in b/modules/Makefile.in
index f82f0edbb1c9..f3a677076526 100644
--- a/modules/Makefile.in
+++ b/modules/Makefile.in
@@ -21,7 +21,7 @@ CC_SHARED_FLAGS = @CC_SHARED_FLAGS@
CC_SHARED = $(CC) $(INCS) $(CC_SHARED_FLAGS) $(CFLAGS)
CONFIG_DIR = @CONFIG_DIR@
SRCDIR = $(CONFIG_DIR)/modules
-CONFIG_H = $(SRCDIR)/config.h
+CONFIG_H = $(CONFIG_DIR)/src/config.h
SLINT_H = $(SRCDIR)/slint.h
OBJDIR = $(ARCH)objs
OBJDIR_TSTAMP = $(OBJDIR)/tstamp
@@ -95,8 +95,6 @@ COMPILE_CMD = $(CC_SHARED) $(INCS)
# ---------------------------------------------------------------------------
all: $(OBJDIR)/Makefile
cd $(OBJDIR) && $(MAKE) $(MODULES)
-$(CONFIG_H): $(CONFIG_DIR)/src/config.h
- cp $(CONFIG_DIR)/src/config.h $(CONFIG_H)
$(SLINT_H): $(CONFIG_DIR)/src/_slint.h
cp $(CONFIG_DIR)/src/_slint.h $(SLINT_H)
$(OBJDIR_TSTAMP):
diff --git a/src/Makefile.in b/src/Makefile.in
index 60681422ddfc..2df737816742 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -159,7 +159,7 @@ $(OBJDIR_NORMAL_LIB): $(OBJDIR_TSTAMP) $(CONFIG_H) $(OBJS)
@echo ""
@echo $(NORMAL_LIB) created in $(OBJDIR)
-$(ELFDIR_ELF_LIB): $(ELFDIR) $(CONFIG_H) $(ELFOBJS) $(VERSION_SCRIPT)
+$(ELFDIR_ELF_LIB): $(ELFDIR_TSTAMP) $(CONFIG_H) $(ELFOBJS) $(VERSION_SCRIPT)
-$(RM) $(ELFDIR_ELF_LIB)
cd $(ELFDIR) && $(ELF_LINK_CMD) -o $(ELFLIB_BUILD_NAME) $(OFILES) $(LDFLAGS) $(ELF_DEP_LIBS)
if [ $(ELFLIB_MAJOR) != $(ELFLIB_BUILD_NAME) ]; then \
|
