Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 305523 | Differences between
and this patch

Collapse All | Expand All

(-)makefile.orig (-27 / +28 lines)
Lines 12-18 Link Here
12
      OS_CCDEFS = -lrt -lm -D_GNU_SOURCE
12
      OS_CCDEFS = -lrt -lm -D_GNU_SOURCE
13
    endif
13
    endif
14
  endif
14
  endif
15
  CC = gcc -std=c99 -U__STRICT_ANSI__ -g $(OS_CCDEFS) -I .
15
  CC := $(CC) -std=c99 -U__STRICT_ANSI__ $(OS_CCDEFS) -I . $(CFLAGS)
16
  LIBS = -lm -lrt
16
  ifeq ($(USE_NETWORK),)
17
  ifeq ($(USE_NETWORK),)
17
  else
18
  else
18
    NETWORK_OPT = -DUSE_NETWORK -isystem /usr/local/include /usr/local/lib/libpcap.a
19
    NETWORK_OPT = -DUSE_NETWORK -isystem /usr/local/include /usr/local/lib/libpcap.a
Lines 274-402 Link Here
274
pdp1 : ${BIN}pdp1${EXE}
275
pdp1 : ${BIN}pdp1${EXE}
275
276
276
${BIN}pdp1${EXE} : ${PDP1} ${SIM}
277
${BIN}pdp1${EXE} : ${PDP1} ${SIM}
277
	${CC} ${PDP1} ${SIM} ${PDP1_OPT} -o $@ ${LDFLAGS}
278
	${CC} $(LDFLAGS) ${PDP1} ${SIM} ${PDP1_OPT} -o $@ $(LIBS)
278
279
279
pdp4 : ${BIN}pdp4${EXE}
280
pdp4 : ${BIN}pdp4${EXE}
280
281
281
${BIN}pdp4${EXE} : ${PDP18B} ${SIM}
282
${BIN}pdp4${EXE} : ${PDP18B} ${SIM}
282
	${CC} ${PDP18B} ${SIM} ${PDP4_OPT} -o $@ ${LDFLAGS}
283
	${CC} $(LDFLAGS) ${PDP18B} ${SIM} ${PDP4_OPT} -o $@ $(LIBS)
283
284
284
pdp7 : ${BIN}pdp7${EXE}
285
pdp7 : ${BIN}pdp7${EXE}
285
286
286
${BIN}pdp7${EXE} : ${PDP18B} ${SIM}
287
${BIN}pdp7${EXE} : ${PDP18B} ${SIM}
287
	${CC} ${PDP18B} ${SIM} ${PDP7_OPT} -o $@ ${LDFLAGS}
288
	${CC} $(LDFLAGS) ${PDP18B} ${SIM} ${PDP7_OPT} -o $@ $(LIBS)
288
289
289
pdp8 : ${BIN}pdp8${EXE}
290
pdp8 : ${BIN}pdp8${EXE}
290
291
291
${BIN}pdp8${EXE} : ${PDP8} ${SIM}
292
${BIN}pdp8${EXE} : ${PDP8} ${SIM}
292
	${CC} ${PDP8} ${SIM} ${PDP8_OPT} -o $@ ${LDFLAGS}
293
	${CC} $(LDFLAGS) ${PDP8} ${SIM} ${PDP8_OPT} -o $@ $(LIBS)
293
294
294
pdp9 : ${BIN}pdp9${EXE}
295
pdp9 : ${BIN}pdp9${EXE}
295
296
296
${BIN}pdp9${EXE} : ${PDP18B} ${SIM}
297
${BIN}pdp9${EXE} : ${PDP18B} ${SIM}
297
	${CC} ${PDP18B} ${SIM} ${PDP9_OPT} -o $@ ${LDFLAGS}
298
	${CC} $(LDFLAGS) ${PDP18B} ${SIM} ${PDP9_OPT} -o $@ $(LIBS)
298
299
299
pdp15 : ${BIN}pdp15${EXE}
300
pdp15 : ${BIN}pdp15${EXE}
300
301
301
${BIN}pdp15${EXE} : ${PDP18B} ${SIM}
302
${BIN}pdp15${EXE} : ${PDP18B} ${SIM}
302
	${CC} ${PDP18B} ${SIM} ${PDP15_OPT} -o $@ ${LDFLAGS}
303
	${CC} $(LDFLAGS) ${PDP18B} ${SIM} ${PDP15_OPT} -o $@ $(LIBS)
303
304
304
pdp10 : ${BIN}pdp10${EXE}
305
pdp10 : ${BIN}pdp10${EXE}
305
306
306
${BIN}pdp10${EXE} : ${PDP10} ${SIM}
307
${BIN}pdp10${EXE} : ${PDP10} ${SIM}
307
	${CC} ${PDP10} ${SIM} ${PDP10_OPT} -o $@ ${LDFLAGS}
308
	${CC} $(LDFLAGS) ${PDP10} ${SIM} ${PDP10_OPT} -o $@ $(LIBS)
