accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1398440 - in /accumulo/trunk: ./ core/ fate/src/main/java/org/apache/accumulo/fate/ZooStore.java fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java server/ server/src/main/c++/Makefile src/
Date Mon, 15 Oct 2012 18:39:35 GMT
Author: ecn
Date: Mon Oct 15 18:39:35 2012
New Revision: 1398440

URL: http://svn.apache.org/viewvc?rev=1398440&view=rev
Log:
ACCUMULO-160 add clean to top-level Makefile

Modified:
    accumulo/trunk/   (props changed)
    accumulo/trunk/core/   (props changed)
    accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java   (props changed)
    accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java 
 (props changed)
    accumulo/trunk/server/   (props changed)
    accumulo/trunk/server/src/main/c++/Makefile
    accumulo/trunk/src/   (props changed)

Propchange: accumulo/trunk/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src:r1398438
  Merged /accumulo/branches/1.4:r1398438

Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/core:r1398438
  Merged /accumulo/branches/1.4/src/core:r1398438

Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1398438
  Merged /accumulo/branches/1.4/src/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1398438

Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1398438
  Merged /accumulo/branches/1.4/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1398438

Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/server:r1398438
  Merged /accumulo/branches/1.4/src/server:r1398438

Modified: accumulo/trunk/server/src/main/c++/Makefile
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/c%2B%2B/Makefile?rev=1398440&r1=1398439&r2=1398440&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/c++/Makefile (original)
+++ accumulo/trunk/server/src/main/c++/Makefile Mon Oct 15 18:39:35 2012
@@ -17,7 +17,11 @@
 all: nm ml
 
 nm: 
-	cd nativeMap ; make
+	cd nativeMap ; $(MAKE)
 
 ml:
-	cd mlock ; make
+	cd mlock ; $(MAKE)
+
+clean:
+	cd nativeMap ; $(MAKE) $@
+	cd mlock ; $(MAKE) $@

Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src:r1398438
  Merged /accumulo/branches/1.4/src/src:r1398438



Mime
View raw message