HADOOP-4949. Fix native compilation. (Chris Douglas via rangadi)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/trunk@730794 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -525,6 +525,8 @@ Release 0.20.0 - Unreleased
     HADOOP-4956. Creates TaskStatus for failed tasks with an empty Counters 
     object instead of null. (ddas)
 
+    HADOOP-4949. Fix native compilation. (Chris Douglas via rangadi)
+
 Release 0.19.1 - Unreleased
 
   IMPROVEMENTS

build.xml

@@ -455,7 +455,6 @@
   	
     <mkdir dir="${build.native}/lib"/>
     <mkdir dir="${build.native}/src/org/apache/hadoop/io/compress/zlib"/>
-    <mkdir dir="${build.native}/src/org/apache/hadoop/io/compress/lzo"/>
 
   	<javah
   	  classpath="${build.classes}"
@@ -467,16 +466,6 @@
       <class name="org.apache.hadoop.io.compress.zlib.ZlibDecompressor" />
   	</javah>
 
-  	<javah
-  	  classpath="${build.classes}"
-  	  destdir="${build.native}/src/org/apache/hadoop/io/compress/lzo"
-      force="yes"
-  	  verbose="yes"
-  	  >
-  	  <class name="org.apache.hadoop.io.compress.lzo.LzoCompressor" />
-      <class name="org.apache.hadoop.io.compress.lzo.LzoDecompressor" />
-  	</javah>
-
 	<exec dir="${build.native}" executable="sh" failonerror="true">
 	  <env key="OS_NAME" value="${os.name}"/>
 	  <env key="OS_ARCH" value="${os.arch}"/>

src/native/Makefile.am

@@ -36,7 +36,7 @@
 export PLATFORM = $(shell echo $$OS_NAME | tr [A-Z] [a-z])
 
 # List the sub-directories here
-SUBDIRS = src/org/apache/hadoop/io/compress/zlib
+SUBDIRS = src/org/apache/hadoop/io/compress/zlib lib 
 
 # The following export is needed to build libhadoop.so in the 'lib' directory
 export SUBDIRS