@@ -5,7 +5,7 @@ include $(top_srcdir)/build/autotools/common.am | |||||
SUBDIRS = build src tutorial test tools games people doc | SUBDIRS = build src tutorial test tools games people doc | ||||
DIST_SUBDIRS = $(SUBDIRS) binaries | DIST_SUBDIRS = $(SUBDIRS) binaries | ||||
EXTRA_DIST = bootstrap COPYING TODO | EXTRA_DIST += bootstrap COPYING TODO | ||||
AUTOMAKE_OPTIONS = dist-bzip2 | AUTOMAKE_OPTIONS = dist-bzip2 | ||||
ACLOCAL_AMFLAGS = -I build/autotools/m4 | ACLOCAL_AMFLAGS = -I build/autotools/m4 | ||||
@@ -1,12 +1,12 @@ | |||||
include $(top_srcdir)/build/autotools/common.am | include $(top_srcdir)/build/autotools/common.am | ||||
EXTRA_DIST = lol-build \ | EXTRA_DIST += lol-build \ | ||||
check-source.sh run-bitten.sh \ | check-source.sh run-bitten.sh \ | ||||
build-linux build-mingw build-mingw64 build-ps3 \ | build-linux build-mingw build-mingw64 build-ps3 \ | ||||
build-nacl32 build-nacl64 \ | build-nacl32 build-nacl64 \ | ||||
\ | \ | ||||
autotools/common.am | autotools/common.am | ||||
TESTS = check-source.sh | TESTS = check-source.sh | ||||
@@ -5,6 +5,7 @@ | |||||
CLEANFILES = | CLEANFILES = | ||||
SUFFIXES = | SUFFIXES = | ||||
EXTRA_DIST = | |||||
# | # | ||||
@@ -104,5 +105,9 @@ CLEANFILES += $(PROGRAMS:%$(EXEEXT)=%.exe) \ | |||||
# Additional rules | # Additional rules | ||||
# | # | ||||
EXTRA_DIST += $(foreach p, $(noinst_PROGRAMS), $($(p)_DATA)) | |||||
EXTRA_DIST += $(foreach p, $(bin_PROGRAMS), $($(p)_DATA)) | |||||
.PHONY: bench lolcheck generated | .PHONY: bench lolcheck generated | ||||
@@ -1,7 +1,7 @@ | |||||
include $(top_srcdir)/build/autotools/common.am | include $(top_srcdir)/build/autotools/common.am | ||||
EXTRA_DIST = doxygen.cfg.in doxygen.css footer.html header.html \ | EXTRA_DIST += doxygen.cfg.in doxygen.css footer.html header.html \ | ||||
$(man_MANS) $(doxygen_DOX) | $(man_MANS) $(doxygen_DOX) | ||||
CLEANFILES += doxygen.log stamp-latex stamp-doxygen | CLEANFILES += doxygen.log stamp-latex stamp-doxygen | ||||
doxygen_DOX = lolengine.dox | doxygen_DOX = lolengine.dox | ||||
@@ -27,8 +27,8 @@ liblolcore_a_SOURCES = \ | |||||
$(android_sources) | $(android_sources) | ||||
liblolcore_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/bullet -I$(srcdir)/lua | liblolcore_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/bullet -I$(srcdir)/lua | ||||
EXTRA_DIST = easymesh/easymesh-scanner.l easymesh/easymesh-parser.y \ | EXTRA_DIST += easymesh/easymesh-scanner.l easymesh/easymesh-parser.y \ | ||||
gpu/lolfx-scanner.l gpu/lolfx-parser.y | gpu/lolfx-scanner.l gpu/lolfx-parser.y | ||||
liblolcore_headers = \ | liblolcore_headers = \ | ||||
lol/base/all.h \ | lol/base/all.h \ | ||||
@@ -37,8 +37,7 @@ liblolcore_headers = \ | |||||
\ | \ | ||||
lol/math/all.h \ | lol/math/all.h \ | ||||
lol/math/functions.h lol/math/vector.h lol/math/half.h lol/math/real.h \ | lol/math/functions.h lol/math/vector.h lol/math/half.h lol/math/real.h \ | ||||
lol/math/remez.h lol/math/math.h lol/math/geometry.h lol/math/interp.h \ | lol/math/remez.h lol/math/geometry.h lol/math/interp.h lol/math/rand.h \ | ||||
lol/math/rand.h \ | |||||
\ | \ | ||||
lol/sys/all.h \ | lol/sys/all.h \ | ||||
lol/sys/init.h lol/sys/file.h lol/sys/thread.h lol/sys/atomic.h \ | lol/sys/init.h lol/sys/file.h lol/sys/thread.h lol/sys/atomic.h \ | ||||
@@ -52,7 +51,7 @@ liblolcore_headers = \ | |||||
lol/gpu/framebuffer.h lol/gpu/texture.h lol/gpu/lolfx.h \ | lol/gpu/framebuffer.h lol/gpu/texture.h lol/gpu/lolfx.h \ | ||||
\ | \ | ||||
lol/debug/all.h \ | lol/debug/all.h \ | ||||
lol/debug/line.h \ | lol/debug/lines.h \ | ||||
\ | \ | ||||
lol/unit.h | lol/unit.h | ||||
@@ -1,7 +1,7 @@ | |||||
include $(top_srcdir)/build/autotools/common.am | include $(top_srcdir)/build/autotools/common.am | ||||
EXTRA_DIST = ascii.png | EXTRA_DIST += ascii.png | ||||
if USE_CACA | if USE_CACA | ||||
all: ascii.png | all: ascii.png | ||||
@@ -6,8 +6,6 @@ SUBDIRS = math sandbox xolotl | |||||
bench: benchsuite$(EXEEXT) | bench: benchsuite$(EXEEXT) | ||||
./benchsuite$(EXEEXT) | ./benchsuite$(EXEEXT) | ||||
EXTRA_DIST = data/gradient.png | |||||
noinst_PROGRAMS = benchsuite $(testsuite) btphystest meshviewer | noinst_PROGRAMS = benchsuite $(testsuite) btphystest meshviewer | ||||
TESTS = $(testsuite) | TESTS = $(testsuite) | ||||
@@ -25,6 +23,7 @@ testsuite_SOURCES = testsuite.cpp \ | |||||
unit/rand.cpp | unit/rand.cpp | ||||
testsuite_CPPFLAGS = $(AM_CPPFLAGS) | testsuite_CPPFLAGS = $(AM_CPPFLAGS) | ||||
testsuite_DEPENDENCIES = @LOL_DEPS@ | testsuite_DEPENDENCIES = @LOL_DEPS@ | ||||
noinst_DATA = data/gradient.png | |||||
benchsuite_SOURCES = benchsuite.cpp \ | benchsuite_SOURCES = benchsuite.cpp \ | ||||
benchmark/vector.cpp benchmark/half.cpp benchmark/trig.cpp \ | benchmark/vector.cpp benchmark/half.cpp benchmark/trig.cpp \ | ||||
@@ -1,7 +1,7 @@ | |||||
include $(top_srcdir)/build/autotools/common.am | include $(top_srcdir)/build/autotools/common.am | ||||
EXTRA_DIST = NEWS.txt lolremez.sln remez.vcxproj remez.vcxproj.filters | EXTRA_DIST += NEWS.txt lolremez.sln remez.vcxproj remez.vcxproj.filters | ||||
noinst_PROGRAMS = pi poly remez | noinst_PROGRAMS = pi poly remez | ||||
@@ -1,7 +1,7 @@ | |||||
include $(top_srcdir)/build/autotools/common.am | include $(top_srcdir)/build/autotools/common.am | ||||
noinst_PROGRAMS = sample | bin_PROGRAMS = sample | ||||
sample_SOURCES = sample.cpp | sample_SOURCES = sample.cpp | ||||
sample_CPPFLAGS = $(AM_CPPFLAGS) | sample_CPPFLAGS = $(AM_CPPFLAGS) | ||||
@@ -1,7 +1,7 @@ | |||||
include $(top_srcdir)/build/autotools/common.am | include $(top_srcdir)/build/autotools/common.am | ||||
noinst_PROGRAMS = xolotl | bin_PROGRAMS = xolotl | ||||
xolotl_SOURCES = xolotl.cpp xolotl.h | xolotl_SOURCES = xolotl.cpp xolotl.h | ||||
xolotl_CPPFLAGS = $(AM_CPPFLAGS) | xolotl_CPPFLAGS = $(AM_CPPFLAGS) | ||||
@@ -1,6 +1,6 @@ | |||||
include $(top_srcdir)/build/autotools/common.am | include $(top_srcdir)/build/autotools/common.am | ||||
EXTRA_DIST = \ | EXTRA_DIST += \ | ||||
vimlol.vim | vimlol.vim | ||||
@@ -1,7 +1,7 @@ | |||||
include $(top_srcdir)/build/autotools/common.am | include $(top_srcdir)/build/autotools/common.am | ||||
EXTRA_DIST = \ | EXTRA_DIST += \ | ||||
VsLol.csproj \ | VsLol.csproj \ | ||||
\ | \ | ||||
VsLol.cs \ | VsLol.cs \ | ||||