svn commit: r1210610 - in /incubator/accumulo/trunk/src/server/src/main/c++/mlock: Makefile accumulo_server_tabletserver_MLock.cc org_apache_accumulo_server_tabletserver_MLock.cc

[vi...@apache.org]

Author: vines
Date: Mon Dec  5 20:24:54 2011
New Revision: 1210610

URL: http://svn.apache.org/viewvc?rev=1210610&view=rev
Log:
Accumulo-207 - merging to trunk


Added:
    incubator/accumulo/trunk/src/server/src/main/c++/mlock/org_apache_accumulo_server_tabletserver_MLock.cc
      - copied unchanged from r1210596, incubator/accumulo/branches/1.3/src/server/src/main/c++/mlock/org_apache_accumulo_server_tabletserver_MLock.cc
Removed:
    incubator/accumulo/trunk/src/server/src/main/c++/mlock/accumulo_server_tabletserver_MLock.cc
Modified:
    incubator/accumulo/trunk/src/server/src/main/c++/mlock/Makefile

Modified: incubator/accumulo/trunk/src/server/src/main/c++/mlock/Makefile
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/c%2B%2B/mlock/Makefile?rev=1210610&r1=1210609&r2=1210610&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/c++/mlock/Makefile (original)
+++ incubator/accumulo/trunk/src/server/src/main/c++/mlock/Makefile Mon Dec  5 20:24:54 2011
@@ -15,7 +15,7 @@
 
 LIB=MLock
 SRCS=$(filter-out test.cc,$(wildcard *.cc))
-HDRS=$(wildcard *.h) accumulo_server_tabletserver_$(LIB).h
+HDRS=$(wildcard *.h) org_apache_accumulo_server_tabletserver_$(LIB).h
 CXX=g++
 
 ifeq ($(shell uname),Linux)
@@ -36,7 +36,7 @@ all : $(INSTALLED_LIBS)
 clean:
 	rm -f $(INSTALLED_LIBS) $(LIBS)
 
-accumulo_server_tabletserver_$(LIB).h : ../../java/org/apache/accumulo/server/tabletserver/$(LIB).java
+org_apache_accumulo_server_tabletserver_$(LIB).h : ../../java/org/apache/accumulo/server/tabletserver/$(LIB).java
 	javah -classpath ../../../../../../lib/accumulo-server-1.5.0-incubating-SNAPSHOT.jar org.apache.accumulo.server.tabletserver.$(LIB)
 
 $(INSTALLED_LIBS) : $(INSTALL_DIR) $(LIBS)