308
309
309
pdp11 : ${BIN}pdp11${EXE}
310
pdp11 : ${BIN}pdp11${EXE}
310
311
311
${BIN}pdp11${EXE} : ${PDP11} ${SIM}
312
${BIN}pdp11${EXE} : ${PDP11} ${SIM}
312
	${CC} ${PDP11} ${SIM} ${PDP11_OPT} -o $@ ${LDFLAGS}
313
	${CC} $(LDFLAGS) ${PDP11} ${SIM} ${PDP11_OPT} -o $@ $(LIBS)
313
314
314
vax : ${BIN}vax${EXE}
315
vax : ${BIN}vax${EXE}
315
316
316
${BIN}vax${EXE} : ${VAX} ${SIM}
317
${BIN}vax${EXE} : ${VAX} ${SIM}
317
	${CC} ${VAX} ${SIM} ${VAX_OPT} -o $@ ${LDFLAGS}
318
	${CC} $(LDFLAGS) ${VAX} ${SIM} ${VAX_OPT} -o $@ $(LIBS)
318
319
319
vax780 : ${BIN}vax780${EXE}
320
vax780 : ${BIN}vax780${EXE}
320
321
321
${BIN}vax780${EXE} : ${VAX780} ${SIM}
322
${BIN}vax780${EXE} : ${VAX780} ${SIM}
322
	${CC} ${VAX780} ${SIM} ${VAX780_OPT} -o $@ ${LDFLAGS}
323
	${CC} $(LDFLAGS) ${VAX780} ${SIM} ${VAX780_OPT} -o $@ $(LIBS)
323
324
324
nova : ${BIN}nova${EXE}
325
nova : ${BIN}nova${EXE}
325
326
326
${BIN}nova${EXE} : ${NOVA} ${SIM}
327
${BIN}nova${EXE} : ${NOVA} ${SIM}
327
	${CC} ${NOVA} ${SIM} ${NOVA_OPT} -o $@ ${LDFLAGS}
328
	${CC} $(LDFLAGS) ${NOVA} ${SIM} ${NOVA_OPT} -o $@ $(LIBS)
328
329
329
eclipse : ${BIN}eclipse${EXE}
330
eclipse : ${BIN}eclipse${EXE}
330
331
331
${BIN}eclipse${EXE} : ${ECLIPSE} ${SIM}
332
${BIN}eclipse${EXE} : ${ECLIPSE} ${SIM}
332
	${CC} ${ECLIPSE} ${SIM} ${ECLIPSE_OPT} -o $@ ${LDFLAGS}
333
	${CC} $(LDFLAGS) ${ECLIPSE} ${SIM} ${ECLIPSE_OPT} -o $@ $(LIBS)
333
334
334
h316 : ${BIN}h316${EXE}
335
h316 : ${BIN}h316${EXE}
335
336
336
${BIN}h316${EXE} : ${H316} ${SIM}
337
${BIN}h316${EXE} : ${H316} ${SIM}
337
	${CC} ${H316} ${SIM} ${H316_OPT} -o $@ ${LDFLAGS}
338
	${CC} $(LDFLAGS) ${H316} ${SIM} ${H316_OPT} -o $@ $(LIBS)
338
339
339
hp2100 : ${BIN}hp2100${EXE}
340
hp2100 : ${BIN}hp2100${EXE}
340
341
341
${BIN}hp2100${EXE} : ${HP2100} ${SIM}
342
${BIN}hp2100${EXE} : ${HP2100} ${SIM}
342
	${CC} ${HP2100} ${SIM} ${HP2100_OPT} -o $@ ${LDFLAGS}
343
	${CC} $(LDFLAGS) ${HP2100} ${SIM} ${HP2100_OPT} -o $@ $(LIBS)
343
344
344
i1401 : ${BIN}i1401${EXE}
345
i1401 : ${BIN}i1401${EXE}
345
346
346
${BIN}i1401${EXE} : ${I1401} ${SIM}
347
${BIN}i1401${EXE} : ${I1401} ${SIM}
347
	${CC} ${I1401} ${SIM} ${I1401_OPT} -o $@ ${LDFLAGS}
348
	${CC} $(LDFLAGS) ${I1401} ${SIM} ${I1401_OPT} -o $@ $(LIBS)
348
349
349
i1620 : ${BIN}i1620${EXE}
350
i1620 : ${BIN}i1620${EXE}
350
351
351
${BIN}i1620${EXE} : ${I1620} ${SIM}
352
${BIN}i1620${EXE} : ${I1620} ${SIM}
352
	${CC} ${I1620} ${SIM} ${I1620_OPT} -o $@ ${LDFLAGS}
353
	${CC} $(LDFLAGS) ${I1620} ${SIM} ${I1620_OPT} -o $@ $(LIBS)
353
354
354
i7094 : ${BIN}i7094${EXE}
355
i7094 : ${BIN}i7094${EXE}
355
356
356
${BIN}i7094${EXE} : ${I7094} ${SIM}
357
${BIN}i7094${EXE} : ${I7094} ${SIM}
357
	${CC} ${I7094} ${SIM} ${I7094_OPT} -o $@ ${LDFLAGS}
