polaroid-pp

commit de939a24263ac901cbf46c8c780f424fb2b3310c
parent 31d1a0e36ed57547d1809a5dc81340b1ffe73bf7
Author: Fabian Wermelinger <fabianw@mavt.ethz.ch>
Date:   Fri, 30 Sep 2016 20:35:58 +0200

do not compile CubismZ by default

CubismZ must be compiled explicitly from now on

    cd third_party
    make CubismZ

(provided the submodule is loaded)

Diffstat:
M
Makefile
 | 
7
+++++++
M
Makefile.config
 | 
2
+-
M
third_party/Makefile
 | 
14
+++++++++++---

3 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
@@ -1,5 +1,7 @@
 include ./Makefile.config
 
+CC = mpic++
+
 HDR = $(wildcard src/*.h)
 SRC = $(wildcard src/*.cpp)
 OBJ = ${SRC:.cpp=.o}
@@ -11,6 +13,7 @@ APPSRC = $(wildcard apps/polaroidCamera/*.cpp)
 APPSRC += $(wildcard apps/*.cpp)
 APPOBJ = ${APPSRC:.cpp=.o}
 
+.PHONY: clean cleanThird cleanAll
 
 polaroidCamera: third_party Polaroid $(APPOBJ)
 	$(CC) $(CPPFLAGS) $(INC) -o bin/polaroidCamera $(APPOBJ) -lPolaroid $(LIB) -lpng -lz
@@ -33,4 +36,8 @@ clean:
 	rm -f $(APPOBJ)
 	rm -f lib/libPolaroid.a
 	rm -f bin/polaroidCamera
+
+cleanThird:
 	$(MAKE) -C third_party clean
+
+cleanAll: clean cleanThird
diff --git a/Makefile.config b/Makefile.config
@@ -8,7 +8,7 @@ bs ?= 16
 align ?= 16
 omp ?= 0
 hdf ?= 1
-cubismz ?= 1
+cubismz ?= 0
 prec ?= float
 
 #compression stage-1 (floating point)
diff --git a/third_party/Makefile b/third_party/Makefile
@@ -8,15 +8,19 @@ INC +=  -Ilibpng-1.2.51
 OBJLib2 = ${PNG_SRC:.c=.o}
 OBJLib3 = ${PNGWRTR_SRC:.cc=.o}
 
-all: libCubismZ.a libpng.a
+.PHONY: clean cleanCubismZ cleanAll
 
-libCubismZ.a:
-	$(MAKE) -e -f Makefile.cubismz CC=$(CC) config=$(config) bs=$(bs) ap=$(prec) align=$(align) omp=1
+all: libpng.a
 
 libpng.a: $(OBJLib2) $(OBJLib3)
 	ar rcs ../lib/libpng.a $(OBJLib2) $(OBJLib3)
 	ranlib ../lib/libpng.a
 
+CubismZ: libCubismZ.a
+
+libCubismZ.a:
+	$(MAKE) -e -f Makefile.cubismz CC=$(CC) config=$(config) bs=$(bs) ap=$(prec) align=$(align) omp=1
+
 .c.o:
 	$(cc) -c $(CFLAGS) -o $@ $<
 
@@ -25,4 +29,8 @@ libpng.a: $(OBJLib2) $(OBJLib3)
 
 clean:
 	rm -rf $(OBJLib2) $(OBJLib3) ../lib/libpng.a
+
+cleanCubismZ:
 	$(MAKE) -f Makefile.cubismz clean
+
+cleanAll: clean cleanCubismZ