Index: sid/main/dynamic/Makefile.am =================================================================== RCS file: /cvs/src/src/sid/main/dynamic/Makefile.am,v retrieving revision 1.14 diff -c -p -r1.14 Makefile.am *** sid/main/dynamic/Makefile.am 29 Nov 2006 21:18:30 -0000 1.14 --- sid/main/dynamic/Makefile.am 30 Nov 2006 18:36:14 -0000 *************** INCLUDES = -I. -I../../include -I$(srcdi *** 7,13 **** LIBIBERTY = -L../../../libiberty/pic -L../../../libiberty -liberty bin_PROGRAMS = sid ! TARGETCFGS = "" TARGETDEFINES = if SIDTARGET_SH --- 7,13 ---- LIBIBERTY = -L../../../libiberty/pic -L../../../libiberty -liberty bin_PROGRAMS = sid ! TARGETCFGS = shCfg.cxx TARGETDEFINES = if SIDTARGET_SH *************** endif *** 16,24 **** if SIDTARGET_SH64 TARGETDEFINES += -DSIDTARGET_SH64 endif - if SIDTARGET_SH_OR_SH64 - TARGETCFGS += shCfg.cxx - endif # If sid is being compiled without shared library support, arrange to # statically link in a bunch of component libraries using libtool's --- 16,21 ---- Index: sid/main/dynamic/shCfg.cxx =================================================================== RCS file: /cvs/src/src/sid/main/dynamic/shCfg.cxx,v retrieving revision 1.1 diff -c -p -r1.1 shCfg.cxx *** sid/main/dynamic/shCfg.cxx 18 Oct 2006 18:46:17 -0000 1.1 --- sid/main/dynamic/shCfg.cxx 30 Nov 2006 18:36:16 -0000 *************** *** 4,9 **** --- 4,10 ---- // This file is part of SID and is licensed under the GPL. // See the file COPYING.SID for conditions for redistribution. + #if defined (SIDTARGET_SH) || defined (SIDTARGET_SH64) #include "shCfg.h" *************** mk_sh5_64media (const string name, Sessi *** 222,224 **** --- 223,227 ---- return board; } #endif // defined (SIDTARGET_SH64) + + #endif // defined (SIDTARGET_SH) || defined (SIDTARGET_SH64)