Index: sid/config/sidtargets.m4 =================================================================== RCS file: /cvs/src/src/sid/config/sidtargets.m4,v retrieving revision 1.8 diff -c -p -r1.8 sidtargets.m4 *** sid/config/sidtargets.m4 18 Oct 2006 18:42:36 -0000 1.8 --- sid/config/sidtargets.m4 29 Nov 2006 21:07:56 -0000 *************** sidtarget_mt=$sidtarget_default *** 45,50 **** --- 45,51 ---- sidtarget_ppc=$sidtarget_default sidtarget_sh=$sidtarget_default sidtarget_sh64=$sidtarget_default + sidtarget_sh_or_sh64=$sidtarget_default sidtarget_xstormy16=$sidtarget_default dnl Iterate over all listed targets *************** do *** 60,67 **** mt*) sidtarget_mt=1 ;; powerpc*) sidtarget_ppc=1 ;; ppc*) sidtarget_ppc=1 ;; ! sh64*) sidtarget_sh64=1 ;; ! sh*) sidtarget_sh=1 ;; xstormy16*) sidtarget_xstormy16=1 ;; *) AC_MSG_WARN("Unknown target $targ") ;; esac --- 61,70 ---- mt*) sidtarget_mt=1 ;; powerpc*) sidtarget_ppc=1 ;; ppc*) sidtarget_ppc=1 ;; ! sh64*) sidtarget_sh64=1 ! sidtarget_sh_or_sh64=1 ;; ! sh*) sidtarget_sh=1 ! sidtarget_sh_or_sh64=1 ;; xstormy16*) sidtarget_xstormy16=1 ;; *) AC_MSG_WARN("Unknown target $targ") ;; esac *************** AC_SUBST(sidtarget_sh64) *** 132,137 **** --- 135,145 ---- AM_CONDITIONAL(SIDTARGET_SH64,[test "x$sidtarget_sh64" = x1]) AC_MSG_RESULT($sidtarget_sh64) + AC_MSG_CHECKING(SH or SH64 family support) + AC_SUBST(sidtarget_sh_or_sh64) + AM_CONDITIONAL(SIDTARGET_SH_OR_SH64,[test "x$sidtarget_sh_or_sh64" = x1]) + AC_MSG_RESULT($sidtarget_sh_or_sh64) + AC_MSG_CHECKING(Sanyo Xstormy16 family support) AC_SUBST(sidtarget_xstormy16) AM_CONDITIONAL(SIDTARGET_XSTORMY16,[test "x$sidtarget_xstormy16" = x1]) Index: sid/main/dynamic/Makefile.am =================================================================== RCS file: /cvs/src/src/sid/main/dynamic/Makefile.am,v retrieving revision 1.13 diff -c -p -r1.13 Makefile.am *** sid/main/dynamic/Makefile.am 18 Oct 2006 18:46:17 -0000 1.13 --- sid/main/dynamic/Makefile.am 29 Nov 2006 21:07:56 -0000 *************** TARGETCFGS = "" *** 11,23 **** TARGETDEFINES = if SIDTARGET_SH - TARGETCFGS += shCfg.cxx TARGETDEFINES += -DSIDTARGET_SH endif if SIDTARGET_SH64 - TARGETCFGS += shCfg.cxx TARGETDEFINES += -DSIDTARGET_SH64 endif # If sid is being compiled without shared library support, arrange to # statically link in a bunch of component libraries using libtool's --- 11,24 ---- TARGETDEFINES = if SIDTARGET_SH TARGETDEFINES += -DSIDTARGET_SH endif 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