~ubuntu-branches/ubuntu/maverick/vice/maverick

« back to all changes in this revision

Viewing changes to src/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Zed Pobre
  • Date: 2005-02-01 11:30:26 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20050201113026-3eyakzsmmheclvjg
Tags: 1.16-1
* New upstream version
* Fixes crash on 64-bit architectures (closes: #287640)
* x128 working again (closes: #286767)
* Works fine with /dev/dsp in use (not in the main changelog, but tested
  on my local machine as working).  Presumably, this also takes care of
  the issue with dsp being held.  I'm not sure if this is because I'm
  testing it on a 2.6 kernel now -- if you are still having problems
  with /dev/dsp, please reopen the bugs. (closes: #152952, #207942)
* Don't kill Makefile.in on clean

Show diffs side-by-side

added added

removed removed

Lines of Context:
65
65
        color.h \
66
66
        config.h.in \
67
67
        console.h \
 
68
        crc32.h \
68
69
        datasette.h \
69
70
        debug.h \
70
71
        diskconstants.h \
105
106
        monitor.h \
106
107
        mos6510.h \
107
108
        mouse.h \
 
109
        opencbmlib.h \
108
110
        palette.h \
109
111
        parallel.h \
110
112
        petui.h \
120
122
        rsuser.h \
121
123
        screenshot.h \
122
124
        serial.h \
 
125
        signals.h \
123
126
        snapshot.h \
124
127
        sound.h \
125
128
        sysfile.h \
157
160
        cbmdos.c \
158
161
        cbmimage.c \
159
162
        color.c \
 
163
        crc32.c \
160
164
        datasette.c \
161
165
        debug.c \
162
166
        dma.c \
220
224
diskimage_lib = $(top_builddir)/src/diskimage/libdiskimage.a
221
225
drive_lib = $(top_builddir)/src/drive/libdrive.a
222
226
driveiec_lib = $(top_builddir)/src/drive/iec/libdriveiec.a
 
227
driveiec128dcr_lib = $(top_builddir)/src/drive/iec128dcr/libdriveiec128dcr.a
223
228
driveiecieee_lib = $(top_builddir)/src/drive/iecieee/libdriveiecieee.a
224
229
driveieee_lib = $(top_builddir)/src/drive/ieee/libdriveieee.a
225
230
drivetcbm_lib = $(top_builddir)/src/drive/tcbm/libdrivetcbm.a
256
261
blockdev_lib =
257
262
endif
258
263
 
 
264
if HAVE_REALDEVICE
 
265
realdevice_lib = @ARCH_DIR@/opencbmlib.o
 
266
else
 
267
realdevice_lib =
 
268
endif
 
269
 
259
270
bin_PROGRAMS = x64 x128 xvic xpet xplus4 xcbm2 c1541 petcat
260
271
 
261
272
EXTRA_PROGRAMS =
265
276
        @X64_WINRES@ \
266
277
        $(c64_lib) \
267
278
        $(c64cart_lib) \
268
 
        $(drive_lib) \
269
279
        $(driveiec_lib) \
270
280
        $(driveiecieee_lib) \
271
281
        $(driveieee_lib) \
 
282
        $(drive_lib) \
272
283
        $(iecbus_lib) \
273
284
        $(parallel_lib) \
274
285
        $(vdrive_lib) \
289
300
        @RESID_DEP@ \
290
301
        libc64 \
291
302
        libc64cart \
292
 
        libdrive \
293
303
        libdriveiec \
294
304
        libdriveiecieee \
295
305
        libdriveieee \
 
306
        libdrive \
296
307
        libparallel \
297
308
        libvdrive \
298
309
        libraster \
321
332
        $(c128_lib) \
322
333
        $(c64c128_lib) \
323
334
        $(c64cart_lib) \
324
 
        $(drive_lib) \
325
335
        $(driveiec_lib) \
 
336
        $(driveiec128dcr_lib) \
326
337
        $(driveiecieee_lib) \
327
338
        $(driveieee_lib) \
 
339
        $(drive_lib) \
328
340
        $(iecbus_lib) \
329
341
        $(parallel_lib) \
330
342
        $(vdrive_lib) \
350
362
        libgfxoutputdrv \
351
363
        libprinterdrv \
352
364
        librs232drv \
353
 
        libdrive \
354
365
        libdriveiec \
 
366
        libdriveiec128dcr \
355
367
        libdriveiecieee \
356
368
        libdriveieee \
 
369
        libdrive \
357
370
        libparallel \
358
371
        libvdrive \
359
372
        libarch \
378
391
xvic_libs =  \
379
392
        @XVIC_WINRES@ \
380
393
        $(vic20_lib) \
381
 
        $(drive_lib) \
382
394
        $(driveiec_lib) \
383
395
        $(driveiecieee_lib) \
384
396
        $(driveieee_lib) \
 
397
        $(drive_lib) \
385
398
        $(iecbus_lib) \
386
399
        $(parallel_lib) \
387
400
        $(vdrive_lib) \
397
410
 
398
411
.PHONY: xvic-all
399
412
xvic-all: \
400
 
        libdrive \
401
413
        libdriveiec \
402
414
        libdriveiecieee \
403
415
        libdriveieee \
 
416
        libdrive \
404
417
        libparallel \
405
418
        libvdrive \
406
419
        libraster \
426
439
xpet_libs =  \
427
440
        @XPET_WINRES@ \
428
441
        $(pet_lib) \
429
 
        $(drive_lib) \
430
442
        $(driveiecieee_lib) \
431
443
        $(driveieee_lib) \
 
444
        $(drive_lib) \
432
445
        $(parallel_lib) \
433
446
        $(vdrive_lib) \
434
447
        $(driver_libs) \
444
457
 
445
458
.PHONY: xpet-all
446
459
xpet-all: \
447
 
        libdrive \
448
460
        libdriveiecieee \
449
461
        libdriveieee \
 
462
        libdrive \
450
463
        libparallel \
451
464
        libvdrive \
452
465
        libraster \
472
485
xplus4_libs =  \
473
486
        @XPLUS4_WINRES@ \
474
487
        $(plus4_lib) \
475
 
        $(drive_lib) \
476
488
        $(driveiec_lib) \
477
489
        $(driveiecieee_lib) \
478
490
        $(drivetcbm_lib) \
 
491
        $(drive_lib) \
479
492
        $(iecbus_lib) \
480
493
        $(vdrive_lib) \
481
494
        $(driver_libs) \
490
503
 
491
504
.PHONY: xplus4-all
492
505
xplus4-all: \
493
 
        libdrive \
494
506
        libdriveiec \
495
507
        libdriveiecieee \
496
508
        libdrivetcbm \
 
509
        libdrive \
497
510
        libvdrive \
498
511
        libraster \
499
512
        libsounddrv \
518
531
xcbm2_libs = \
519
532
        @XCBM2_WINRES@ \
520
533
        $(xcbm2_lib) \
521
 
        $(drive_lib) \
522
534
        $(driveiecieee_lib) \
523
535
        $(driveieee_lib) \
 
536
        $(drive_lib) \
524
537
        $(parallel_lib) \
525
538
        $(vdrive_lib) \
526
539
        $(driver_libs) \
546
559
        libarch \
547
560
        libsid \
548
561
        @RESID_DEP@ \
549
 
        libdrive \
550
562
        libdriveiecieee \
551
563
        libdriveieee \
 
564
        libdrive \
552
565
        libparallel \
553
566
        libvdrive \
554
567
        libraster \
591
604
        @ARCH_DIR@/archdep.o \
592
605
        @ARCH_DIR@/uicmdline.o \
593
606
        $(blockdev_lib) \
 
607
        $(realdevice_lib) \
594
608
        $(vdrive_lib) \
595
609
        $(imagecontents_lib) \
596
610
        $(fileio_lib) \
648
662
        (cd drive && $(MAKE))
649
663
libdriveiec:
650
664
        (cd drive && $(MAKE) libdriveiec)
 
665
libdriveiec128dcr:
 
666
        (cd drive && $(MAKE) libdriveiec128dcr)
651
667
libdriveiecieee:
652
668
        (cd drive && $(MAKE) libdriveiecieee)
653
669
libdriveieee: