commit 7983ebbac8ae58fa8559a49f1255d0e2a7298e2c parent 5807b7da0373d7158594a8917ca31b2a2a0153a9 Author: Fabian Wermelinger <fabianw@mavt.ethz.ch> Date: Thu, 28 Apr 2016 12:24:15 +0200 minor Diffstat:
| M | third_party/Makefile | | | 13 | ++++--------- |
| A | third_party/Makefile.cubismz | | | 13 | +++++++++++++ |
2 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/third_party/Makefile b/third_party/Makefile @@ -1,20 +1,17 @@ include ../Makefile.config -include ./CubismZ/CubismApps/Makefile.config -CubismZ_SRC = CubismZ/CubismApps/Compressor/source/WaveletCompressor.cpp PNG_SRC = $(wildcard libpng-1.2.51/*.c) PNGWRTR_SRC = $(wildcard pngwriter-0.5.4/*.cc) INC += -Ilibpng-1.2.51 -OBJLib1 = ${CubismZ_SRC:.cpp=.o} OBJLib2 = ${PNG_SRC:.c=.o} OBJLib3 = ${PNGWRTR_SRC:.cc=.o} all: libCubismZ.a libpng.a -libCubismZ.a: $(OBJLib1) - ar rcs ../lib/libCubismZ.a $(OBJLib1) +libCubismZ.a: + $(MAKE) -f Makefile.cubismz config=$(config) bs=$(bs) ap=$(prec) align=$(align) omp=1 libpng.a: $(OBJLib2) $(OBJLib3) ar rcs ../lib/libpng.a $(OBJLib2) $(OBJLib3) @@ -22,11 +19,9 @@ libpng.a: $(OBJLib2) $(OBJLib3) .c.o: gcc -c $(CFLAGS) -o $@ $< -.cpp.o: - g++ -c $(CPPFLAGS) $(INC) -o $@ $< - .cc.o: g++ -c $(CPPFLAGS) $(INC) -o $@ $< clean: - rm -rf $(OBJLib1) $(OBJLib2) $(OBJLib3) ../lib/libpng.a ../lib/libCubismZ.a + rm -rf $(OBJLib2) $(OBJLib3) ../lib/libpng.a + $(MAKE) -f Makefile.cubismz clean diff --git a/third_party/Makefile.cubismz b/third_party/Makefile.cubismz @@ -0,0 +1,13 @@ +include CubismZ/CubismApps/Makefile.config + +CubismZ_SRC = CubismZ/CubismApps/Compressor/source/WaveletCompressor.cpp +OBJLib1 = ${CubismZ_SRC:.cpp=.o} + +all: $(OBJLib1) + ar rcs ../lib/libCubismZ.a $(OBJLib1) + +.cpp.o: + g++ -c $(CPPFLAGS) $(INC) -o $@ $< + +clean: + rm -f $(OBJLib1) ../lib/libCubismZ.a