From 84021c3541c026a6fa0f8d7fb7b897b2d300f563 Mon Sep 17 00:00:00 2001
From: Andrej Babic <andrej.babic@psi.ch>
Date: Thu, 12 Jul 2018 14:24:29 +0200
Subject: [PATCH] Simplify Makefiles

---
 lib/Makefile        |  4 ++--
 sf_alvra/Makefile   | 12 ++++--------
 sf_bernina/Makefile | 12 ++++--------
 3 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/lib/Makefile b/lib/Makefile
index 5ecd8ba..ff63191 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -25,10 +25,10 @@ libcpp_h5_writer: build_dirs $(OBJS)
 	$(CPP) $(LDFLAGS) -o $(BIN_DIR)/libcpp_h5_writer.so $(OBJS) $(LDLIBS)
 
 debug: CPPFLAGS += -DDEBUG_OUTPUT
-debug: lib
+debug: libcpp_h5_writer
 
 perf: CPPFLAGS += -DPERF_OUTPUT
-perf: lib
+perf: libcpp_h5_writer
 
 deploy: libcpp_h5_writer
 	cp bin/* ${CONDA_PREFIX}/lib
diff --git a/sf_alvra/Makefile b/sf_alvra/Makefile
index c938113..c760b29 100644
--- a/sf_alvra/Makefile
+++ b/sf_alvra/Makefile
@@ -11,22 +11,18 @@ HEADERS = $(wildcard $(SRC_DIR)/*.hpp)
 SRCS = $(wildcard $(SRC_DIR)/*.cpp)
 OBJS = $(patsubst $(SRC_DIR)/%.cpp, $(OBJ_DIR)/%.o, $(SRCS))
 
-alvra: lib all
+alvra_h5_writer: lib build_dirs $(OBJS)
+	$(CC) $(LDFLAGS) -o $(BIN_DIR)/alvra_h5_writer $(OBJS) $(LDFLAGS)
 
 lib:
 	$(MAKE) -C ../lib deploy
 
-all: build_dirs alvra_h5_writer
-
 debug: CFLAGS += -DDEBUG_OUTPUT -g
-debug: alvra
+debug: alvra_h5_writer
 
-deploy: alvra
+deploy: alvra_h5_writer
 	cp bin/* ${CONDA_PREFIX}/bin
 
-alvra_h5_writer: $(OBJS)
-	$(CC) $(LDFLAGS) -o $(BIN_DIR)/alvra_h5_writer $(OBJS) $(LDFLAGS)
-
 $(OBJ_DIR)/%.o: $(SRC_DIR)/%.cpp
 	$(CC) $(CFLAGS) $(LDFLAGS) -c -o $@ $<
 
diff --git a/sf_bernina/Makefile b/sf_bernina/Makefile
index b054fd6..8b8de07 100644
--- a/sf_bernina/Makefile
+++ b/sf_bernina/Makefile
@@ -11,22 +11,18 @@ HEADERS = $(wildcard $(SRC_DIR)/*.hpp)
 SRCS = $(wildcard $(SRC_DIR)/*.cpp)
 OBJS = $(patsubst $(SRC_DIR)/%.cpp, $(OBJ_DIR)/%.o, $(SRCS))
 
-bernina: lib all
+bernina_h5_writer: lib build_dirs $(OBJS)
+	$(CC) $(LDFLAGS) -o $(BIN_DIR)/bernina_h5_writer $(OBJS) $(LDFLAGS)
 
 lib:
 	$(MAKE) -C ../lib deploy
 
-all: build_dirs bernina_h5_writer
-
 debug: CFLAGS += -DDEBUG_OUTPUT -g
-debug: bernina
+debug: bernina_h5_writer
 
-deploy: bernina
+deploy: bernina_h5_writer
 	cp bin/* ${CONDA_PREFIX}/bin
 
-bernina_h5_writer: $(OBJS)
-	$(CC) $(LDFLAGS) -o $(BIN_DIR)/bernina_h5_writer $(OBJS) $(LDFLAGS)
-
 $(OBJ_DIR)/%.o: $(SRC_DIR)/%.cpp
 	$(CC) $(CFLAGS) $(LDFLAGS) -c -o $@ $<