1.1 --- a/src/Makefile.am	Mon Feb 13 12:26:01 2012 +1000
     1.2 +++ b/src/Makefile.am	Thu Feb 23 08:41:07 2012 +1000
     1.3 @@ -37,6 +37,8 @@
     1.4  
     1.5  #all-am: checkversion
     1.6  
     1.7 +AM_CPPFLAGS = @LXDREAMCPPFLAGS@
     1.8 +
     1.9  lxdream_LINK = $(LINK) @LXDREAMLDFLAGS@
    1.10  lxdream_LDADD = @LXDREAM_LIBS@ @GLIB_LIBS@ @GTK_LIBS@ @LIBPNG_LIBS@ @LIBISOFS_LIBS@ $(INTLLIBS)
    1.11  lxdream_SOURCES = \
    1.12 @@ -75,8 +77,8 @@
    1.13  	drivers/cdrom/isofs.h drivers/cdrom/isofs.c drivers/cdrom/isomem.c \
    1.14  	sh4/sh4.def sh4/sh4core.in sh4/sh4x86.in sh4/sh4dasm.in sh4/sh4stat.in \
    1.15  	hotkeys.c hotkeys.h
    1.16 -lxdream_CPPFLAGS = @LXDREAMCPPFLAGS@
    1.17 -if BUILD_SHARED
    1.18 +
    1.19 +if BUILD_PLUGINS
    1.20  lxdream_SOURCES += plugin.c plugin.h
    1.21  endif	
    1.22  
    1.23 @@ -90,7 +92,6 @@
    1.24          x86dasm/symcat.h x86dasm/sysdep.h
    1.25  
    1.26  test_testsh4x86_LDADD = @LXDREAM_LIBS@ @GLIB_LIBS@ @GTK_LIBS@ @LIBPNG_LIBS@
    1.27 -test_testsh4x86_CPPFLAGS = @LXDREAMCPPFLAGS@
    1.28  test_testsh4x86_SOURCES = test/testsh4x86.c x86dasm/x86dasm.c \
    1.29  	x86dasm/x86dasm.h x86dasm/i386-dis.c x86dasm/dis-init.c \
    1.30  	x86dasm/dis-buf.c \
    1.31 @@ -134,7 +135,7 @@
    1.32  lxdream_SOURCES += drivers/audio_osx.m
    1.33  endif
    1.34  
    1.35 -if BUILD_SHARED
    1.36 +if BUILD_PLUGINS
    1.37  
    1.38  pkglib_PROGRAMS += lxdream_dummy.@SOEXT@
    1.39  lxdream_dummy_@SOEXT@_SOURCES =