1.1 --- a/src/Makefile.am	Mon Jan 30 20:11:08 2012 +1000
     1.2 +++ b/src/Makefile.am	Sun Feb 12 16:30:26 2012 +1000
     1.3 @@ -1,4 +1,7 @@
     1.4  ## Process this file with automake to produce Makefile.in
     1.5 +
     1.6 +SUBDIRS=tools
     1.7 +
     1.8  SVNVERSION=@SVNVERSION@
     1.9  INCLUDES = \
    1.10  	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
    1.11 @@ -12,7 +15,6 @@
    1.12  PLUGINCFLAGS = @PLUGINCFLAGS@ 
    1.13  PLUGINLDFLAGS = @PLUGINLDFLAGS@
    1.14  bin_PROGRAMS = lxdream
    1.15 -noinst_PROGRAMS = gendec genglsl genmach
    1.16  check_PROGRAMS = test/testxlt test/testlxpaths
    1.17  
    1.18  pkglib_PROGRAMS=
    1.19 @@ -35,9 +37,6 @@
    1.20  
    1.21  #all-am: checkversion
    1.22  
    1.23 -gendec_SOURCES = tools/gendec.c tools/gendec.h tools/insparse.c tools/actparse.c
    1.24 -genmach_SOURCES = tools/genmach.c tools/genmach.h tools/mdparse.c
    1.25 -genglsl_SOURCES = tools/genglsl.c
    1.26  lxdream_LINK = $(LINK) @LXDREAMLDFLAGS@
    1.27  lxdream_LDADD = @LXDREAM_LIBS@ @GLIB_LIBS@ @GTK_LIBS@ @LIBPNG_LIBS@ @LIBISOFS_LIBS@ $(INTLLIBS)
    1.28  lxdream_SOURCES = \
    1.29 @@ -233,31 +232,32 @@
    1.30  endif
    1.31  
    1.32  
    1.33 -
    1.34 -gendec_LDADD = @GLIB_LIBS@ @GTK_LIBS@ $(INTLLIBS)
    1.35 -genglsl_LDADD = @GLIB_LIBS@ @GTK_LIBS@ $(INTLLIBS)
    1.36 -genmach_LDADD = @GLIB_LIBS@ @GTK_LIBS@ $(INTLLIBS)
    1.37 -
    1.38 -
    1.39  test_testxlt_SOURCES = test/testxlt.c xlat/xltcache.c xlat/xltcache.h
    1.40  test_testlxpaths_SOURCES = test/testlxpaths.c lxpaths.c
    1.41  test_testlxpaths_LDADD = @GLIB_LIBS@
    1.42  
    1.43 -sh4/sh4core.c: gendec$(EXEEXT) sh4/sh4.def sh4/sh4core.in
    1.44 +GENDEC = tools/gendec$(EXEEXT)
    1.45 +GENGLSL = tools/genglsl$(EXEEXT)
    1.46 +GENMACH = totols/genmach$(EXEEXT)
    1.47 +
    1.48 +$(GENDEC) $(GENGLSL) $(GENMACH):
    1.49 +	$(MAKE) $(AM_MAKEFLAGS) -C tools
    1.50 +
    1.51 +sh4/sh4core.c: $(GENDEC) sh4/sh4.def sh4/sh4core.in
    1.52  	$(mkdir_p) `dirname $@`
    1.53 -	./gendec $(srcdir)/sh4/sh4.def $(srcdir)/sh4/sh4core.in -o $@
    1.54 -sh4/sh4dasm.c: gendec$(EXEEXT) sh4/sh4.def sh4/sh4dasm.in
    1.55 +	$(GENDEC) $(srcdir)/sh4/sh4.def $(srcdir)/sh4/sh4core.in -o $@
    1.56 +sh4/sh4dasm.c: $(GENDEC) sh4/sh4.def sh4/sh4dasm.in
    1.57  	$(mkdir_p) `dirname $@`
    1.58 -	./gendec $(srcdir)/sh4/sh4.def $(srcdir)/sh4/sh4dasm.in -o $@
    1.59 -sh4/sh4x86.c: gendec$(EXEEXT) sh4/sh4.def sh4/sh4x86.in
    1.60 +	$(GENDEC) $(srcdir)/sh4/sh4.def $(srcdir)/sh4/sh4dasm.in -o $@
    1.61 +sh4/sh4x86.c: $(GENDEC) sh4/sh4.def sh4/sh4x86.in
    1.62  	$(mkdir_p) `dirname $@`
    1.63 -	./gendec $(srcdir)/sh4/sh4.def $(srcdir)/sh4/sh4x86.in -o $@
    1.64 -sh4/sh4stat.c: gendec$(EXEEXT) sh4/sh4.def sh4/sh4stat.in
    1.65 +	$(GENDEC) $(srcdir)/sh4/sh4.def $(srcdir)/sh4/sh4x86.in -o $@
    1.66 +sh4/sh4stat.c: $(GENDEC) sh4/sh4.def sh4/sh4stat.in
    1.67  	$(mkdir_p) `dirname $@`
    1.68 -	./gendec $(srcdir)/sh4/sh4.def $(srcdir)/sh4/sh4stat.in -o $@
    1.69 -pvr2/shaders.def: genglsl$(EXEEXT) pvr2/shaders.glsl
    1.70 +	$(GENDEC) $(srcdir)/sh4/sh4.def $(srcdir)/sh4/sh4stat.in -o $@
    1.71 +pvr2/shaders.def: $(GENGLSL) pvr2/shaders.glsl
    1.72  	$(mkdir_p) `dirname $@`
    1.73 -	./genglsl $(srcdir)/pvr2/shaders.glsl $@
    1.74 +	$(GENGLSL) $(srcdir)/pvr2/shaders.glsl $@
    1.75  pvr2/shaders.h: pvr2/shaders.def
    1.76  drivers/mac_keymap.h: dckeysyms.h drivers/mac_keymap.txt drivers/genkeymap.pl
    1.77  	$(mkdir_p) `dirname $@`