Changeset 1981Tweet

Timestamp:

Oct 6, 2012, 12:42:06 AM (5 years ago)

Author:

sam

Message:

ps3: refactor elf → self build logic and make make_fself mandatory
when building for the PS3 on a Unix system.

Location:

trunk

Files:

• build/autotools/common.am (modified) (3 diffs)
• configure.ac (modified) (1 diff)
• test/Makefile.am (modified) (1 diff)
• test/math/Makefile.am (modified) (1 diff)
• test/sandbox/Makefile.am (modified) (1 diff)
• test/xolotl/Makefile.am (modified) (1 diff)
• tools/neercs/Makefile.am (modified) (1 diff)
• tutorial/Makefile.am (modified) (1 diff)

trunk/build/autotools/common.am

@@ +1 @@
+
+#
+# Define these variables from the beginning
+#
+
+CLEANFILES =
+SUFFIXES =
+
+
+#
+# Miscellaneous rules
+#
 
 lol_recursive_rule = \
         @if test -n "$(SUBDIRS)"; then for subdir in $(SUBDIRS); do \
-            ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $(patsubst %-recursive, %, $@)) || exit 1; \
-          done; \
-        fi
+          ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $(patsubst %-recursive, %, $@)) || exit 1; \
+        done; fi
 
 bench: bench-recursive
@@ -47 +58 @@
 lolfx_gen_0 = @echo "  LOLFX " $@;
 
-SUFFIXES = .lolfx
+SUFFIXES += .lolfx
 .lolfx.o:
         $(lolfx_gen)
@@ -58 +69 @@
 
 #
+# PS3 fself support rules
+#
+
+fself_gen = $(fself_gen_$(V))
+fself_gen_ = $(fself_gen_$(AM_DEFAULT_VERBOSITY))
+fself_gen_0 = echo "  FSELF " $${x}.self;
+fself_gen_1 = echo make_fself $${x}$(EXEEXT) $${x}.self;
+
+all-local: all-local-ps3
+all-local-ps3: $(PROGRAMS) $(noinst_PROGRAMS)
+        @if test -n "$^"; then for x in $(^:%$(EXEEXT)=%); do \
+          if test x$(MAKE_FSELF) != xno; then \
+            $(fself_gen) \
+            make_fself $${x}$(EXEEXT) $${x}.self; \
+          fi; \
+        done; fi
+
+CLEANFILES += $(PROGRAMS:%$(EXEEXT)=%.self) \
+              $(PROGRAMS:%$(EXEEXT)=%.elf) \
+              $(noinst_PROGRAMS:%$(EXEEXT)=%.self) \
+              $(noinst_PROGRAMS:%$(EXEEXT)=%.elf)
+
+
+#
+# Win32 rules
+#
+
+# This is here in case we forget to make clean after a Windows build
+CLEANFILES += $(PROGRAMS:%$(EXEEXT)=%.exe) \
+              $(noinst_PROGRAMS:%$(EXEEXT)=%.exe)
+
+
+#
 # Additional rules
 #

trunk/configure.ac

@@ -119 +119 @@
   dnl  Disable this warning, it's too verbose with vector.h
   CXXFLAGS="${CXXFLAGS} -Wno-sign-compare"
-  AC_PATH_PROG(MAKE_FSELF, make_fself, no)],
+  AC_PATH_PROG(MAKE_FSELF, make_fself, no)
+  if test "${MAKE_FSELF}" = "no"; then
+    AC_MSG_ERROR([[Building for PS3 but make_fself not found]])
+  fi],
  [MAKE_FSELF=no])
-AM_CONDITIONAL(USE_MAKE_FSELF, test "${MAKE_FSELF}" != "no")
 AM_CONDITIONAL(USE_PS3, test "${ac_cv_my_have_ps3}" != "no")
 

trunk/test/Makefile.am

@@ -8 +8 @@
 bench: benchsuite$(EXEEXT)
         ./benchsuite$(EXEEXT)
