From 93e28d42a60f38a1e19bf0de34faed2ad7009ef0 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Sat, 10 Nov 2007 19:43:07 +0000
Subject: [PATCH] Let's just install rather than build and install here as
 well.

git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@337 ed5b42cb-e716-0410-a449-f6a68f950b19
---
 build.xml                                             | 7 +++----
 src/java/com/threerings/util/unsafe/FreeBSD/Makefile  | 2 +-
 src/java/com/threerings/util/unsafe/Linux/Makefile    | 2 +-
 src/java/com/threerings/util/unsafe/Mac OS X/Makefile | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/build.xml b/build.xml
index b2196b3f..58b963f3 100644
--- a/build.xml
+++ b/build.xml
@@ -80,7 +80,7 @@
   </target>
 
   <!-- build the native libraries -->
-  <target name="ncompile" depends="prepare">
+  <target name="ninstall" depends="prepare">
     <echo level="info" message="Doing native compilation on ${os.name}..."/>
     <exec os="Linux" dir="src/java/com/threerings/util/keybd/Linux" 
      executable="make"><arg line="install"/></exec>
@@ -122,11 +122,10 @@
   </target>
 
   <!-- a target for rebuilding everything -->
-  <target name="all"
-          depends="clean,prepare,compile,ncompile,javadoc,tests,dist"/>
+  <target name="all" depends="clean,prepare,compile,ninstall,javadoc,tests,dist"/>
 
   <!-- builds our distribution files (war and jar) -->
-  <target name="dist" depends="prepare,compile,ncompile,tests">
+  <target name="dist" depends="prepare,compile,ninstall,tests">
     <!-- build our various jar files -->
     <jar destfile="${deploy.dir}/${app.name}-rsrc.jar">
       <fileset dir="${classes.dir}" includes="com/threerings/resource/**"/>
diff --git a/src/java/com/threerings/util/unsafe/FreeBSD/Makefile b/src/java/com/threerings/util/unsafe/FreeBSD/Makefile
index 39a78063..d45b291b 100644
--- a/src/java/com/threerings/util/unsafe/FreeBSD/Makefile
+++ b/src/java/com/threerings/util/unsafe/FreeBSD/Makefile
@@ -29,7 +29,7 @@ TARGET=libunsafe.so
 
 all: ${TARGET}
 
-install: ${TARGET}
+install:
 	@${MKDIR} -p ${INSTALL_PATH}
 	cp ${TARGET} ${INSTALL_PATH}
 
diff --git a/src/java/com/threerings/util/unsafe/Linux/Makefile b/src/java/com/threerings/util/unsafe/Linux/Makefile
index c692c906..7d593545 100644
--- a/src/java/com/threerings/util/unsafe/Linux/Makefile
+++ b/src/java/com/threerings/util/unsafe/Linux/Makefile
@@ -28,7 +28,7 @@ TARGET=libunsafe.so
 
 all: ${TARGET}
 
-install: ${TARGET}
+install:
 	@${MKDIR} -p ${INSTALL_PATH}
 	cp ${TARGET} ${INSTALL_PATH}
 
diff --git a/src/java/com/threerings/util/unsafe/Mac OS X/Makefile b/src/java/com/threerings/util/unsafe/Mac OS X/Makefile
index b454860b..cc38f7af 100644
--- a/src/java/com/threerings/util/unsafe/Mac OS X/Makefile	
+++ b/src/java/com/threerings/util/unsafe/Mac OS X/Makefile	
@@ -29,7 +29,7 @@ TARGET=libunsafe.jnilib
 
 all: ${TARGET}
 
-install: ${TARGET}
+install:
 	@${MKDIR} -p ${INSTALL_PATH}
 	cp ${TARGET} ${INSTALL_PATH}