diff -ru ctk_v0.71/ctk/base/ppu/ctk_spe-libspe.c ctk_v0.71_new/ctk/base/ppu/ctk_spe-libspe.c --- ctk_v0.71/ctk/base/ppu/ctk_spe-libspe.c 2007-07-02 20:32:47.000000000 +0900 +++ ctk_v0.71_new/ctk/base/ppu/ctk_spe-libspe.c 2007-07-10 14:18:47.000000000 +0900 @@ -17,6 +17,7 @@ #include "ctk-internal.h" #include "ctk_spe.h" #include "ctk_error.h" +#include "ctk_cpuinfo.h" /* Libspe internal routines */ extern void spe_cleanup(void *ptr); @@ -27,7 +28,18 @@ int ctk_env_count_spes() { +#ifdef SPE_ISOLATE + /* libspe >= 1.2 */ return spe_count_physical_spes(); +#else + /* how could we know this? */ + const char *machine = ctk_cpuinfo_get_value(CTK_CPUINFO_MACHINE, NULL); + int nodes = ctk_cpuinfo_get_int_value("processor", 1); + if (strcmp(machine, "PS3PF") == 0) { + return 6; + } + return ((nodes + 1) / 2) * 8; +#endif } int diff -ru ctk_v0.71/ctk/base/ppu/ctk_spe_thread_group.h ctk_v0.71_new/ctk/base/ppu/ctk_spe_thread_group.h --- ctk_v0.71/ctk/base/ppu/ctk_spe_thread_group.h 2007-05-16 12:52:42.000000000 +0900 +++ ctk_v0.71_new/ctk/base/ppu/ctk_spe_thread_group.h 2007-07-10 14:34:27.000000000 +0900 @@ -18,7 +18,7 @@ /** * The system limit of the max number of SPE threads one group can accomodate */ -#define CTK_SPE_THREAD_GROUP_MAX 6 +#define CTK_SPE_THREAD_GROUP_MAX 32 typedef struct ctk_spe_thread_group_body { unsigned int m_type; diff -ru ctk_v0.71/ctk/configure ctk_v0.71_new/ctk/configure --- ctk_v0.71/ctk/configure 2007-05-21 15:15:32.000000000 +0900 +++ ctk_v0.71_new/ctk/configure 2007-07-10 12:13:53.000000000 +0900 @@ -311,7 +311,7 @@ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE RANLIB ac_ct_RANLIB AR ac_ct_AR AS ac_ct_AS CP ac_ct_CP CCAS CCASFLAGS SPU_CC SPU_CXX SPU_LD SPU_AR SPU_AS SPU_CPP SPU_RANLIB SPU_STRIP SPU_NM EMBEDSPU SPU_CFLAGS SPU_CXXFLAGS SPU_LDFLAGS SPU_LIBS CELL_ENV PPU_CC PPU_CXX PPU_LD PPU_AR PPU_AS PPU_CCLD PPU_CCAS PPU_CPP PPU_RANLIB PPU_STRIP PPU_NM PPU_CFLAGS PPU_CXXFLAGS PPU_LDFLAGS PPU_CCASFLAGS PPU_CCLDFLAGS PPU_LIBS HOST_CC HOST_CXX HOST_LD HOST_CFLAGS HOST_CXXFLAGS HOST_LDFLAGS HOST_CCLDFLAGS HOST_CCASFLAGS CPP EGREP CTK_APP_SPU_LDFLAGS CTK_APP_SPU_LDADD DEBUG_TRUE DEBUG_FALSE TEST_TRUE TEST_FALSE CTK_SPE_TASK_START_ADDR REPLACE_LIBC_TRUE REPLACE_LIBC_FALSE TSDK_TRUE TSDK_FALSE LIBSPE_TRUE LIBSPE_FALSE LIBSPE2_TRUE LIBSPE2_FALSE PPU_LP64_TRUE PPU_LP64_FALSE LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE RANLIB ac_ct_RANLIB AR ac_ct_AR AS ac_ct_AS CP ac_ct_CP CCAS CCASFLAGS SPU_CC SPU_CXX SPU_LD SPU_AR SPU_AS SPU_CPP SPU_RANLIB SPU_STRIP SPU_NM EMBEDSPU SPU_CFLAGS SPU_CXXFLAGS SPU_LDFLAGS SPU_LIBS CELL_ENV PPU_CC PPU_CXX PPU_LD PPU_AR PPU_AS PPU_CCLD PPU_CCAS PPU_CPP PPU_RANLIB PPU_STRIP PPU_NM PPU_CFLAGS PPU_CXXFLAGS PPU_LDFLAGS PPU_CCASFLAGS PPU_CCLDFLAGS PPU_LIBS HOST_CC HOST_CXX HOST_LD HOST_CFLAGS HOST_CXXFLAGS HOST_LDFLAGS HOST_CCLDFLAGS HOST_CCASFLAGS CPP EGREP CTK_APP_SPU_LDFLAGS CTK_APP_SPU_LDADD DEBUG_TRUE DEBUG_FALSE TEST_TRUE TEST_FALSE PS3_TRUE PS3_FALSE CTK_SPE_TASK_START_ADDR REPLACE_LIBC_TRUE REPLACE_LIBC_FALSE TSDK_TRUE TSDK_FALSE LIBSPE_TRUE LIBSPE_FALSE LIBSPE2_TRUE LIBSPE2_FALSE PPU_LP64_TRUE PPU_LP64_FALSE LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -7418,6 +7418,152 @@ fi +if test "${ac_cv_header_asm_ps3fb_h+set}" = set; then + echo "$as_me:$LINENO: checking for asm/ps3fb.h" >&5 +echo $ECHO_N "checking for asm/ps3fb.h... $ECHO_C" >&6 +if test "${ac_cv_header_asm_ps3fb_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_asm_ps3fb_h" >&5 +echo "${ECHO_T}$ac_cv_header_asm_ps3fb_h" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking asm/ps3fb.h usability" >&5 +echo $ECHO_N "checking asm/ps3fb.h usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking asm/ps3fb.h presence" >&5 +echo $ECHO_N "checking asm/ps3fb.h presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: asm/ps3fb.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: asm/ps3fb.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: asm/ps3fb.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: asm/ps3fb.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: asm/ps3fb.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: asm/ps3fb.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: asm/ps3fb.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: asm/ps3fb.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: asm/ps3fb.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: asm/ps3fb.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: asm/ps3fb.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: asm/ps3fb.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: asm/ps3fb.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: asm/ps3fb.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: asm/ps3fb.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: asm/ps3fb.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ----------------------------------- ## +## Report this to ctk-dev@fixstars.com ## +## ----------------------------------- ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for asm/ps3fb.h" >&5 +echo $ECHO_N "checking for asm/ps3fb.h... $ECHO_C" >&6 +if test "${ac_cv_header_asm_ps3fb_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_asm_ps3fb_h=$ac_header_preproc +fi +echo "$as_me:$LINENO: result: $ac_cv_header_asm_ps3fb_h" >&5 +echo "${ECHO_T}$ac_cv_header_asm_ps3fb_h" >&6 + +fi +if test $ac_cv_header_asm_ps3fb_h = yes; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_PS3FB_H 1 +_ACEOF + HAVE_PS3FB=true +fi + + # Checks for typedefs, structures, and compiler characteristics. # Checks for library functions. echo "$as_me:$LINENO: checking for posix_memalign" >&5 @@ -7553,6 +7699,16 @@ fi + +if test x$HAVE_PS3FB = xtrue; then + PS3_TRUE= + PS3_FALSE='#' +else + PS3_TRUE='#' + PS3_FALSE= +fi + + # For some additional ctk defines if test x$debug = xtrue; then @@ -8277,6 +8433,13 @@ Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${PS3_TRUE}" && test -z "${PS3_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"PS3\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"PS3\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${REPLACE_LIBC_TRUE}" && test -z "${REPLACE_LIBC_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"REPLACE_LIBC\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -8967,6 +9130,8 @@ s,@DEBUG_FALSE@,$DEBUG_FALSE,;t t s,@TEST_TRUE@,$TEST_TRUE,;t t s,@TEST_FALSE@,$TEST_FALSE,;t t +s,@PS3_TRUE@,$PS3_TRUE,;t t +s,@PS3_FALSE@,$PS3_FALSE,;t t s,@CTK_SPE_TASK_START_ADDR@,$CTK_SPE_TASK_START_ADDR,;t t s,@REPLACE_LIBC_TRUE@,$REPLACE_LIBC_TRUE,;t t s,@REPLACE_LIBC_FALSE@,$REPLACE_LIBC_FALSE,;t t diff -ru ctk_v0.71/ctk/configure.ac ctk_v0.71_new/ctk/configure.ac --- ctk_v0.71/ctk/configure.ac 2007-05-21 15:15:32.000000000 +0900 +++ ctk_v0.71_new/ctk/configure.ac 2007-07-10 12:13:36.000000000 +0900 @@ -28,6 +28,7 @@ # Checks for libraries. # Checks for header files. AC_CHECK_HEADER([spu_mfcio.h], [AC_DEFINE([HAVE_SPU_MFCIO_H],[1],[Define if spu_mfcio.h exists])]) +AC_CHECK_HEADER([asm/ps3fb.h], [AC_DEFINE([HAVE_PS3FB_H],[1],[Define if asm/ps3fb.h exists]) HAVE_PS3FB=true]) # Checks for typedefs, structures, and compiler characteristics. # Checks for library functions. AC_CHECK_FUNC(posix_memalign, AC_DEFINE(HAVE_POSIX_MEMALIGN, 1, @@ -38,6 +39,7 @@ AM_CONDITIONAL([DEBUG], [test x$debug = xtrue]) test x$debug = xtrue && CFLAGS="$CFLAGS -g -DDEBUG" AM_CONDITIONAL([TEST], [false]) +AM_CONDITIONAL([PS3], [test x$HAVE_PS3FB = xtrue]) # For some additional ctk defines AC_PREPARE_BUILD_CTK diff -ru ctk_v0.71/ctk/ctk_config.h.in ctk_v0.71_new/ctk/ctk_config.h.in --- ctk_v0.71/ctk/ctk_config.h.in 2007-05-16 12:52:42.000000000 +0900 +++ ctk_v0.71_new/ctk/ctk_config.h.in 2007-07-10 12:14:23.000000000 +0900 @@ -36,6 +36,9 @@ /* Defined if we have posix_memalign () */ #undef HAVE_POSIX_MEMALIGN +/* Define if asm/ps3fb.h exists */ +#undef HAVE_PS3FB_H + /* Define if spere.h exists */ #undef HAVE_SPERE_H diff -ru ctk_v0.71/ctk/Makefile.in ctk_v0.71_new/ctk/Makefile.in --- ctk_v0.71/ctk/Makefile.in 2007-06-27 01:00:34.000000000 +0900 +++ ctk_v0.71_new/ctk/Makefile.in 2007-07-10 12:14:03.000000000 +0900 @@ -176,6 +176,8 @@ PPU_NM = @PPU_NM@ PPU_RANLIB = @PPU_RANLIB@ PPU_STRIP = @PPU_STRIP@ +PS3_FALSE = @PS3_FALSE@ +PS3_TRUE = @PS3_TRUE@ RANLIB = $(PPU_RANLIB) REPLACE_LIBC_FALSE = @REPLACE_LIBC_FALSE@ REPLACE_LIBC_TRUE = @REPLACE_LIBC_TRUE@ diff -ru ctk_v0.71/ctk/task/ppu/ctk_spe_runtime.h ctk_v0.71_new/ctk/task/ppu/ctk_spe_runtime.h --- ctk_v0.71/ctk/task/ppu/ctk_spe_runtime.h 2007-05-16 12:52:42.000000000 +0900 +++ ctk_v0.71_new/ctk/task/ppu/ctk_spe_runtime.h 2007-07-10 14:34:56.000000000 +0900 @@ -13,7 +13,7 @@ #include "ctk_queue.h" #include "ctk_list.h" -#define MAX_NR_SPE 6 +#define MAX_NR_SPE CTK_SPE_THREAD_GROUP_MAX #define MAX_NR_SPE_TASKS_PER_RUNTIME 64 typedef struct { diff -ru ctk_v0.71/ctk/util/Makefile.in ctk_v0.71_new/ctk/util/Makefile.in --- ctk_v0.71/ctk/util/Makefile.in 2007-05-16 12:52:42.000000000 +0900 +++ ctk_v0.71_new/ctk/util/Makefile.in 2007-07-10 12:15:01.000000000 +0900 @@ -145,6 +145,8 @@ PPU_NM = @PPU_NM@ PPU_RANLIB = @PPU_RANLIB@ PPU_STRIP = @PPU_STRIP@ +PS3_FALSE = @PS3_FALSE@ +PS3_TRUE = @PS3_TRUE@ RANLIB = @RANLIB@ REPLACE_LIBC_FALSE = @REPLACE_LIBC_FALSE@ REPLACE_LIBC_TRUE = @REPLACE_LIBC_TRUE@ diff -ru ctk_v0.71/ctk/util/ppu/Makefile.am ctk_v0.71_new/ctk/util/ppu/Makefile.am --- ctk_v0.71/ctk/util/ppu/Makefile.am 2007-07-02 19:39:51.000000000 +0900 +++ ctk_v0.71_new/ctk/util/ppu/Makefile.am 2007-07-10 12:15:06.000000000 +0900 @@ -4,11 +4,16 @@ lib_LIBRARIES = libctk_util.a lib_SOLIBRARIES = $(lib_LIBRARIES:.a=.so) -libctk_util_a_SOURCES = ctk_image.c ctk_ppm.c ctk_ps3fb.c +libctk_util_a_SOURCES = ctk_image.c ctk_ppm.c -include_HEADERS = ctk_util.h ctk_ps3fb.h +include_HEADERS = ctk_util.h pkginclude_HEADERS = ctk_ppm.h ctk_image.h +if PS3 +libctk_util_a_SOURCES += ctk_ps3fb.c +include_HEADERS += ctk_ps3fb.h +endif + all-local: $(lib_SOLIBRARIES) $(lib_SOLIBRARIES): $(libctk_util_a_OBJECTS) $(libctk_util_a_DEPENDENCIES) $(PPU_CCLD) $(PPU_CCLDFLAGS) $(PPU_LDFLAGS) $(libctk_util_a_OBJECTS) -shared -Wl,--soname=$@ -o $@ $(PPU_LIBS) diff -ru ctk_v0.71/ctk/util/ppu/Makefile.in ctk_v0.71_new/ctk/util/ppu/Makefile.in --- ctk_v0.71/ctk/util/ppu/Makefile.in 2007-07-02 19:39:51.000000000 +0900 +++ ctk_v0.71_new/ctk/util/ppu/Makefile.in 2007-07-10 12:15:06.000000000 +0900 @@ -35,13 +35,15 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -DIST_COMMON = $(include_HEADERS) $(pkginclude_HEADERS) \ +DIST_COMMON = $(am__include_HEADERS_DIST) $(pkginclude_HEADERS) \ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(top_srcdir)/mk.d/ctk.mk $(top_srcdir)/mk.d/ppu.mk @DEBUG_TRUE@am__append_1 = -DDEBUG @DEBUG_TRUE@am__append_2 = -DDEBUG @TEST_TRUE@am__append_3 = $(TEST_CFLAGS) @TEST_TRUE@am__append_4 = $(TEST_CXXFLAGS) +@PS3_TRUE@am__append_5 = ctk_ps3fb.c +@PS3_TRUE@am__append_6 = ctk_ps3fb.h subdir = util/ppu ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_cell_prefix.m4 \ @@ -70,8 +72,10 @@ ARFLAGS = cru libctk_util_a_AR = $(AR) $(ARFLAGS) libctk_util_a_LIBADD = +am__libctk_util_a_SOURCES_DIST = ctk_image.c ctk_ppm.c ctk_ps3fb.c +@PS3_TRUE@am__objects_1 = ctk_ps3fb.$(OBJEXT) am_libctk_util_a_OBJECTS = ctk_image.$(OBJEXT) ctk_ppm.$(OBJEXT) \ - ctk_ps3fb.$(OBJEXT) + $(am__objects_1) libctk_util_a_OBJECTS = $(am_libctk_util_a_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp @@ -80,7 +84,8 @@ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(libctk_util_a_SOURCES) -DIST_SOURCES = $(libctk_util_a_SOURCES) +DIST_SOURCES = $(am__libctk_util_a_SOURCES_DIST) +am__include_HEADERS_DIST = ctk_util.h ctk_ps3fb.h includeHEADERS_INSTALL = $(INSTALL_HEADER) pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER) HEADERS = $(include_HEADERS) $(pkginclude_HEADERS) @@ -171,6 +176,8 @@ PPU_NM = @PPU_NM@ PPU_RANLIB = @PPU_RANLIB@ PPU_STRIP = @PPU_STRIP@ +PS3_FALSE = @PS3_FALSE@ +PS3_TRUE = @PS3_TRUE@ RANLIB = $(PPU_RANLIB) REPLACE_LIBC_FALSE = @REPLACE_LIBC_FALSE@ REPLACE_LIBC_TRUE = @REPLACE_LIBC_TRUE@ @@ -250,8 +257,8 @@ spuxxpkgincludedir = $(cxxpkgincludedir)/spu lib_LIBRARIES = libctk_util.a lib_SOLIBRARIES = $(lib_LIBRARIES:.a=.so) -libctk_util_a_SOURCES = ctk_image.c ctk_ppm.c ctk_ps3fb.c -include_HEADERS = ctk_util.h ctk_ps3fb.h +libctk_util_a_SOURCES = ctk_image.c ctk_ppm.c $(am__append_5) +include_HEADERS = ctk_util.h $(am__append_6) pkginclude_HEADERS = ctk_ppm.h ctk_image.h all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am @@ -560,7 +567,7 @@ (cd $(CTK_COMMON_DIR); ./ctk_error_gen) $(CTK_COMMON_DIR)/ctk_error_gen$(EXEEXT): $(CTK_COMMON_DIR)/ctk_error_gen.h $(CTK_COMMON_DIR)/ctk_error_gen.c - ($(HOST_CC) -I$(CTK_COMMON_DIR)/ppu $(CFLAGS) $(LDFLAGS) $? -o $@) + ($(HOST_CC) $(CFLAGS) $(LDFLAGS) $? -o $@) all-local: $(lib_SOLIBRARIES) $(lib_SOLIBRARIES): $(libctk_util_a_OBJECTS) $(libctk_util_a_DEPENDENCIES)