-
-all-local: $(PROGRAMS) $(noinst_PROGRAMS)
-        for x in $(^:%$(EXEEXT)=%); do \
-          test x$(MAKE_FSELF) = xno || make_fself $${x}$(EXEEXT) $${x}.self; \
-        done
-
-CLEANFILES = $(noinst_PROGRAMS:%$(EXEEXT)=%.self) \
-             $(noinst_PROGRAMS:%$(EXEEXT)=%.elf) \
-             $(noinst_PROGRAMS:%$(EXEEXT)=%.exe)
 
 EXTRA_DIST = data/gradient.png

trunk/test/math/Makefile.am

@@ -4 +4 @@
 AM_CPPFLAGS = -I$(top_srcdir)/src
 
-all-local: $(PROGRAMS) $(noinst_PROGRAMS)
-        for x in $(^:%$(EXEEXT)=%); do \
-          test x$(MAKE_FSELF) = xno || make_fself $${x}$(EXEEXT) $${x}.self; \
-        done
-
 EXTRA_DIST = NEWS.txt lolremez.sln remez.vcxproj remez.vcxproj.filters
-
-CLEANFILES = $(noinst_PROGRAMS:%$(EXEEXT)=%.self) \
-             $(noinst_PROGRAMS:%$(EXEEXT)=%.elf) \
-             $(noinst_PROGRAMS:%$(EXEEXT)=%.exe)
 
 noinst_PROGRAMS = pi poly remez

trunk/test/sandbox/Makefile.am

@@ -3 +3 @@
 
 AM_CPPFLAGS = -I$(top_srcdir)/src
-
-all-local: $(noinst_PROGRAMS)
-        test x$(MAKE_FSELF) = xno || make_fself sample$(EXEEXT) sample.self
-
-CLEANFILES = $(noinst_PROGRAMS:%$(EXEEXT)=%.self) \
-             $(noinst_PROGRAMS:%$(EXEEXT)=%.elf) \
-             $(noinst_PROGRAMS:%$(EXEEXT)=%.exe)
 
 noinst_PROGRAMS = sample

trunk/test/xolotl/Makefile.am

@@ -3 +3 @@
 
 AM_CPPFLAGS = -I$(top_srcdir)/src
-
-all-local: $(noinst_PROGRAMS)
-        test x$(MAKE_FSELF) = xno || make_fself xolotl$(EXEEXT) xolotl.self
-
-CLEANFILES = $(noinst_PROGRAMS:%$(EXEEXT)=%.self) \
-             $(noinst_PROGRAMS:%$(EXEEXT)=%.elf) \
-             $(noinst_PROGRAMS:%$(EXEEXT)=%.exe)
 
 noinst_PROGRAMS = xolotl

trunk/tools/neercs/Makefile.am

@@ -26 +26 @@
                  @LOL_LIBS@ @PIPI_LIBS@ @CACA_LIBS@ @UTIL_LIBS@ @PAM_LIBS@
 neercs_DEPENDENCIES = $(top_builddir)/src/liblol.a
-
-if BUILD_NEERCS
-all-local: neercs$(EXEEXT)
-        test $(MAKE_FSELF) = no || make_fself neercs$(EXEEXT) neercs.self
-endif
-
-CLEANFILES = $(noinst_PROGRAMS:%$(EXEEXT)=%.self) \
-             $(noinst_PROGRAMS:%$(EXEEXT)=%.elf) \
-             $(noinst_PROGRAMS:%$(EXEEXT)=%.exe)
 
 old_sources = \

trunk/tutorial/Makefile.am

@@ -3 +3 @@
 
 AM_CPPFLAGS = -I$(top_srcdir)/src
-
-all-local: $(PROGRAMS) $(noinst_PROGRAMS)
-        for x in $(^:%$(EXEEXT)=%); do \
-          test x$(MAKE_FSELF) = xno || make_fself $${x}$(EXEEXT) $${x}.self; \
-        done
-
-CLEANFILES = $(noinst_PROGRAMS:%$(EXEEXT)=%.self) \
-             $(noinst_PROGRAMS:%$(EXEEXT)=%.elf) \
-             $(noinst_PROGRAMS:%$(EXEEXT)=%.exe)
 
 noinst_PROGRAMS = 01_triangle 02_cube 03_noise 05_easymesh 08_fbo 11_fractal