diff --git a/.monadid b/.monadid index daf65493e6d056e375d86ca1e08964ab061884bd..86c4e2280f6a6fb433a9528825d020d3ee30fc42 100644 --- a/.monadid +++ b/.monadid @@ -1,4 +1,4 @@ monad identification file This file is used for monad directory identification Built by toole1 on linux4.ews.illinois.edu -Build Date: Sun Oct 9 19:46:25 CDT 2011 +Build Date: Mon Oct 10 23:58:14 CDT 2011 diff --git a/Makefile b/Makefile index 4012d3d957f7f22f96eaefc9c0e0c344d8e72f54..c5ac799d508a06ca2001ae31363493ed793b4513 100644 --- a/Makefile +++ b/Makefile @@ -14,6 +14,13 @@ $(warning Invalid value specified for OPTIMIZE. Should be on or off) CFLAGS += -g -O0 endif +IS_LIBRT:=$(shell locate -l 1 -c librt.so) +ifeq ($(IS_LIBRT),0) +LIBRT= +else +LIBRT=-lrt +endif + all: $(EXENAME) $(IDFILE) $(IDFILE): $(OBJS) @@ -23,7 +30,7 @@ $(IDFILE): $(OBJS) 'Build Date:' `date`> $(IDFILE) $(EXENAME): $(OBJS) $(IDFILE) - $(CC) $(CFLAGS) $(OBJS) -o $@ + $(CC) $(CFLAGS) $(LIBRT) $(OBJS) -o $@ help.cpp: $(wildcard *.h) README.cg LICENSE.cg diff --git a/Makefile.proxy b/Makefile.proxy index b5abb3ede47a15f75bc67f4e5fe9836e2e8b1003..c3d281ee3ae421c8b72efd3d5ac10f90c6e4b213 100644 --- a/Makefile.proxy +++ b/Makefile.proxy @@ -19,8 +19,15 @@ ALL_TARGET = all all: $(TESTEXE) endif +IS_LIBRT:=$(shell locate -l 1 -c librt.so) +ifeq ($(IS_LIBRT),0) +LIBRT= +else +LIBRT=-lrt +endif + $(TESTEXE): $(TESTOBJS) - $(CC) $(TESTOBJS) -lrt -o $@ + $(CC) $(LIBRT) $(TESTOBJS) -o $@ %.o : %.cpp $(wildcard *.h) $(CC) $(CFLAGS) -c $(@:.o=.cpp) -o $@ diff --git a/monad b/monad index ecf62bcacebeabc9ac6aeedbdf6b1fb8f6dd2f03..3977504d4c2559942bcada38cf547f0627a53d5d 100755 Binary files a/monad and b/monad differ diff --git a/proxy.cpp b/proxy.cpp index 57b696d5d6f3935a18a515a3a8bddeae21f89514..a9dcaa2e358d1b4d5d1499ab62e18e515469616b 100644 --- a/proxy.cpp +++ b/proxy.cpp @@ -32,7 +32,7 @@ using namespace monad_shared; namespace opts { - bool verbose = true; + bool verbose = false; bool redirect_test_output = true; }