1 From 0db72ac0c57a9f15ae6999e4ccf85a9db1e752fd Mon Sep 17 00:00:00 2001
2 From: babak sarashki <babak.sarashki@windriver.com>
3 Date: Thu, 27 Jun 2019 22:25:15 -0700
4 Subject: [PATCH] Use LDFLAGS when linking and pass flags down to submakes
7 Makefile | 27 +++++++++++++++------------
11 heartbeat/Makefile | 7 +++++--
15 maintenance/Makefile | 4 ++--
16 mtclog/Makefile | 2 +-
18 11 files changed, 30 insertions(+), 24 deletions(-)
20 diff --git a/Makefile b/Makefile
21 index a9ec0e2..8c256f1 100755
24 @@ -8,18 +8,21 @@ VER=1
28 - (cd public ; make lib VER=$(VER) VER_MJR=$(VER_MJR))
29 - (cd common ; make lib VER=$(VER) VER_MJR=$(VER_MJR))
30 - (cd alarm ; make build VER=$(VER) VER_MJR=$(VER_MJR))
31 - (cd heartbeat ; make build VER=$(VER) VER_MJR=$(VER_MJR))
32 - (cd maintenance ; make build VER=$(VER) VER_MJR=$(VER_MJR))
33 - (cd hwmon ; make build VER=$(VER) VER_MJR=$(VER_MJR))
34 - (cd mtclog ; make build VER=$(VER) VER_MJR=$(VER_MJR))
35 - (cd lmon ; make build VER=$(VER) VER_MJR=$(VER_MJR))
36 - (cd pmon ; make build VER=$(VER) VER_MJR=$(VER_MJR))
37 - (cd fsmon ; make build VER=$(VER) VER_MJR=$(VER_MJR))
38 - (cd hostw ; make build VER=$(VER) VER_MJR=$(VER_MJR))
39 - (cd fsync ; make build VER=$(VER) VER_MJR=$(VER_MJR))
42 + make -e CCFLAGS="$(CCFLAGS) -fPIC" LDFLAGS="$(LDFLAGS) -shared" INCLUDES="$(INCLUDES)" lib VER=$(VER) VER_MJR=$(VER_MJR) \
44 + (cd common ; make -e LDFLAGS="$(LDFLAGS)" CCFLAGS="$(CCFLAGS)" INCLUDES="$(INCLUDES)" lib VER=$(VER) VER_MJR=$(VER_MJR))
45 + (cd alarm ; make -e LDFLAGS="$(LDFLAGS)" CCFLAGS="$(CCFLAGS)" INCLUDES="$(INCLUDES)" build VER=$(VER) VER_MJR=$(VER_MJR))
46 + (cd heartbeat ; make -e LDFLAGS="$(LDFLAGS)" CCFLAGS="$(CCFLAGS)" INCLUDES="$(INCLUDES)" build VER=$(VER) VER_MJR=$(VER_MJR))
47 + (cd maintenance ; make -e LDFLAGS="$(LDFLAGS)" CCFLAGS="$(CCFLAGS)" INCLUDES="$(INCLUDES)" build VER=$(VER) VER_MJR=$(VER_MJR))
48 + (cd hwmon ; make -e LDFLAGS="$(LDFLAGS)" CCFLAGS="$(CCFLAGS)" INCLUDES="$(INCLUDES)" build VER=$(VER) VER_MJR=$(VER_MJR))
49 + (cd mtclog ; make -e LDFLAGS="$(LDFLAGS)" CCFLAGS="$(CCFLAGS)" INCLUDES="$(INCLUDES)" build VER=$(VER) VER_MJR=$(VER_MJR))
50 + (cd lmon ; make -e LDFLAGS="$(LDFLAGS)" CCFLAGS="$(CCFLAGS)" INCLUDES="$(INCLUDES)" build VER=$(VER) VER_MJR=$(VER_MJR))
51 + (cd pmon ; make -e LDFLAGS="$(LDFLAGS)" CCFLAGS="$(CCFLAGS)" INCLUDES="$(INCLUDES)" build VER=$(VER) VER_MJR=$(VER_MJR))
52 + (cd fsmon ; make -e LDFLAGS="$(LDFLAGS)" CCFLAGS="$(CCFLAGS)" INCLUDES="$(INCLUDES)" build VER=$(VER) VER_MJR=$(VER_MJR))
53 + (cd hostw ; make -e LDFLAGS="$(LDFLAGS)" CCFLAGS="$(CCFLAGS)" INCLUDES="$(INCLUDES)" build VER=$(VER) VER_MJR=$(VER_MJR))
54 + (cd fsync ; make -e LDFLAGS="$(LDFLAGS)" CCFLAGS="$(CCFLAGS)" INCLUDES="$(INCLUDES)" build VER=$(VER) VER_MJR=$(VER_MJR))
57 @( cd common ; make clean )
58 diff --git a/alarm/Makefile b/alarm/Makefile
59 index a27b0fb..cff233c 100755
62 @@ -43,7 +43,7 @@ library:
63 ar rcs libalarm.a alarm.o $(EXTRAARFLAGS)
66 - $(CXX) $(CCFLAGS) ${OBJS} -L../daemon -L../common $(LDLIBS) $(EXTRALDFLAGS) -o mtcalarmd
67 + $(CXX) $(CCFLAGS) $(LDFLAGS) ${OBJS} -L../daemon -L../common $(LDLIBS) $(EXTRALDFLAGS) -o mtcalarmd
71 diff --git a/fsmon/Makefile b/fsmon/Makefile
72 index b53cce0..33256ab 100644
75 @@ -28,7 +28,7 @@ else
78 build: clean static_analysis $(OBJS)
79 - $(CXX) $(CCFLAGS) $(OBJS) -L../daemon -L../common $(LDLIBS) $(EXTRALDFLAGS) -o fsmond
80 + $(CXX) $(CCFLAGS) $(LDFLAGS) $(OBJS) -L../daemon -L../common $(LDLIBS) $(EXTRALDFLAGS) -o fsmond
83 ( cd ../common ; make clean ; make lib VER=$(VER) VER_MJR=$(VER_MJR))
84 diff --git a/fsync/Makefile b/fsync/Makefile
85 index b041f15..85c1543 100644
88 @@ -16,7 +16,7 @@ all: build
89 $(CC) $(INCLUDES) $(CCFLAGS) $(EXTRACCFLAGS) -c $< -o $@
92 - $(CC) $(OBJS) $(LDLIBS) -o fsync
93 + $(CC) $(CCFLAGS) $(LDFLAGS) $(OBJS) $(LDLIBS) -o fsync
96 @rm -v -f $(OBJS) fsync
97 diff --git a/heartbeat/Makefile b/heartbeat/Makefile
98 index a625f20..b8deda7 100755
99 --- a/heartbeat/Makefile
100 +++ b/heartbeat/Makefile
101 @@ -33,8 +33,11 @@ endif
102 all: static_analysis common agent client
104 build: static_analysis $(OBJS)
105 - $(CXX) $(CCFLAGS) hbsAlarm.o hbsAgent.o hbsUtil.o hbsCluster.o hbsStubs.o ../common/nodeClass.o -L../public -L../alarm $(LDLIBS) $(EXTRALDFLAGS) -o hbsAgent
106 - $(CXX) $(CCFLAGS) hbsClient.o hbsPmon.o hbsUtil.o -L../public -L../alarm $(LDLIBS) $(EXTRALDFLAGS) -o hbsClient
107 + $(CXX) $(CCFLAGS) $(LDFLAGS) \
108 + hbsAlarm.o hbsAgent.o hbsUtil.o hbsCluster.o hbsStubs.o ../common/nodeClass.o -L../public -L../alarm \
109 + $(LDLIBS) $(EXTRALDFLAGS) -o hbsAgent
111 + $(CXX) $(CCFLAGS) $(LDFLAGS) hbsClient.o hbsPmon.o hbsUtil.o -L../public -L../alarm $(LDLIBS) $(EXTRALDFLAGS) -o hbsClient
114 ( cd ../common ; make clean ; make lib VER=$(VER) VER_MJR=$(VER_MJR))
115 diff --git a//hostw/Makefile b/hostw/Makefile
116 index d72708c..af18059 100755
119 @@ -28,7 +28,7 @@ else
122 build: clean static_analysis $(OBJS)
123 - $(CXX) $(CCFLAGS) $(OBJS) -L../daemon -L../common $(LDLIBS) $(EXTRALDFLAGS) -o hostwd
124 + $(CXX) $(CCFLAGS) $(LDFLAGS) $(OBJS) -L../daemon -L../common $(LDLIBS) $(EXTRALDFLAGS) -o hostwd
127 ( cd ../common ; make clean ; make -j1 lib VER=$(VER) VER_MJR=$(VER_MJR))
128 diff --git a/hwmon/Makefile b/hwmon/Makefile
129 index 6d7cee3..c168c43 100644
132 @@ -45,7 +45,7 @@ else
135 build: clean static_analysis $(OBJS)
136 - $(CXX) $(CCFLAGS) $(OBJS) -L../daemon -L../common $(LDLIBS) $(EXTRALDFLAGS) -o $(BIN)
137 + $(CXX) $(CCFLAGS) $(LDFLAGS) $(OBJS) -L../daemon -L../common $(LDLIBS) $(EXTRALDFLAGS) -o $(BIN)
140 ( cd ../common ; make lib VER=$(VER) VER_MJR=$(VER_MJR))
141 diff --git a/lmon/Makefile b/lmon/Makefile
142 index 9e328a4..a1a8519 100755
145 @@ -29,7 +29,7 @@ else
148 build: clean static_analysis $(OBJS)
149 - $(CXX) $(CCFLAGS) $(OBJS) $(LDPATH) $(LDLIBS) $(EXTRALDFLAGS) -o lmond
150 + $(CXX) $(CCFLAGS) $(LDFLAGS) $(OBJS) $(LDPATH) $(LDLIBS) $(EXTRALDFLAGS) -o lmond
153 @rm -v -f $(OBJ) lmond *.o *.a
154 diff --git a/maintenance/Makefile b/maintenance/Makefile
155 index 85c2db6..e6a8892 100755
156 --- a/maintenance/Makefile
157 +++ b/maintenance/Makefile
158 @@ -77,10 +77,10 @@ common:
159 ( cd ../common ; make clean ; make lib VER=$(VER) VER_MJR=$(VER_MJR))
162 - $(CXX) $(CONTROL_OBJS) -L../public -L../alarm $(LDLIBS) $(EXTRALDFLAGS) -o mtcAgent
163 + $(CXX) $(CCFLAGS) $(LDFLAGS) $(CONTROL_OBJS) -L../public -L../alarm $(LDLIBS) $(EXTRALDFLAGS) -o mtcAgent
166 - $(CXX) $(COMPUTE_OBJS) -L../public -L../alarm $(LDLIBS) $(EXTRALDFLAGS) -o mtcClient
167 + $(CXX) $(CCFLAGS) $(LDFLAGS) $(COMPUTE_OBJS) -L../public -L../alarm $(LDLIBS) $(EXTRALDFLAGS) -o mtcClient
171 diff --git a/mtclog/Makefile b/mtclog/Makefile
172 index 1d49aa4..fb513d9 100644
173 --- a/mtclog/Makefile
174 +++ b/mtclog/Makefile
175 @@ -30,7 +30,7 @@ else
178 build: clean static_analysis $(OBJS)
179 - $(CXX) $(CCFLAGS) $(OBJS) -L../daemon -L../common $(LDLIBS) $(EXTRALDFLAGS) -o mtclogd
180 + $(CXX) $(CCFLAGS) $(LDFLAGS) $(OBJS) -L../daemon -L../common $(LDLIBS) $(EXTRALDFLAGS) -o mtclogd
183 ( cd ../common ; make clean ; make lib VER=$(VER) VER_MJR=$(VER_MJR))
184 diff --git a/pmon/Makefile b/pmon/Makefile
185 index f75f2be..c34e204 100755
188 @@ -29,7 +29,7 @@ else
191 build: clean static_analysis $(OBJS)
192 - $(CXX) $(CCFLAGS) $(OBJS) -L../daemon -L../common $(LDLIBS) $(EXTRALDFLAGS) -o pmond
193 + $(CXX) $(CCFLAGS) $(LDFLAGS) $(OBJS) -L../daemon -L../common $(LDLIBS) $(EXTRALDFLAGS) -o pmond
196 ( cd ../common ; make clean ; make lib VER=$(VER) VER_MJR=$(VER_MJR))