Merge branch 'charm' of charmgit:charm into charm
authorYanhua Yanhua <sun51@illinois.edu>
Wed, 28 Jul 2010 17:09:54 +0000 (12:09 -0500)
committerYanhua Yanhua <sun51@illinois.edu>
Wed, 28 Jul 2010 17:09:54 +0000 (12:09 -0500)
1  2 
src/conv-ldb/cldb.neighbor.c
src/scripts/Makefile

Simple merge
index 94cb917232a0ca2f702825aff20188d189ea657f,86ec3acc29d9c1903a0187c84e4b6f01c94ef043..7cbf3250eeb9680f8907c71951e82ea7179c8ee7
@@@ -327,9 -327,9 +327,9 @@@ dirs+sources
  # Converse Libraries
  # 
  ###############################################################################
 -CLBLIBS=$(L)/libldb-rand.o $(L)/libldb-spray.o $(L)/libldb-neighbor.o $(L)/libldb-none.o $(L)/libldb-test.o $(L)/libldb-bluegene.o
 +CLBLIBS=$(L)/libldb-rand.o $(L)/libldb-spray.o $(L)/libldb-prioritycentralized.o     $(L)/libldb-neighbor.o $(L)/libldb-none.o $(L)/libldb-test.o $(L)/libldb-bluegene.o
  TRACELIBS=$(L)/libtrace-projections.a  $(L)/libtrace-summary.a   $(L)/libtrace-utilization.a \
-         $(L)/libtrace-simple.a $(L)/libtrace-controlPoints.a\
+         $(L)/libtrace-simple.a \
            $(L)/libtrace-counter.a $(L)/libtrace-bluegene.a \
          $(L)/libtrace-projector.a $(L)/libtrace-all.a $(L)/libtrace-converse.a \
            $(L)/libtracef_f.a $(L)/libtrace-memory.a