about summary refs log tree commit diff
path: root/Makefile
diff options
context:
space:
mode:
authorJoshua Randall2014-10-30 22:44:45 +0000
committerJoshua Randall2014-10-30 22:44:45 +0000
commit770a817bcf954f9550fef4d6871db4c81564da7a (patch)
tree1d233498e1ca2fc64cd74898bfb9b9f04dcd18ae /Makefile
parent9a5eeda5bd2017ac5cc03893b4955cc993307f05 (diff)
parent587e0a464328110766c2e26ad2093f44c9dffa80 (diff)
downloadpangemma-770a817bcf954f9550fef4d6871db4c81564da7a.tar.gz
Merge branch 'master' into fix-make-clean-bins
Conflicts:
	Makefile
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile15
1 files changed, 14 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 5ae13ed..e3e4a8e 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
@@ -32,7 +33,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
 
@@ -106,6 +111,14 @@ $(OBJS) : $(HDR)
 
 clean:
 	rm -rf ${SRC_DIR}/*.o ${SRC_DIR}/*~ *~ ${SRC_DIR}/*_float.* $(OUTPUT)
+
+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)