filename | src/Makefile.in |
changeset | 1027:4e527bc96109 |
prev | 1024:c67f2d61ab97 |
next | 1034:7044e01148f0 |
author | nkeynes |
date | Sat Jun 13 07:12:51 2009 +0000 (13 years ago) |
permissions | -rw-r--r-- |
last change | Load plugins from the directory containing the executable first if they're there - simplifies development testing. Add dummy plugin for easy identification of the plugin directory |
file | annotate | diff | log | raw |
1.1 --- a/src/Makefile.in Sat Jun 13 00:50:48 2009 +00001.2 +++ b/src/Makefile.in Sat Jun 13 07:12:51 2009 +00001.3 @@ -40,7 +40,7 @@1.4 noinst_PROGRAMS = gendec$(EXEEXT) genglsl$(EXEEXT)1.5 check_PROGRAMS = test/testxlt$(EXEEXT) $(am__EXEEXT_1)1.6 pkglib_PROGRAMS = $(am__EXEEXT_2) $(am__EXEEXT_3) $(am__EXEEXT_4) \1.7 - $(am__EXEEXT_5) $(am__EXEEXT_6)1.8 + $(am__EXEEXT_5) $(am__EXEEXT_6) $(am__EXEEXT_7)1.9 @BUILD_SHARED_TRUE@am__append_1 = plugin.c plugin.h1.10 @BUILD_SH4X86_TRUE@am__append_2 = sh4/sh4x86.c xlat/x86/x86op.h \1.11 @BUILD_SH4X86_TRUE@ xlat/x86/ia32abi.h xlat/x86/amd64abi.h \1.12 @@ -68,25 +68,26 @@1.13 @VIDEO_GLX_TRUE@am__append_8 = drivers/video_glx.c drivers/video_glx.h1.14 @VIDEO_NSGL_TRUE@am__append_9 = drivers/video_nsgl.m drivers/video_nsgl.h1.15 @AUDIO_OSX_TRUE@am__append_10 = drivers/audio_osx.m1.16 -@AUDIO_SDL_TRUE@@BUILD_SHARED_TRUE@am__append_11 = audio_sdl.@SOEXT@1.17 -@AUDIO_PULSE_TRUE@@BUILD_SHARED_TRUE@am__append_12 = audio_pulse.@SOEXT@1.18 -@AUDIO_ESOUND_TRUE@@BUILD_SHARED_TRUE@am__append_13 = audio_esd.@SOEXT@1.19 -@AUDIO_ALSA_TRUE@@BUILD_SHARED_TRUE@am__append_14 = audio_alsa.@SOEXT@1.20 -@BUILD_SHARED_TRUE@@INPUT_LIRC_TRUE@am__append_15 = input_lirc.@SOEXT@1.21 -@AUDIO_SDL_TRUE@@BUILD_SHARED_FALSE@am__append_16 = drivers/audio_sdl.c1.22 -@AUDIO_SDL_TRUE@@BUILD_SHARED_FALSE@am__append_17 = @SDL_LIBS@1.23 -@AUDIO_PULSE_TRUE@@BUILD_SHARED_FALSE@am__append_18 = drivers/audio_pulse.c1.24 -@AUDIO_PULSE_TRUE@@BUILD_SHARED_FALSE@am__append_19 = @PULSE_LIBS@1.25 -@AUDIO_ESOUND_TRUE@@BUILD_SHARED_FALSE@am__append_20 = drivers/audio_esd.c1.26 -@AUDIO_ESOUND_TRUE@@BUILD_SHARED_FALSE@am__append_21 = @ESOUND_LIBS@1.27 -@AUDIO_ALSA_TRUE@@BUILD_SHARED_FALSE@am__append_22 = drivers/audio_alsa.c1.28 -@AUDIO_ALSA_TRUE@@BUILD_SHARED_FALSE@am__append_23 = @ALSA_LIBS@1.29 -@BUILD_SHARED_FALSE@@INPUT_LIRC_TRUE@am__append_24 = drivers/input_lirc.c1.30 -@BUILD_SHARED_FALSE@@INPUT_LIRC_TRUE@am__append_25 = -llirc_client1.31 -@CDROM_LINUX_TRUE@am__append_26 = drivers/cd_linux.c1.32 -@CDROM_OSX_TRUE@am__append_27 = drivers/cd_osx.c drivers/osx_iokit.m drivers/osx_iokit.h1.33 -@CDROM_NONE_TRUE@am__append_28 = drivers/cd_none.c1.34 -@JOY_LINUX_TRUE@am__append_29 = drivers/joy_linux.c drivers/joy_linux.h1.35 +@BUILD_SHARED_TRUE@am__append_11 = lxdream_dummy.@SOEXT@1.36 +@AUDIO_SDL_TRUE@@BUILD_SHARED_TRUE@am__append_12 = audio_sdl.@SOEXT@1.37 +@AUDIO_PULSE_TRUE@@BUILD_SHARED_TRUE@am__append_13 = audio_pulse.@SOEXT@1.38 +@AUDIO_ESOUND_TRUE@@BUILD_SHARED_TRUE@am__append_14 = audio_esd.@SOEXT@1.39 +@AUDIO_ALSA_TRUE@@BUILD_SHARED_TRUE@am__append_15 = audio_alsa.@SOEXT@1.40 +@BUILD_SHARED_TRUE@@INPUT_LIRC_TRUE@am__append_16 = input_lirc.@SOEXT@1.41 +@AUDIO_SDL_TRUE@@BUILD_SHARED_FALSE@am__append_17 = drivers/audio_sdl.c1.42 +@AUDIO_SDL_TRUE@@BUILD_SHARED_FALSE@am__append_18 = @SDL_LIBS@1.43 +@AUDIO_PULSE_TRUE@@BUILD_SHARED_FALSE@am__append_19 = drivers/audio_pulse.c1.44 +@AUDIO_PULSE_TRUE@@BUILD_SHARED_FALSE@am__append_20 = @PULSE_LIBS@1.45 +@AUDIO_ESOUND_TRUE@@BUILD_SHARED_FALSE@am__append_21 = drivers/audio_esd.c1.46 +@AUDIO_ESOUND_TRUE@@BUILD_SHARED_FALSE@am__append_22 = @ESOUND_LIBS@1.47 +@AUDIO_ALSA_TRUE@@BUILD_SHARED_FALSE@am__append_23 = drivers/audio_alsa.c1.48 +@AUDIO_ALSA_TRUE@@BUILD_SHARED_FALSE@am__append_24 = @ALSA_LIBS@1.49 +@BUILD_SHARED_FALSE@@INPUT_LIRC_TRUE@am__append_25 = drivers/input_lirc.c1.50 +@BUILD_SHARED_FALSE@@INPUT_LIRC_TRUE@am__append_26 = -llirc_client1.51 +@CDROM_LINUX_TRUE@am__append_27 = drivers/cd_linux.c1.52 +@CDROM_OSX_TRUE@am__append_28 = drivers/cd_osx.c drivers/osx_iokit.m drivers/osx_iokit.h1.53 +@CDROM_NONE_TRUE@am__append_29 = drivers/cd_none.c1.54 +@JOY_LINUX_TRUE@am__append_30 = drivers/joy_linux.c drivers/joy_linux.h1.55 subdir = src1.56 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in1.57 ACLOCAL_M4 = $(top_srcdir)/aclocal.m41.58 @@ -100,12 +101,13 @@1.59 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibdir)"1.60 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)1.61 @BUILD_SH4X86_TRUE@am__EXEEXT_1 = test/testsh4x86$(EXEEXT)1.62 -@AUDIO_SDL_TRUE@@BUILD_SHARED_TRUE@am__EXEEXT_2 = \1.63 +@BUILD_SHARED_TRUE@am__EXEEXT_2 = lxdream_dummy.@SOEXT@$(EXEEXT)1.64 +@AUDIO_SDL_TRUE@@BUILD_SHARED_TRUE@am__EXEEXT_3 = \1.65 @AUDIO_SDL_TRUE@@BUILD_SHARED_TRUE@ audio_sdl.@SOEXT@$(EXEEXT)1.66 -@AUDIO_PULSE_TRUE@@BUILD_SHARED_TRUE@am__EXEEXT_3 = audio_pulse.@SOEXT@$(EXEEXT)1.67 -@AUDIO_ESOUND_TRUE@@BUILD_SHARED_TRUE@am__EXEEXT_4 = audio_esd.@SOEXT@$(EXEEXT)1.68 -@AUDIO_ALSA_TRUE@@BUILD_SHARED_TRUE@am__EXEEXT_5 = audio_alsa.@SOEXT@$(EXEEXT)1.69 -@BUILD_SHARED_TRUE@@INPUT_LIRC_TRUE@am__EXEEXT_6 = input_lirc.@SOEXT@$(EXEEXT)1.70 +@AUDIO_PULSE_TRUE@@BUILD_SHARED_TRUE@am__EXEEXT_4 = audio_pulse.@SOEXT@$(EXEEXT)1.71 +@AUDIO_ESOUND_TRUE@@BUILD_SHARED_TRUE@am__EXEEXT_5 = audio_esd.@SOEXT@$(EXEEXT)1.72 +@AUDIO_ALSA_TRUE@@BUILD_SHARED_TRUE@am__EXEEXT_6 = audio_alsa.@SOEXT@$(EXEEXT)1.73 +@BUILD_SHARED_TRUE@@INPUT_LIRC_TRUE@am__EXEEXT_7 = input_lirc.@SOEXT@$(EXEEXT)1.74 pkglibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)1.75 PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) $(pkglib_PROGRAMS)1.76 am_audio_alsa_@SOEXT@_OBJECTS =1.77 @@ -273,6 +275,10 @@1.78 lxdream_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \1.79 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \1.80 $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)1.81 +am_lxdream_dummy_@SOEXT@_OBJECTS =1.82 +lxdream_dummy_@SOEXT@_OBJECTS = $(am_lxdream_dummy_@SOEXT@_OBJECTS)1.83 +@BUILD_SHARED_TRUE@lxdream_dummy_@SOEXT@_DEPENDENCIES = \1.84 +@BUILD_SHARED_TRUE@ lxdream_dummy.lo1.85 am__test_testsh4x86_SOURCES_DIST = test/testsh4x86.c x86dasm/x86dasm.c \1.86 x86dasm/x86dasm.h x86dasm/i386-dis.c x86dasm/dis-init.c \1.87 x86dasm/dis-buf.c sh4/sh4trans.c sh4/sh4x86.c xlat/xltcache.c \1.88 @@ -310,12 +316,13 @@1.89 $(audio_pulse_@SOEXT@_SOURCES) $(audio_sdl_@SOEXT@_SOURCES) \1.90 $(gendec_SOURCES) $(genglsl_SOURCES) \1.91 $(input_lirc_@SOEXT@_SOURCES) $(lxdream_SOURCES) \1.92 - $(test_testsh4x86_SOURCES) $(test_testxlt_SOURCES)1.93 + $(lxdream_dummy_@SOEXT@_SOURCES) $(test_testsh4x86_SOURCES) \1.94 + $(test_testxlt_SOURCES)1.95 DIST_SOURCES = $(audio_alsa_@SOEXT@_SOURCES) \1.96 $(audio_esd_@SOEXT@_SOURCES) $(audio_pulse_@SOEXT@_SOURCES) \1.97 $(audio_sdl_@SOEXT@_SOURCES) $(gendec_SOURCES) \1.98 $(genglsl_SOURCES) $(input_lirc_@SOEXT@_SOURCES) \1.99 - $(am__lxdream_SOURCES_DIST) \1.100 + $(am__lxdream_SOURCES_DIST) $(lxdream_dummy_@SOEXT@_SOURCES) \1.101 $(am__test_testsh4x86_SOURCES_DIST) $(test_testxlt_SOURCES)1.102 ETAGS = etags1.103 CTAGS = ctags1.104 @@ -510,7 +517,7 @@1.105 -Ish4 \1.106 @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBPNG_CFLAGS@ @PULSE_CFLAGS@ @ESOUND_CFLAGS@ @ALSA_CFLAGS@ @SDL_CFLAGS@1.108 -EXTRA_DIST = drivers/genkeymap.pl checkver.pl1.109 +EXTRA_DIST = drivers/genkeymap.pl checkver.pl drivers/dummy.c1.110 AM_CFLAGS = -D__EXTENSIONS__ -D_BSD_SOURCE -D_GNU_SOURCE1.111 TESTS = test/testxlt1.112 BUILT_SOURCES = sh4/sh4core.c sh4/sh4dasm.c sh4/sh4x86.c sh4/sh4stat.c \1.113 @@ -518,7 +525,8 @@1.115 CLEANFILES = sh4/sh4core.c sh4/sh4dasm.c sh4/sh4x86.c sh4/sh4stat.c \1.116 pvr2/gl_slsrc.c drivers/mac_keymap.h version.c \1.117 - audio_alsa.lo audio_sdl.lo audio_esd.lo audio_pulse.lo input_lirc.lo1.118 + audio_alsa.lo audio_sdl.lo audio_esd.lo audio_pulse.lo input_lirc.lo \1.119 + lxdream_dummy.lo1.122 #all-am: checkversion1.123 @@ -526,8 +534,8 @@1.124 genglsl_SOURCES = tools/genglsl.c1.125 lxdream_LINK = $(LINK) @LXDREAMLDFLAGS@1.126 lxdream_LDADD = @GLIB_LIBS@ @GTK_LIBS@ @LIBPNG_LIBS@ $(INTLLIBS) \1.127 - $(am__append_17) $(am__append_19) $(am__append_21) \1.128 - $(am__append_23) $(am__append_25)1.129 + $(am__append_18) $(am__append_20) $(am__append_22) \1.130 + $(am__append_24) $(am__append_26)1.131 lxdream_SOURCES = main.c version.c config.c config.h lxdream.h dream.h \1.132 gui.h cpu.h hook.h gettext.h mem.c mem.h sdram.c mmio.h \1.133 watch.c asic.c asic.h clock.h serial.h syscall.c syscall.h \1.134 @@ -559,9 +567,9 @@1.135 hotkeys.h $(am__append_1) $(am__append_2) $(am__append_4) \1.136 $(am__append_5) $(am__append_6) $(am__append_7) \1.137 $(am__append_8) $(am__append_9) $(am__append_10) \1.138 - $(am__append_16) $(am__append_18) $(am__append_20) \1.139 - $(am__append_22) $(am__append_24) $(am__append_26) \1.140 - $(am__append_27) $(am__append_28) $(am__append_29)1.141 + $(am__append_17) $(am__append_19) $(am__append_21) \1.142 + $(am__append_23) $(am__append_25) $(am__append_27) \1.143 + $(am__append_28) $(am__append_29) $(am__append_30)1.144 lxdream_CPPFLAGS = @LXDREAMCPPFLAGS@1.145 @BUILD_SH4X86_TRUE@test_testsh4x86_LDADD = @GLIB_LIBS@ @GTK_LIBS@ @LIBPNG_LIBS@1.146 @BUILD_SH4X86_TRUE@test_testsh4x86_CPPFLAGS = @LXDREAMCPPFLAGS@1.147 @@ -571,6 +579,9 @@1.148 @BUILD_SH4X86_TRUE@ sh4/sh4trans.c sh4/sh4x86.c xlat/xltcache.c \1.149 @BUILD_SH4X86_TRUE@ xlat/xltcache.h mem.c util.c1.151 +@BUILD_SHARED_TRUE@lxdream_dummy_@SOEXT@_SOURCES =1.152 +@BUILD_SHARED_TRUE@lxdream_dummy_@SOEXT@_LDADD = lxdream_dummy.lo @SDL_LIBS@1.153 +@BUILD_SHARED_TRUE@lxdream_dummy_@SOEXT@_LDFLAGS = $(PLUGINLDFLAGS)1.154 @AUDIO_SDL_TRUE@@BUILD_SHARED_TRUE@audio_sdl_@SOEXT@_SOURCES =1.155 @AUDIO_SDL_TRUE@@BUILD_SHARED_TRUE@audio_sdl_@SOEXT@_LDADD = audio_sdl.lo @SDL_LIBS@1.156 @AUDIO_SDL_TRUE@@BUILD_SHARED_TRUE@audio_sdl_@SOEXT@_LDFLAGS = $(PLUGINLDFLAGS)1.157 @@ -699,6 +710,9 @@1.158 lxdream$(EXEEXT): $(lxdream_OBJECTS) $(lxdream_DEPENDENCIES)1.159 @rm -f lxdream$(EXEEXT)1.160 $(lxdream_LINK) $(lxdream_LDFLAGS) $(lxdream_OBJECTS) $(lxdream_LDADD) $(LIBS)1.161 +lxdream_dummy.@SOEXT@$(EXEEXT): $(lxdream_dummy_@SOEXT@_OBJECTS) $(lxdream_dummy_@SOEXT@_DEPENDENCIES)1.162 + @rm -f lxdream_dummy.@SOEXT@$(EXEEXT)1.163 + $(LINK) $(lxdream_dummy_@SOEXT@_LDFLAGS) $(lxdream_dummy_@SOEXT@_OBJECTS) $(lxdream_dummy_@SOEXT@_LDADD) $(LIBS)1.164 test/$(am__dirstamp):1.165 @$(mkdir_p) test1.166 @: > test/$(am__dirstamp)1.167 @@ -2923,6 +2937,8 @@1.168 @$(srcdir)/checkver.pl "$(VERSION)" "$(top_srcdir)" version.c1.170 version.c: checkversion1.171 +@BUILD_SHARED_TRUE@lxdream_dummy.lo: drivers/dummy.c1.172 +@BUILD_SHARED_TRUE@ $(COMPILE) -DPLUGIN $(PLUGINCFLAGS) -c $< -o $@1.173 @AUDIO_SDL_TRUE@@BUILD_SHARED_TRUE@audio_sdl.lo: drivers/audio_sdl.c1.174 @AUDIO_SDL_TRUE@@BUILD_SHARED_TRUE@ $(COMPILE) -DPLUGIN $(PLUGINCFLAGS) -c $< -o $@1.175 @AUDIO_PULSE_TRUE@@BUILD_SHARED_TRUE@audio_pulse.lo: drivers/audio_pulse.c
.