changed to allow multiple installations at the same time. use install.sh to
authorChao Mei <chaomei2@illinois.edu>
Wed, 22 Feb 2012 00:29:13 +0000 (18:29 -0600)
committerChao Mei <chaomei2@illinois.edu>
Wed, 22 Feb 2012 00:29:13 +0000 (18:29 -0600)
install the library

Makefile.template [moved from Makefile with 81% similarity]
install.sh [new file with mode: 0755]

similarity index 81%
rename from Makefile
rename to Makefile.template
index fecbd371c35e6146fb228c04b157e19202523710..585505e43c108fb4c5d664646039a338797fc347 100644 (file)
--- a/Makefile
@@ -1,12 +1,11 @@
-OPTS=-I../ -O3 -g -lpthread
+OPTS=-I../ -O3 -g -lpthread 
 
-CHARMDIR=$(HOME)/curcvs/charm/net-linux-x86_64-smp-opt
+#CHARMDIR=$(HOME)/curcvs/charm/net-linux-x86_64-smp-opt
 CHARMC=$(CHARMDIR)/bin/charmc $(OPTS)
 CHARMLIB=$(CHARMDIR)/lib
 CHARMINC=$(CHARMDIR)/include
 
-all: module
-       make install
+all: install
 
 clean:
        rm -f *.decl.h *.def.h conv-host *.o hello charmrun *.log *.sum *.sts
@@ -30,6 +29,6 @@ NodeHelper.decl.h: NodeHelper.ci
 NodeHelper.o: NodeHelper.C NodeHelper.decl.h NodeHelper.h NodeHelperAPI.h
        $(CHARMC) -c NodeHelper.C
 
-install: $(CHARMLIB)/libmoduleNodeHelper.a
+install: module
        cp NodeHelperAPI.h NodeHelper.h NodeHelper.decl.h NodeHelper.def.h $(CHARMINC)/
 
diff --git a/install.sh b/install.sh
new file mode 100755 (executable)
index 0000000..67defa3
--- /dev/null
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+make clean -f Makefile.template
+make CHARMDIR="$HOME/curcvs/charm/net-linux-x86_64-smp-opt" -f Makefile.template
+
+make clean -f Makefile.template
+make CHARMDIR="$HOME/curcvs/charm/net-linux-x86_64-smp-dbg" -f Makefile.template