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
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
|
From: Robert Schwebel <r.schwebel@pengutronix.de>
Date: Sun, 1 Jun 2014 22:33:36 +0200
Subject: [PATCH] Makefile.in: fix suffix rules
With modern toolchains, "%o: %c" isn't a correct suffix rule any more
and make falls back to the built-in default rules, which gives us this
error:
make[2]: Leaving directory 'CanFestival-3-20081204-1/objdictgen'
timers_unix.c:7:22: fatal error: applicfg.h: No such file or directory
#include "applicfg.h"
^
compilation terminated.
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
drivers/can_anagate_linux/Makefile.in | 2 +-
drivers/can_anagate_win32/Makefile.in | 4 ++--
drivers/can_can4linux/Makefile.in | 2 +-
drivers/can_kvaser/Makefile.in | 2 +-
drivers/can_lincan/Makefile.in | 2 +-
drivers/can_peak_linux/Makefile.in | 2 +-
drivers/can_peak_win32/Makefile.in | 2 +-
drivers/can_serial/Makefile.in | 2 +-
drivers/can_socket/Makefile.in | 2 +-
drivers/can_tcp_win32/Makefile.in | 4 ++--
drivers/can_virtual/Makefile.in | 2 +-
drivers/can_vscom/Makefile.in | 2 +-
drivers/hcs12/Makefile.in | 4 ++--
drivers/timers_rtai/Makefile.in | 2 +-
drivers/timers_unix/Makefile.in | 2 +-
drivers/timers_win32/Makefile.in | 2 +-
drivers/timers_xeno/Makefile.in | 2 +-
drivers/unix/Makefile.in | 2 +-
drivers/win32/Makefile.in | 2 +-
examples/DS401_Master/Makefile.in | 2 +-
examples/DS401_Slave_Gui/Makefile.in | 2 +-
examples/SillySlave/Makefile.in | 2 +-
examples/TestMasterMicroMod/Makefile.in | 2 +-
examples/TestMasterSlave/Makefile.in | 2 +-
examples/TestMasterSlaveLSS/Makefile.in | 2 +-
examples/gene_SYNC_HCS12/Makefile.in | 4 ++--
26 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/drivers/can_anagate_linux/Makefile.in b/drivers/can_anagate_linux/Makefile.in
index 2ea521b..5c96ed1 100644
--- a/drivers/can_anagate_linux/Makefile.in
+++ b/drivers/can_anagate_linux/Makefile.in
@@ -49,7 +49,7 @@ all: driver
driver: $(DRIVER)
-%o: %c
+%.o: %.c
$(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
libcanfestival_$(CAN_DRIVER).so: $(OBJS)
diff --git a/drivers/can_anagate_win32/Makefile.in b/drivers/can_anagate_win32/Makefile.in
index 79274ce..6926cec 100644
--- a/drivers/can_anagate_win32/Makefile.in
+++ b/drivers/can_anagate_win32/Makefile.in
@@ -53,10 +53,10 @@ all: driver
driver: $(DRIVER)
-%o: %c
+%.o: %.c
$(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
-%o: %cpp
+%.o: %.cpp
$(CXX) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
$(DRIVER): $(OBJS)
diff --git a/drivers/can_can4linux/Makefile.in b/drivers/can_can4linux/Makefile.in
index 3caddb4..32c5cb6 100644
--- a/drivers/can_can4linux/Makefile.in
+++ b/drivers/can_can4linux/Makefile.in
@@ -48,7 +48,7 @@ all: driver
driver: $(DRIVER)
-%o: %c
+%.o: %.c
$(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
libcanfestival_$(CAN_DRIVER).so: $(OBJS)
diff --git a/drivers/can_kvaser/Makefile.in b/drivers/can_kvaser/Makefile.in
index e119372..b8e177c 100644
--- a/drivers/can_kvaser/Makefile.in
+++ b/drivers/can_kvaser/Makefile.in
@@ -58,7 +58,7 @@ all: driver
driver: $(DRIVER)
-%o: %c
+%.o: %.c
$(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
$(DRIVER): $(OBJS)
diff --git a/drivers/can_lincan/Makefile.in b/drivers/can_lincan/Makefile.in
index 3caddb4..32c5cb6 100644
--- a/drivers/can_lincan/Makefile.in
+++ b/drivers/can_lincan/Makefile.in
@@ -48,7 +48,7 @@ all: driver
driver: $(DRIVER)
-%o: %c
+%.o: %.c
$(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
libcanfestival_$(CAN_DRIVER).so: $(OBJS)
diff --git a/drivers/can_peak_linux/Makefile.in b/drivers/can_peak_linux/Makefile.in
index 2ea521b..5c96ed1 100644
--- a/drivers/can_peak_linux/Makefile.in
+++ b/drivers/can_peak_linux/Makefile.in
@@ -49,7 +49,7 @@ all: driver
driver: $(DRIVER)
-%o: %c
+%.o: %.c
$(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
libcanfestival_$(CAN_DRIVER).so: $(OBJS)
diff --git a/drivers/can_peak_win32/Makefile.in b/drivers/can_peak_win32/Makefile.in
index 8f75395..f29df6c 100644
--- a/drivers/can_peak_win32/Makefile.in
+++ b/drivers/can_peak_win32/Makefile.in
@@ -51,7 +51,7 @@ all: driver
driver: $(DRIVER)
-%o: %c cancfg.h
+%.o: %.c cancfg.h
$(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
cyg$(CAN_DRIVER).dll: $(OBJS)
diff --git a/drivers/can_serial/Makefile.in b/drivers/can_serial/Makefile.in
index 69251a5..5f79bbe 100644
--- a/drivers/can_serial/Makefile.in
+++ b/drivers/can_serial/Makefile.in
@@ -56,7 +56,7 @@ $(HUB): $(HUB).c
driver: $(DRIVER) $(HUB)
-%o: %c
+%.o: %.c
$(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
libcanfestival_$(CAN_DRIVER).so: $(OBJS)
diff --git a/drivers/can_socket/Makefile.in b/drivers/can_socket/Makefile.in
index 34ecf1a..8197866 100644
--- a/drivers/can_socket/Makefile.in
+++ b/drivers/can_socket/Makefile.in
@@ -49,7 +49,7 @@ all: driver
driver: $(DRIVER)
-%o: %c
+%.o: %.c
$(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
libcanfestival_$(CAN_DRIVER).so: $(OBJS)
diff --git a/drivers/can_tcp_win32/Makefile.in b/drivers/can_tcp_win32/Makefile.in
index 2a13db2..321bf0c 100755
--- a/drivers/can_tcp_win32/Makefile.in
+++ b/drivers/can_tcp_win32/Makefile.in
@@ -59,10 +59,10 @@ $(SERVER).exe: Socket.o $(SERVER).cpp
Socket.o: Socket.cpp Socket.h
$(CXX) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -c $< -o $@
-%o: %c
+%.o: %.c
$(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
-%o: %cpp
+%.o: %.cpp
$(CXX) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
$(DRIVER): $(OBJS)
diff --git a/drivers/can_virtual/Makefile.in b/drivers/can_virtual/Makefile.in
index 8e479ca..e543a95 100644
--- a/drivers/can_virtual/Makefile.in
+++ b/drivers/can_virtual/Makefile.in
@@ -49,7 +49,7 @@ all: driver
driver: $(DRIVER)
-%o: %c
+%.o: %.c
$(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
libcanfestival_$(CAN_DRIVER).so: $(OBJS)
diff --git a/drivers/can_vscom/Makefile.in b/drivers/can_vscom/Makefile.in
index 58b0c88..26493db 100755
--- a/drivers/can_vscom/Makefile.in
+++ b/drivers/can_vscom/Makefile.in
@@ -76,7 +76,7 @@ vs_can_api.h:
driver: vs_can_api.h $(DRIVER)
-%o: %c
+%.o: %.c
$(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
libcanfestival_$(CAN_DRIVER).$(DLL_TYPE): $(OBJS)
diff --git a/drivers/hcs12/Makefile.in b/drivers/hcs12/Makefile.in
index 2fb0ca4..6ddaea3 100644
--- a/drivers/hcs12/Makefile.in
+++ b/drivers/hcs12/Makefile.in
@@ -48,14 +48,14 @@ libcandriver.a: $(OBJS)
ar rc $@ $(OBJS)
ranlib $@
-%o: %c
+%.o: %.c
@echo " "
@echo "*********************************************"
@echo "**Compiling $< -> $@"
@echo "*********************************************"
$(CC) $(OPT_CFLAGS) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -c -o $@ $<
-%o: %s
+%.o: %.s
@echo " "
@echo "*********************************************"
@echo "**Compiling $< -> $@"
diff --git a/drivers/timers_rtai/Makefile.in b/drivers/timers_rtai/Makefile.in
index 0990369..4efd4c7 100755
--- a/drivers/timers_rtai/Makefile.in
+++ b/drivers/timers_rtai/Makefile.in
@@ -44,7 +44,7 @@ all: driver
driver: $(OBJS)
-%o: %c
+%.o: %.c
$(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
install:
diff --git a/drivers/timers_unix/Makefile.in b/drivers/timers_unix/Makefile.in
index a5c141d..c62763a 100644
--- a/drivers/timers_unix/Makefile.in
+++ b/drivers/timers_unix/Makefile.in
@@ -44,7 +44,7 @@ all: driver
driver: $(OBJS)
-%o: %c
+%.o: %.c
$(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
install:
diff --git a/drivers/timers_win32/Makefile.in b/drivers/timers_win32/Makefile.in
index 61c88f8..e19c35a 100755
--- a/drivers/timers_win32/Makefile.in
+++ b/drivers/timers_win32/Makefile.in
@@ -46,7 +46,7 @@ all: driver
driver: $(OBJS)
-%o: %cpp
+%.o: %.cpp
$(CXX) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
install:
diff --git a/drivers/timers_xeno/Makefile.in b/drivers/timers_xeno/Makefile.in
index 0990369..4efd4c7 100644
--- a/drivers/timers_xeno/Makefile.in
+++ b/drivers/timers_xeno/Makefile.in
@@ -44,7 +44,7 @@ all: driver
driver: $(OBJS)
-%o: %c
+%.o: %.c
$(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
install:
diff --git a/drivers/unix/Makefile.in b/drivers/unix/Makefile.in
index f8cc854..ef09017 100644
--- a/drivers/unix/Makefile.in
+++ b/drivers/unix/Makefile.in
@@ -82,7 +82,7 @@ CFLAGS = SUB_OPT_CFLAGS
driver: $(OBJS)
-%o: %c
+%.o: %.c
$(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
#../$(TIMERS_DRIVER)/$(TIMERS_DRIVER).o:
diff --git a/drivers/win32/Makefile.in b/drivers/win32/Makefile.in
index 7c787d3..63f66ee 100755
--- a/drivers/win32/Makefile.in
+++ b/drivers/win32/Makefile.in
@@ -54,7 +54,7 @@ all: driver
driver: $(OBJS)
-%o: %cpp
+%.o: %.cpp
$(CXX) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
#../$(TIMERS_DRIVER)/$(TIMERS_DRIVER).o:
diff --git a/examples/DS401_Master/Makefile.in b/examples/DS401_Master/Makefile.in
index 8d4689a..441750b 100644
--- a/examples/DS401_Master/Makefile.in
+++ b/examples/DS401_Master/Makefile.in
@@ -55,7 +55,7 @@ TestMaster.c: TestMaster.od
$(MAKE) -C ../../objdictgen gnosis
python ../../objdictgen/objdictgen.py TestMaster.od TestMaster.c
-%o: %c
+%.o: %.c
$(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
clean:
diff --git a/examples/DS401_Slave_Gui/Makefile.in b/examples/DS401_Slave_Gui/Makefile.in
index 65df028..f600eb7 100644
--- a/examples/DS401_Slave_Gui/Makefile.in
+++ b/examples/DS401_Slave_Gui/Makefile.in
@@ -54,7 +54,7 @@ all: DS401_Slave_Gui
DS401_Slave_Gui: ObjDict.c $(OBJS) $(CPP_OBJS)
$(LD) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) $(OBJS) $(CPP_OBJS) $(EXE_CFLAGS) `wx-config --libs` -o $@
-%o: %c
+%.o: %.c
$(CC) -c $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) $< -o $@
ObjDict.c: ObjDict.od
diff --git a/examples/SillySlave/Makefile.in b/examples/SillySlave/Makefile.in
index 897bd53..4ec1d59 100644
--- a/examples/SillySlave/Makefile.in
+++ b/examples/SillySlave/Makefile.in
@@ -55,7 +55,7 @@ SillySlave.c: SillySlave.od
$(MAKE) -C ../../objdictgen gnosis
python ../../objdictgen/objdictgen.py SillySlave.od SillySlave.c
-%o: %c
+%.o: %.c
$(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
clean:
diff --git a/examples/TestMasterMicroMod/Makefile.in b/examples/TestMasterMicroMod/Makefile.in
index 97c3357..7d808d3 100644
--- a/examples/TestMasterMicroMod/Makefile.in
+++ b/examples/TestMasterMicroMod/Makefile.in
@@ -63,7 +63,7 @@ TestMaster.c: TestMaster.od
$(MAKE) -C ../../objdictgen gnosis
python ../../objdictgen/objdictgen.py TestMaster.od TestMaster.c
-%o: %c
+%.o: %.c
$(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
clean:
diff --git a/examples/TestMasterSlave/Makefile.in b/examples/TestMasterSlave/Makefile.in
index b8ffd2f..41b9b5d 100644
--- a/examples/TestMasterSlave/Makefile.in
+++ b/examples/TestMasterSlave/Makefile.in
@@ -75,7 +75,7 @@ TestMaster.c: TestMaster.od
$(MAKE) -C ../../objdictgen gnosis
python ../../objdictgen/objdictgen.py TestMaster.od TestMaster.c
-%o: %c
+%.o: %.c
$(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
clean:
diff --git a/examples/TestMasterSlaveLSS/Makefile.in b/examples/TestMasterSlaveLSS/Makefile.in
index 3f01c41..ccdf7f1 100644
--- a/examples/TestMasterSlaveLSS/Makefile.in
+++ b/examples/TestMasterSlaveLSS/Makefile.in
@@ -74,7 +74,7 @@ TestMaster.c: TestMaster.od
$(MAKE) -C ../../objdictgen gnosis
python ../../objdictgen/objdictgen.py TestMaster.od TestMaster.c
-%o: %c
+%.o: %.c
$(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $<
clean:
diff --git a/examples/gene_SYNC_HCS12/Makefile.in b/examples/gene_SYNC_HCS12/Makefile.in
index fac95b1..ba7cb63 100644
--- a/examples/gene_SYNC_HCS12/Makefile.in
+++ b/examples/gene_SYNC_HCS12/Makefile.in
@@ -61,14 +61,14 @@ LDFLAGS= -Wl,-m,m68hc12elfb -L$(MEMORY_X)
all: $(PGR).elf $(PGR).s19 $(PGR).b $(PGR).s MSG
-%o: %c
+%.o: %.c
@echo " "
@echo "*********************************************"
@echo "**Compiling $< -> $@"
@echo "*********************************************"
$(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -c -o $@ $<
-%o: %s
+%.o: %.s
@echo " "
@echo "*********************************************"
@echo "**Compiling $< -> $@"
|
