diff options
| author | Wim van Aarle <wimvanaarle@gmail.com> | 2015-03-18 11:07:49 +0100 |
|---|---|---|
| committer | Wim van Aarle <wimvanaarle@gmail.com> | 2015-03-18 11:07:49 +0100 |
| commit | c9730a84bd2be4fa2df2fd2ef947a624e9a09f02 (patch) | |
| tree | c5f7b0ebe8e6e3b7127516670fe5f946c1182cbf /build/linux/Makefile.in | |
| parent | b818448ce7ab23be865a7065dd3d66b780f811f7 (diff) | |
| parent | 65a607967e71d68ec32f34b7cf61fd8d891cc550 (diff) | |
| download | astra-c9730a84bd2be4fa2df2fd2ef947a624e9a09f02.tar.gz astra-c9730a84bd2be4fa2df2fd2ef947a624e9a09f02.tar.bz2 astra-c9730a84bd2be4fa2df2fd2ef947a624e9a09f02.tar.xz astra-c9730a84bd2be4fa2df2fd2ef947a624e9a09f02.zip | |
updated makefile
Diffstat (limited to 'build/linux/Makefile.in')
| -rw-r--r-- | build/linux/Makefile.in | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/build/linux/Makefile.in b/build/linux/Makefile.in index cd5e74b..d391278 100644 --- a/build/linux/Makefile.in +++ b/build/linux/Makefile.in @@ -1,6 +1,7 @@ cuda=@HAVECUDA@ matlab=@HAVEMATLAB@ python=@HAVEPYTHON@ +boostutf=@HAVEBOOSTUTF@ MATLAB_ROOT=@MATLAB_ROOT@ @@ -32,6 +33,8 @@ CXXFLAGS+=-g -O3 -Wall -Wshadow LIBS+=-lpthread LDFLAGS+=-g +CPPFLAGS+=@CPPFLAGS_OS@ + ifeq ($(cuda),yes) CPPFLAGS += @CPPFLAGS_CUDA@ -DASTRA_CUDA NVCCFLAGS = @NVCCFLAGS@ @CPPFLAGS_CUDA@ -I../.. -I../../include -DASTRA_CUDA @@ -57,6 +60,8 @@ endif BOOST_CPPFLAGS= BOOST_LDFLAGS= +BOOSTUTF_LIBS=@LIBS_BOOSTUTF@ + CPPFLAGS+=$(BOOST_CPPFLAGS) LDFLAGS+=$(BOOST_LDFLAGS) @@ -124,6 +129,7 @@ BASE_OBJECTS=\ src/ParallelBeamLineKernelProjector2D.lo \ src/ParallelBeamStripKernelProjector2D.lo \ src/ParallelProjectionGeometry2D.lo \ + src/ParallelVecProjectionGeometry2D.lo \ src/ParallelProjectionGeometry3D.lo \ src/ParallelVecProjectionGeometry3D.lo \ src/PlatformDepSystemCode.lo \ @@ -288,11 +294,16 @@ ifeq ($(cuda),yes) @rm -f $(*F).linkinfo endif +ifeq ($(boostutf),yes) test.bin: $(ALL_OBJECTS) $(TEST_OBJECTS) - ./libtool --mode=link $(LD) -o $@ $(LDFLAGS) $(LIBS) $+ -lboost_unit_test_framework + ./libtool --mode=link $(LD) -o $@ $(LDFLAGS) $+ $(LIBS) $(BOOSTUTF_LIBS) test: test.bin ./test.bin +else +test: + @echo "Tests have been disabled by configure" +endif clean: rm -f $(MATLAB_MEX) libastra.la @@ -303,6 +314,8 @@ clean: rm -f $(TEST_OBJECTS) test.bin rm -fr ../../python/finalbuild/ rm -fr ../../python/build/ + rm -f ../../python/astra/*.cpp + rm -f ../../python/astra/*.c distclean: clean rm -f config.guess config.sub ltmain.sh libtool install-sh |