[Genabel-commits] r737 - branches/ProbABEL/autotools-integration

noreply at r-forge.r-project.org noreply at r-forge.r-project.org
Tue Jun 21 01:20:11 CEST 2011


Author: lckarssen
Date: 2011-06-21 01:20:11 +0200 (Tue, 21 Jun 2011)
New Revision: 737

Added:
   branches/ProbABEL/autotools-integration/Makefile
   branches/ProbABEL/autotools-integration/bin/
   branches/ProbABEL/autotools-integration/doc/
   branches/ProbABEL/autotools-integration/examples/
   branches/ProbABEL/autotools-integration/src/
Removed:
   branches/ProbABEL/autotools-integration/ProbABEL/
Log:
Minor change to the layout of the autotools-integration branch of ProbABEL. Moved the files/dirs one level up after my previous copy (branch creation). This removes a superfluous directory.

Copied: branches/ProbABEL/autotools-integration/Makefile (from rev 736, branches/ProbABEL/autotools-integration/ProbABEL/Makefile)
===================================================================
--- branches/ProbABEL/autotools-integration/Makefile	                        (rev 0)
+++ branches/ProbABEL/autotools-integration/Makefile	2011-06-20 23:20:11 UTC (rev 737)
@@ -0,0 +1,51 @@
+VERSION = 0.1-9e
+SRCDIR = src
+BINDIR = bin
+DOCDIR = doc
+LINREG = $(BINDIR)/palinear
+LOGREG = $(BINDIR)/palogist
+COXREG = $(BINDIR)/pacoxph
+EXECUTABLES = $(LOGREG) $(LINREG) $(COXREG)
+
+REGFILES =  $(SRCDIR)/data.h $(SRCDIR)/mematrix.h $(SRCDIR)/reg1.h $(SRCDIR)/usage.h $(SRCDIR)/main.cpp
+COXBASE = $(SRCDIR)/chinv2 $(SRCDIR)/cholesky2 $(SRCDIR)/chsolve2 $(SRCDIR)/dmatrix $(SRCDIR)/coxfit2
+COXSRC = $(COXBASE:=.c)
+COXOBJ = $(COXBASE:=.o)
+
+CPP = g++
+CFLAGS = -I $(SRCDIR)/include -O2
+
+all: $(EXECUTABLES) doc
+	cp $(SRCDIR)/extIDS.pl $(BINDIR)/.
+	cp $(SRCDIR)/prepare_data.R $(BINDIR)/.
+	cp $(SRCDIR)/probabel.pl $(BINDIR)/probabel.pl_example
+	cp $(SRCDIR)/probabel_config.cfg $(BINDIR)/probabel_config.cfg_example
+
+$(LINREG): $(REGFILES)
+	$(CPP) $(CFLAGS) -DLINEAR $(SRCDIR)/main.cpp $(SRCDIR)/fvlib/*.cpp -o $(LINREG)
+
+$(LOGREG): $(REGFILES)
+	$(CPP) $(CFLAGS) -DLOGISTIC $(SRCDIR)/main.cpp $(SRCDIR)/fvlib/*.cpp -o $(LOGREG)
+
+$(COXREG): $(COXSRC) $(REGFILES)
+	$(CPP) $(CFLAGS) -DCOXPH $(COXSRC) $(SRCDIR)/main.cpp $(SRCDIR)/fvlib/*.cpp -o $(COXREG)
+
+doc:
+	$(MAKE) -C $(DOCDIR)/
+
+clean: clean_doc
+	rm -f $(BINDIR)/* $(SRCDIR)/*~ $(SRCDIR)/*.o *.zip *.tar.gz examples/*.out.txt examples/*out
+	$(MAKE) clean -C $(DOCDIR)/
+
+clean_doc:
+	$(MAKE) clean_doc -C $(DOCDIR)/
+
+linux_distrib: clean
+	cd .. ; tar -czvf ProbABEL_$(VERSION).tar.gz ProbABEL
+
+win_distrib: all
+	cd .. ; zip -r9 ProbABEL_$(VERSION)_win.zip ProbABEL
+
+distrib: linux_distrib clean win_distrib clean
+
+.PHONY:	distrib linux_distrib win_distrib clean clean_doc doc



More information about the Genabel-commits mailing list