--- a/src/Makefile.in Mon Jul 14 00:09:51 2008 +0000 +++ b/src/Makefile.in Tue Jul 15 06:47:49 2008 +0000 @@ -90,49 +90,50 @@ am_genglsl_OBJECTS = genglsl.$(OBJEXT) genglsl_OBJECTS = $(am_genglsl_OBJECTS) genglsl_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__lxdream_SOURCES_DIST = main.c config.c config.h lxdream.h dream.h \ - gui.h cpu.h hook.h mem.c mem.h mmio.h watch.c asic.c asic.h \ - clock.h serial.h syscall.c syscall.h bios.c dcload.c \ - gdrom/ide.c gdrom/ide.h gdrom/packet.h gdrom/gdimage.c \ - gdrom/gdrom.c gdrom/gdrom.h gdrom/nrg.c gdrom/cdi.c \ - gdrom/gdi.c gdrom/edc_ecc.c gdrom/ecc.h gdrom/edc_crctable.h \ - gdrom/edc_encoder.h gdrom/edc_l2sq.h gdrom/edc_scramble.h \ - gdrom/mmc.c gdrom/gddriver.h dreamcast.c dreamcast.h eventq.c \ - eventq.h sh4/sh4.c sh4/intc.c sh4/intc.h sh4/sh4mem.c \ - sh4/timer.c sh4/dmac.c sh4/mmu.c sh4/sh4core.c sh4/sh4core.h \ - sh4/sh4dasm.c sh4/sh4dasm.h sh4/sh4mmio.c sh4/sh4mmio.h \ - sh4/scif.c sh4/sh4stat.c sh4/sh4stat.h sh4/xltcache.c \ - sh4/xltcache.h sh4/sh4.h sh4/dmac.h aica/armcore.c \ - aica/armcore.h aica/armdasm.c aica/armdasm.h aica/armmem.c \ - aica/aica.c aica/aica.h aica/audio.c aica/audio.h pvr2/pvr2.c \ - pvr2/pvr2.h pvr2/pvr2mem.c pvr2/pvr2mmio.h pvr2/tacore.c \ - pvr2/rendsort.c pvr2/texcache.c pvr2/yuv.c pvr2/rendsave.c \ - pvr2/scene.c pvr2/scene.h pvr2/gl_sl.c pvr2/gl_slsrc.c \ - pvr2/glutil.c pvr2/glutil.h pvr2/glrender.c pvr2/vertex.glsl \ - pvr2/fragment.glsl maple/maple.c maple/maple.h \ - maple/controller.c maple/controller.h maple/kbd.c \ - maple/mouse.c loader.c loader.h elf.h bootstrap.c bootstrap.h \ - util.c gdlist.c gdlist.h display.c display.h dckeysyms.h \ - drivers/audio_null.c drivers/video_null.c drivers/video_gl.c \ - drivers/video_gl.h drivers/gl_fbo.c sh4/sh4.def sh4/sh4core.in \ - sh4/sh4x86.in sh4/sh4dasm.in sh4/sh4stat.in sh4/sh4x86.c \ - sh4/x86op.h sh4/ia32abi.h sh4/ia32mac.h sh4/ia64abi.h \ - sh4/sh4trans.c sh4/sh4trans.h x86dasm/x86dasm.c \ - x86dasm/x86dasm.h x86dasm/i386-dis.c x86dasm/dis-init.c \ - x86dasm/dis-buf.c x86dasm/ansidecl.h x86dasm/bfd.h \ - x86dasm/config.h x86dasm/dis-asm.h x86dasm/opintl.h \ - x86dasm/symcat.h x86dasm/sysdep.h gtkui/gtkui.c gtkui/gtkui.h \ - gtkui/main_win.c gtkui/gtkcb.c gtkui/mmio_win.c \ - gtkui/debug_win.c gtkui/dump_win.c gtkui/ctrl_dlg.c \ - gtkui/path_dlg.c gtkui/gdrom_menu.c drivers/video_gtk.c \ - cocoaui/cocoaui.c cocoaui/cocoaui.h cocoaui/cocoa_win.c \ - cocoaui/cocoa_gd.c cocoaui/cocoa_prefs.c drivers/video_osx.c \ - drivers/mac_keymap.h drivers/mac_keymap.txt \ - drivers/video_gdk.c drivers/video_glx.c drivers/video_glx.h \ - drivers/video_nsgl.c drivers/video_nsgl.h drivers/audio_osx.c \ - drivers/audio_pulse.c drivers/audio_esd.c drivers/audio_alsa.c \ - drivers/cd_linux.c drivers/cd_osx.c drivers/osx_iokit.c \ - drivers/osx_iokit.h drivers/cd_none.c drivers/joy_linux.c +am__lxdream_SOURCES_DIST = main.c version.c config.c config.h \ + lxdream.h dream.h gui.h cpu.h hook.h mem.c mem.h mmio.h \ + watch.c asic.c asic.h clock.h serial.h syscall.c syscall.h \ + bios.c dcload.c gdrom/ide.c gdrom/ide.h gdrom/packet.h \ + gdrom/gdimage.c gdrom/gdrom.c gdrom/gdrom.h gdrom/nrg.c \ + gdrom/cdi.c gdrom/gdi.c gdrom/edc_ecc.c gdrom/ecc.h \ + gdrom/edc_crctable.h gdrom/edc_encoder.h gdrom/edc_l2sq.h \ + gdrom/edc_scramble.h gdrom/mmc.c gdrom/gddriver.h dreamcast.c \ + dreamcast.h eventq.c eventq.h sh4/sh4.c sh4/intc.c sh4/intc.h \ + sh4/sh4mem.c sh4/timer.c sh4/dmac.c sh4/mmu.c sh4/sh4core.c \ + sh4/sh4core.h sh4/sh4dasm.c sh4/sh4dasm.h sh4/sh4mmio.c \ + sh4/sh4mmio.h sh4/scif.c sh4/sh4stat.c sh4/sh4stat.h \ + sh4/xltcache.c sh4/xltcache.h sh4/sh4.h sh4/dmac.h \ + aica/armcore.c aica/armcore.h aica/armdasm.c aica/armdasm.h \ + aica/armmem.c aica/aica.c aica/aica.h aica/audio.c \ + aica/audio.h pvr2/pvr2.c pvr2/pvr2.h pvr2/pvr2mem.c \ + pvr2/pvr2mmio.h pvr2/tacore.c pvr2/rendsort.c pvr2/texcache.c \ + pvr2/yuv.c pvr2/rendsave.c pvr2/scene.c pvr2/scene.h \ + pvr2/gl_sl.c pvr2/gl_slsrc.c pvr2/glutil.c pvr2/glutil.h \ + pvr2/glrender.c pvr2/vertex.glsl pvr2/fragment.glsl \ + maple/maple.c maple/maple.h maple/controller.c \ + maple/controller.h maple/kbd.c maple/mouse.c loader.c loader.h \ + elf.h bootstrap.c bootstrap.h util.c gdlist.c gdlist.h \ + display.c display.h dckeysyms.h drivers/audio_null.c \ + drivers/video_null.c drivers/video_gl.c drivers/video_gl.h \ + drivers/gl_fbo.c sh4/sh4.def sh4/sh4core.in sh4/sh4x86.in \ + sh4/sh4dasm.in sh4/sh4stat.in sh4/sh4x86.c sh4/x86op.h \ + sh4/ia32abi.h sh4/ia32mac.h sh4/ia64abi.h sh4/sh4trans.c \ + sh4/sh4trans.h x86dasm/x86dasm.c x86dasm/x86dasm.h \ + x86dasm/i386-dis.c x86dasm/dis-init.c x86dasm/dis-buf.c \ + x86dasm/ansidecl.h x86dasm/bfd.h x86dasm/config.h \ + x86dasm/dis-asm.h x86dasm/opintl.h x86dasm/symcat.h \ + x86dasm/sysdep.h gtkui/gtkui.c gtkui/gtkui.h gtkui/main_win.c \ + gtkui/gtkcb.c gtkui/mmio_win.c gtkui/debug_win.c \ + gtkui/dump_win.c gtkui/ctrl_dlg.c gtkui/path_dlg.c \ + gtkui/gdrom_menu.c drivers/video_gtk.c cocoaui/cocoaui.c \ + cocoaui/cocoaui.h cocoaui/cocoa_win.c cocoaui/cocoa_gd.c \ + cocoaui/cocoa_prefs.c drivers/video_osx.c drivers/mac_keymap.h \ + drivers/mac_keymap.txt drivers/video_gdk.c drivers/video_glx.c \ + drivers/video_glx.h drivers/video_nsgl.c drivers/video_nsgl.h \ + drivers/audio_osx.c drivers/audio_pulse.c drivers/audio_esd.c \ + drivers/audio_alsa.c drivers/cd_linux.c drivers/cd_osx.c \ + drivers/osx_iokit.c drivers/osx_iokit.h drivers/cd_none.c \ + drivers/joy_linux.c @BUILD_SH4X86_TRUE@am__objects_1 = sh4x86.$(OBJEXT) sh4trans.$(OBJEXT) \ @BUILD_SH4X86_TRUE@ x86dasm.$(OBJEXT) i386-dis.$(OBJEXT) \ @BUILD_SH4X86_TRUE@ dis-init.$(OBJEXT) dis-buf.$(OBJEXT) @@ -155,8 +156,8 @@ @CDROM_OSX_TRUE@am__objects_12 = cd_osx.$(OBJEXT) osx_iokit.$(OBJEXT) @CDROM_NONE_TRUE@am__objects_13 = cd_none.$(OBJEXT) @JOY_LINUX_TRUE@am__objects_14 = joy_linux.$(OBJEXT) -am_lxdream_OBJECTS = main.$(OBJEXT) config.$(OBJEXT) mem.$(OBJEXT) \ - watch.$(OBJEXT) asic.$(OBJEXT) syscall.$(OBJEXT) \ +am_lxdream_OBJECTS = main.$(OBJEXT) version.$(OBJEXT) config.$(OBJEXT) \ + mem.$(OBJEXT) watch.$(OBJEXT) asic.$(OBJEXT) syscall.$(OBJEXT) \ bios.$(OBJEXT) dcload.$(OBJEXT) ide.$(OBJEXT) \ gdimage.$(OBJEXT) gdrom.$(OBJEXT) nrg.$(OBJEXT) cdi.$(OBJEXT) \ gdi.$(OBJEXT) edc_ecc.$(OBJEXT) mmc.$(OBJEXT) \ @@ -373,6 +374,7 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +SVNVERSION = @SVNVERSION@ INCLUDES = \ -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ @@ -380,18 +382,20 @@ -Ish4 \ @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBPNG_CFLAGS@ @PULSE_CFLAGS@ @ESOUND_CFLAGS@ @ALSA_CFLAGS@ -EXTRA_DIST = drivers/genkeymap.pl +EXTRA_DIST = drivers/genkeymap.pl checkver.pl AM_CFLAGS = -D_ISOC99_SOURCE -D_BSD_SOURCE TESTS = test/testxlt -BUILT_SOURCES = sh4/sh4core.c sh4/sh4dasm.c sh4/sh4x86.c pvr2/gl_slsrc.c drivers/mac_keymap.h +BUILT_SOURCES = sh4/sh4core.c sh4/sh4dasm.c sh4/sh4x86.c pvr2/gl_slsrc.c drivers/mac_keymap.h version.c + +#all-am: checkversion gendec_SOURCES = tools/gendec.c tools/gendec.h tools/insparse.c tools/actparse.c genglsl_SOURCES = tools/genglsl.c -lxdream_SOURCES = main.c config.c config.h lxdream.h dream.h gui.h \ - cpu.h hook.h mem.c mem.h mmio.h watch.c asic.c asic.h clock.h \ - serial.h syscall.c syscall.h bios.c dcload.c gdrom/ide.c \ - gdrom/ide.h gdrom/packet.h gdrom/gdimage.c gdrom/gdrom.c \ - gdrom/gdrom.h gdrom/nrg.c gdrom/cdi.c gdrom/gdi.c \ - gdrom/edc_ecc.c gdrom/ecc.h gdrom/edc_crctable.h \ +lxdream_SOURCES = main.c version.c config.c config.h lxdream.h dream.h \ + gui.h cpu.h hook.h mem.c mem.h mmio.h watch.c asic.c asic.h \ + clock.h serial.h syscall.c syscall.h bios.c dcload.c \ + gdrom/ide.c gdrom/ide.h gdrom/packet.h gdrom/gdimage.c \ + gdrom/gdrom.c gdrom/gdrom.h gdrom/nrg.c gdrom/cdi.c \ + gdrom/gdi.c gdrom/edc_ecc.c gdrom/ecc.h gdrom/edc_crctable.h \ gdrom/edc_encoder.h gdrom/edc_l2sq.h gdrom/edc_scramble.h \ gdrom/mmc.c gdrom/gddriver.h dreamcast.c dreamcast.h eventq.c \ eventq.h sh4/sh4.c sh4/intc.c sh4/intc.h sh4/sh4mem.c \ @@ -604,6 +608,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/texcache.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timer.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_gdk.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_gl.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_glx.Po@am__quote@ @@ -2056,6 +2061,12 @@ uninstall-am uninstall-binPROGRAMS uninstall-info-am +.PHONY: checkversion +checkversion: + @$(srcdir)/checkver.pl "$(VERSION)" "$(top_srcdir)" version.c + +version.c: checkversion + sh4/sh4core.c: gendec sh4/sh4.def sh4/sh4core.in mkdir -p `dirname $@` ./gendec $(srcdir)/sh4/sh4.def $(srcdir)/sh4/sh4core.in -o $@