From 6dd820dec77e2479c5fb81ead9be8f8be844e9f2 Mon Sep 17 00:00:00 2001
From: Andrej Babic <andrej.babic@psi.ch>
Date: Thu, 12 Jul 2018 14:13:49 +0200
Subject: [PATCH] Add deployment goal for Alvra

---
 sf_alvra/Makefile | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/sf_alvra/Makefile b/sf_alvra/Makefile
index d817c2f..c938113 100644
--- a/sf_alvra/Makefile
+++ b/sf_alvra/Makefile
@@ -3,10 +3,9 @@ OBJ_DIR = ./obj
 BIN_DIR = ./bin
 MKDIR = mkdir -p
 
-CPP = g++
-CPPFLAGS = -Wall -Wfatal-errors -std=c++11 -I../../src -I../../include -I${CONDA_PREFIX}/include
-LDLIBS = -L../../bin -L${CONDA_PREFIX}/lib -L/usr/lib64 -lcpp_h5_writer -lzmq -lhdf5 -lhdf5_hl -lhdf5_cpp -lhdf5_hl_cpp -lboost_system -lboost_regex -lboost_thread -lpthread
-LDLIBS_TEST = -lgtest_main -lgtest
+CC = g++
+CFLAGS = -Wall -Wfatal-errors -std=c++11 -I${CONDA_PREFIX}/include -I${CONDA_PREFIX}/include/cpp_h5_writer
+LDFLAGS = -L${CONDA_PREFIX}/lib -L/usr/lib64 -lcpp_h5_writer -lzmq -lhdf5 -lhdf5_hl -lhdf5_cpp -lhdf5_hl_cpp -lboost_system -lboost_regex -lboost_thread -lpthread
 
 HEADERS = $(wildcard $(SRC_DIR)/*.hpp)
 SRCS = $(wildcard $(SRC_DIR)/*.cpp)
@@ -15,22 +14,24 @@ OBJS = $(patsubst $(SRC_DIR)/%.cpp, $(OBJ_DIR)/%.o, $(SRCS))
 alvra: lib all
 
 lib:
-	$(MAKE) -C ../../ lib
+	$(MAKE) -C ../lib deploy
 
 all: build_dirs alvra_h5_writer
 
-debug: CPPFLAGS += -DDEBUG_OUTPUT -g
+debug: CFLAGS += -DDEBUG_OUTPUT -g
 debug: alvra
 
+deploy: alvra
+	cp bin/* ${CONDA_PREFIX}/bin
+
 alvra_h5_writer: $(OBJS)
-	$(CPP) $(LDFLAGS) -o $(BIN_DIR)/alvra_h5_writer $(OBJS) $(LDLIBS)
+	$(CC) $(LDFLAGS) -o $(BIN_DIR)/alvra_h5_writer $(OBJS) $(LDFLAGS)
 
 $(OBJ_DIR)/%.o: $(SRC_DIR)/%.cpp
-	$(CPP) $(CPPFLAGS) $(LDLIBS) -c -o $@ $<
+	$(CC) $(CFLAGS) $(LDFLAGS) -c -o $@ $<
 
 build_dirs:
 	$(MKDIR) $(OBJ_DIR) $(BIN_DIR)
 
 clean:
-	rm -rf $(OBJ_DIR) $(BIN_DIR)
-	$(MAKE) -C ../../ clean
\ No newline at end of file
+	rm -rf $(OBJ_DIR) $(BIN_DIR)
\ No newline at end of file