Browse Source

build: minor reorganisation of the sandbox code.

legacy
Sam Hocevar gary 13 years ago
parent
commit
3283dfc011
6 changed files with 22 additions and 10 deletions
  1. +1
    -1
      .gitignore
  2. +1
    -0
      configure.ac
  3. +2
    -8
      test/Makefile.am
  4. +1
    -1
      test/math/Makefile.am
  5. +17
    -0
      test/sandbox/Makefile.am
  6. +0
    -0
      test/sandbox/sample.cpp

+ 1
- 1
.gitignore View File

@@ -62,7 +62,7 @@ test/tutorial/tut02
test/tutorial/tut03
test/benchsuite
test/quad
test/sandbox
test/sandbox/sample
test/math/pi
test/math/poly
test/math/remez


+ 1
- 0
configure.ac View File

@@ -339,6 +339,7 @@ AC_CONFIG_FILES(
src/Makefile
test/Makefile
test/math/Makefile
test/sandbox/Makefile
test/tutorial/Makefile
test/xolotl/Makefile
gfx/Makefile


+ 2
- 8
test/Makefile.am View File

@@ -1,5 +1,5 @@

SUBDIRS = math tutorial xolotl
SUBDIRS = math tutorial sandbox xolotl

AM_CPPFLAGS = -I$(top_srcdir)/src

@@ -8,7 +8,6 @@ bench: benchsuite$(EXEEXT)

all-local: $(noinst_PROGRAMS)
test x$(MAKE_FSELF) = xno || make_fself quad$(EXEEXT) quad.self
test x$(MAKE_FSELF) = xno || make_fself sandbox$(EXEEXT) sandbox.self
test x$(MAKE_FSELF) = xno || make_fself benchsuite$(EXEEXT) benchsuite.self
test x$(MAKE_FSELF) = xno || make_fself testsuite$(EXEEXT) testsuite.self

@@ -18,7 +17,7 @@ CLEANFILES = $(noinst_PROGRAMS:%$(EXEEXT)=%.self) \

EXTRA_DIST = data/gradient.png

noinst_PROGRAMS = quad sandbox benchsuite testsuite
noinst_PROGRAMS = quad benchsuite testsuite

TESTS = testsuite

@@ -41,8 +40,3 @@ quad_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
quad_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
quad_DEPENDENCIES = $(top_builddir)/src/liblol.a

sandbox_SOURCES = debug/sandbox.cpp
sandbox_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
sandbox_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
sandbox_DEPENDENCIES = $(top_builddir)/src/liblol.a


+ 1
- 1
test/math/Makefile.am View File

@@ -3,7 +3,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src

all-local: $(noinst_PROGRAMS)
test x$(MAKE_FSELF) = xno || make_fself pi$(EXEEXT) pi.self
test x$(MAKE_FSELF) = xno || make_fself poly$(EXEEXT) pi.self
test x$(MAKE_FSELF) = xno || make_fself poly$(EXEEXT) poly.self
test x$(MAKE_FSELF) = xno || make_fself remez$(EXEEXT) remez.self

CLEANFILES = $(noinst_PROGRAMS:%$(EXEEXT)=%.self) \


+ 17
- 0
test/sandbox/Makefile.am View File

@@ -0,0 +1,17 @@

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

sample_SOURCES = sample.cpp
sample_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
sample_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
sample_DEPENDENCIES = $(top_builddir)/src/liblol.a


test/debug/sandbox.cpp → test/sandbox/sample.cpp View File


Loading…
Cancel
Save