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
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
|
From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi@debian.org>
Date: Mon, 19 Dec 2016 21:36:05 +0100
Subject: Use CPPFLAGS from the environment
---
dlm_controld/Makefile | 4 ++--
dlm_tool/Makefile | 2 +-
fence/Makefile | 2 +-
libdlm/Makefile | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlm_controld/Makefile b/dlm_controld/Makefile
index 328a64b..5346f8b 100644
--- a/dlm_controld/Makefile
+++ b/dlm_controld/Makefile
@@ -91,10 +91,10 @@ endif
ifneq ($(SYSTEMD_LDFLAGS_STATUS),0)
$(error "Failed to call pkg-config for systemd ldflags: $(SYSTEMD_LDFLAGS)")
endif
- $(CC) $(BIN_SOURCE) $(BIN_CFLAGS) $(CPG_CFLAGS) $(SYSTEMD_CFLAGS) $(BIN_LDFLAGS) $(CPG_LDFLAGS) $(SYSTEMD_LDFLAGS) -o $@ -L.
+ $(CC) $(CPPFLAGS) $(BIN_SOURCE) $(BIN_CFLAGS) $(CPG_CFLAGS) $(SYSTEMD_CFLAGS) $(BIN_LDFLAGS) $(CPG_LDFLAGS) $(SYSTEMD_LDFLAGS) -o $@ -L.
$(LIB_TARGET): $(LIB_SOURCE)
- $(CC) $^ $(LIB_CFLAGS) $(LIB_LDFLAGS) -shared -o $@ -Wl,-soname=$(LIB_SMAJOR)
+ $(CC) $(CPPFLAGS) $^ $(LIB_CFLAGS) $(LIB_LDFLAGS) -shared -o $@ -Wl,-soname=$(LIB_SMAJOR)
ln -sf $(LIB_TARGET) $(LIB_SO)
ln -sf $(LIB_TARGET) $(LIB_SMAJOR)
diff --git a/dlm_tool/Makefile b/dlm_tool/Makefile
index 1c3d61d..34907c0 100644
--- a/dlm_tool/Makefile
+++ b/dlm_tool/Makefile
@@ -27,7 +27,7 @@ LDFLAGS += -lpthread -ldlm -ldlmcontrol
all: $(BIN_TARGET)
$(BIN_TARGET): $(BIN_SOURCE)
- $(CC) $(BIN_SOURCE) $(CFLAGS) $(LDFLAGS) -o $@
+ $(CC) $(CPPFLAGS) $(BIN_SOURCE) $(CFLAGS) $(LDFLAGS) -o $@
clean:
rm -f *.o *.so *.so.* $(BIN_TARGET)
diff --git a/fence/Makefile b/fence/Makefile
index 263657e..c55bb02 100644
--- a/fence/Makefile
+++ b/fence/Makefile
@@ -35,7 +35,7 @@ $(BIN_TARGET): $(BIN_SOURCE)
ifneq ($(PACEMAKER_CFLAGS_STATUS),0)
$(error "Failed to call pkg-config for pacemaker cflags: $(PACEMAKER_CFLAGS)")
endif
- $(CC) $(BIN_SOURCE) $(CFLAGS) $(PACEMAKER_CFLAGS) $(LDFLAGS) -o $@ -L.
+ $(CC) $(CPPFLAGS) $(BIN_SOURCE) $(CFLAGS) $(PACEMAKER_CFLAGS) $(LDFLAGS) -o $@ -L.
clean:
rm -f *.o *.so *.so.* $(BIN_TARGET)
diff --git a/libdlm/Makefile b/libdlm/Makefile
index 918fb46..19fa3e0 100644
--- a/libdlm/Makefile
+++ b/libdlm/Makefile
@@ -89,10 +89,10 @@ LLT_LDFLAGS += $(LDFLAGS) -Wl,-z,now
all: $(LIB_TARGET) $(LLT_TARGET) $(LIB_PC) $(LLT_PC)
$(LIB_O): $(SOURCE)
- $(CC) $< $(LIB_CFLAGS) -c -o $@
+ $(CC) $(CPPFLAGS) $< $(LIB_CFLAGS) -c -o $@
$(LLT_O): $(SOURCE)
- $(CC) $< $(LLT_CFLAGS) -c -o $@
+ $(CC) $(CPPFLAGS) $< $(LLT_CFLAGS) -c -o $@
$(LIB_TARGET): $(LIB_O)
$(CC) $^ $(LIB_LDFLAGS) -shared -o $@ -Wl,-soname=$(LIB_SMAJOR)
|
