From 60b90f95148f971cae7d65e5f6642bc8e9d29d6f Mon Sep 17 00:00:00 2001
From: Joshua C. Randall
Date: Thu, 30 Oct 2014 16:40:20 +0000
Subject: makes dist tar file not explode into ./

---
 Makefile | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 987e2e6..b26e4ca 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,7 @@ WITH_LAPACK = 1
 FORCE_32BIT = 
 FORCE_DYNAMIC = 
 FORCE_FLOAT = 
+DIST_NAME = gemma-0.95alpha
 
 # --------------------------------------------------------------------
 # Edit below this line with caution
@@ -106,6 +107,14 @@ $(OBJS) : $(HDR)
 
 clean:
 	rm -rf ${SRC_DIR}/*.o ${SRC_DIR}/*~ *~ ${SRC_DIR}/*_float.*
+
+DIST_COMMON = COPYING.txt README.txt Makefile
+DIST_SUBDIRS = src doc example bin
+
 tar:
-	tar cvzf gemma-0.93.tar.gz COPYING.txt  README.txt  Makefile  src  doc  example  bin
+	mkdir -p ./$(DIST_NAME)
+	cp $(DIST_COMMON) ./$(DIST_NAME)/
+	cp -r $(DIST_SUBDIRS) ./$(DIST_NAME)/
+	tar cvzf $(DIST_NAME).tar.gz ./$(DIST_NAME)/
+	rm -r ./$(DIST_NAME)
 
-- 
cgit 1.4.1


From a58ae0718095fb47e6071211c23a8bf8408ec6f6 Mon Sep 17 00:00:00 2001
From: Joshua Randall
Date: Thu, 30 Oct 2014 18:19:55 +0000
Subject: Fixes dynamic compilation

Fixes dynamic compilation on systems where -lblas is required
for symbols such as `dgemm_`
---
 Makefile | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 987e2e6..1caabe9 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,11 @@ CPP = g++
 
 CPPFLAGS = -Wall -O3
 
+ifdef FORCE_DYNAMIC
+LIBS = -lgsl -lgslcblas -lblas -pthread -lz
+else
 LIBS = -lgsl -lgslcblas -pthread -lz
+endif
 
 OUTPUT = $(BIN_DIR)/gemma
 
-- 
cgit 1.4.1