358
	${CC} $(LDFLAGS) ${I7094} ${SIM} ${I7094_OPT} -o $@ $(LIBS)
358
359
359
ibm1130 : ${BIN}ibm1130${EXE}
360
ibm1130 : ${BIN}ibm1130${EXE}
360
361
361
${BIN}ibm1130${EXE} : ${IBM1130}
362
${BIN}ibm1130${EXE} : ${IBM1130}
362
	${CC} ${IBM1130} ${SIM} ${IBM1130_OPT} -o $@ ${LDFLAGS}
363
	${CC} $(LDFLAGS) ${IBM1130} ${SIM} ${IBM1130_OPT} -o $@ $(LIBS)
363
364
364
s3 : ${BIN}s3${EXE}
365
s3 : ${BIN}s3${EXE}
365
366
366
${BIN}s3${EXE} : ${S3} ${SIM}
367
${BIN}s3${EXE} : ${S3} ${SIM}
367
	${CC} ${S3} ${SIM} ${S3_OPT} -o $@ ${LDFLAGS}
368
	${CC} $(LDFLAGS) ${S3} ${SIM} ${S3_OPT} -o $@ $(LIBS)
368
369
369
altair : ${BIN}altair${EXE}
370
altair : ${BIN}altair${EXE}
370
371
371
${BIN}altair${EXE} : ${ALTAIR} ${SIM}
372
${BIN}altair${EXE} : ${ALTAIR} ${SIM}
372
	${CC} ${ALTAIR} ${SIM} ${ALTAIR_OPT} -o $@ ${LDFLAGS}
373
	${CC} $(LDFLAGS) ${ALTAIR} ${SIM} ${ALTAIR_OPT} -o $@ $(LIBS)
373
374
374
altairz80 : ${BIN}altairz80${EXE}
375
altairz80 : ${BIN}altairz80${EXE}
375
376
376
${BIN}altairz80${EXE} : ${ALTAIRZ80} ${SIM} 
377
${BIN}altairz80${EXE} : ${ALTAIRZ80} ${SIM} 
377
	${CC} ${ALTAIRZ80} ${SIM} ${ALTAIRZ80_OPT} -o $@ ${LDFLAGS}
378
	${CC} $(LDFLAGS) ${ALTAIRZ80} ${SIM} ${ALTAIRZ80_OPT} -o $@ $(LIBS)
378
379
379
gri : ${BIN}gri${EXE}
380
gri : ${BIN}gri${EXE}
380
381
381
${BIN}gri${EXE} : ${GRI} ${SIM}
382
${BIN}gri${EXE} : ${GRI} ${SIM}
382
	${CC} ${GRI} ${SIM} ${GRI_OPT} -o $@ ${LDFLAGS}
383
	${CC} $(LDFLAGS) ${GRI} ${SIM} ${GRI_OPT} -o $@ $(LIBS)
383
384
384
lgp : ${BIN}lgp${EXE}
385
lgp : ${BIN}lgp${EXE}
385
386
386
${BIN}lgp${EXE} : ${LGP} ${SIM}
387
${BIN}lgp${EXE} : ${LGP} ${SIM}
387
	${CC} ${LGP} ${SIM} ${LGP_OPT} -o $@ ${LDFLAGS}
388
	${CC} $(LDFLAGS) ${LGP} ${SIM} ${LGP_OPT} -o $@ $(LIBS)
388
389
389
id16 : ${BIN}id16${EXE}
390
id16 : ${BIN}id16${EXE}
390
391
391
${BIN}id16${EXE} : ${ID16} ${SIM}
392
${BIN}id16${EXE} : ${ID16} ${SIM}
392
	${CC} ${ID16} ${SIM} ${ID16_OPT} -o $@ ${LDFLAGS}
393
	${CC} $(LDFLAGS) ${ID16} ${SIM} ${ID16_OPT} -o $@ $(LIBS)
393
394
394
id32 : ${BIN}id32${EXE}
395
id32 : ${BIN}id32${EXE}
395
396
396
${BIN}id32${EXE} : ${ID32} ${SIM}
397
${BIN}id32${EXE} : ${ID32} ${SIM}
397
	${CC} ${ID32} ${SIM} ${ID32_OPT} -o $@ ${LDFLAGS}
398
	${CC} $(LDFLAGS) ${ID32} ${SIM} ${ID32_OPT} -o $@ $(LIBS)
398
399
399
sds : ${BIN}sds${EXE}
400
sds : ${BIN}sds${EXE}
400
401
401
${BIN}sds${EXE} : ${SDS} ${SIM}
402
${BIN}sds${EXE} : ${SDS} ${SIM}
402
	${CC} ${SDS} ${SIM} ${SDS_OPT} -o $@ ${LDFLAGS}
403
	${CC} $(LDFLAGS) ${SDS} ${SIM} ${SDS_OPT} -o $@ $(LIBS)

Return to bug 305523