From 5ba4109f0021e7b2c9c66821461742a339e07355 Mon Sep 17 00:00:00 2001
From: pants <jaron@kent-dobias.com>
Date: Wed, 7 Dec 2016 13:29:51 -0500
Subject: added support for hyperuniform lattices using existing hard-sphere
 jamming routine

---
 makefile | 32 +++++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)

(limited to 'makefile')

diff --git a/makefile b/makefile
index d788743..ed1142d 100644
--- a/makefile
+++ b/makefile
@@ -1,12 +1,18 @@
 
 CC = clang
+CCP = clang++
 CFLAGS = -g -Os -O3 -Wall -fno-strict-aliasing -Wstrict-overflow -Wno-missing-field-initializers -fPIC -flto -fopenmp -march=native 
+CPFLAGS = -g -Os -O3 -Wall -fno-strict-aliasing -Wstrict-overflow -Wno-missing-field-initializers -fPIC -flto -fopenmp -march=native 
+CCPFLAGS = -g -Os -O3 -Wall -fno-strict-aliasing -Wstrict-overflow -Wno-missing-field-initializers -fPIC -flto -shared -fopenmp -march=native 
 LDFLAGS = -lc -lcblas -llapack -ldl -lpthread -lcholmod -lamd -lcolamd -lsuitesparseconfig -lcamd -lccolamd -lm -lrt -lmetis -lgsl -lprofiler -ltcmalloc
 
 OBJ = data bound_set correlations factor_update graph_genfunc net net_voltages net_currents net_conductivity net_fracture get_dual_clusters break_edge graph_components gen_laplacian geometry gen_voltcurmat graph_create graph_free fortune/edgelist fortune/geometry fortune/heap fortune/main fortune/output fortune/voronoi fortune/memory rand
-BIN = corr_test fracture anal_process big_anal_process cen_anal_process
+OBJP = spheres_poly/box spheres_poly/event spheres_poly/heap spheres_poly/neighbor spheres_poly/sphere
+OBJCCP = spheres_poly/spheres
+BIN = corr_test fracture anal_process big_anal_process cen_anal_process long_anal_process
 
-all: opt ${OBJ:%=obj/%.o} ${BIN:%=obj/%.o} ${BIN:%=bin/%}
+
+all: opt ${OBJ:%=obj/%.o} ${OBJP:%=obj/%.o} ${BIN:%=obj/%.o} ${BIN:%=bin/%}
 
 opt:
 	@echo build options:
@@ -14,18 +20,26 @@ opt:
 	@echo "CFLAGS   = ${CFLAGS}"
 	@echo "LDFLAGS  = ${LDFLAGS}"
 
-obj/%.o: src/%.c
+${OBJ:%=obj/%.o} ${BIN:%=obj/%.o}: obj/%.o: src/%.c
 	@echo CC -c -o $@
-	@${CC} -c -o $@ $< ${CFLAGS}
+	@${CC} -c ${CFLAGS} $< -o $@
+
+${OBJP:%=obj/%.o}: obj/%.o: src/%.cpp
+	@echo CCP -c -o $@
+	@${CCP} -c ${CPFLAGS} $< -o $@
+
+${OBJCCP:%=obj/%.o}: obj/%.o: src/%.cpp ${OBJP:%=obj/%.o} 
+	@echo ${CCP} ${CCPFLAGS} ${OBJP:%=obj/%.o} $< -o $@
+	@${CCP} ${CCPFLAGS} ${OBJP:%=obj/%.o} -fuse-ld=gold $< -o $@
 
-bin/%: obj/%.o ${OBJ:%=obj/%.o}
-	@echo CC -o $@
-	@${CC} -o $@ $< ${OBJ:%=obj/%.o} -fuse-ld=gold ${CFLAGS} ${LDFLAGS}
+bin/%: obj/%.o ${OBJ:%=obj/%.o} ${OBJCCP:%=obj/%.o}
+	@echo ${CC} ${OBJ:%=obj/%.o} ${OBJCCP:%=obj/%.o} -fuse-ld=gold ${CFLAGS} ${LDFLAGS} $< -o $@
+	@${CC} ${OBJ:%=obj/%.o} ${OBJCCP:%=obj/%.o} -fuse-ld=gold ${CFLAGS} ${LDFLAGS} $< -o $@
 
 clean:
 	@echo cleaning:
-	@echo rm -f ${OBJ:%=obj/%} ${BIN:%=obj/%.o} ${BIN:%=bin/%}
-	@rm -f ${OBJ:%=obj/%.o} ${BIN:%=obj/%.o} ${BIN:%=bin/%}
+	@echo rm -f ${OBJ:%=obj/%.o} ${OBJP:%=obj/%.o} ${OBJCCP:%=obj/%.o} ${BIN:%=obj/%.o} ${BIN:%=bin/%}
+	@rm -f ${OBJ:%=obj/%.o} ${OBJP:%=obj/%.o} ${OBJCCP:%=obj/%.o} ${BIN:%=obj/%.o} ${BIN:%=bin/%}
 
 .PHONY: all clean
 
-- 
cgit v1.2.3-70-g09d2