From 786f6f8a63c40f53555338883478e6e5576909e3 Mon Sep 17 00:00:00 2001
From: Walter Korman <shaper@threerings.net>
Date: Sun, 12 Jan 2003 02:04:19 +0000
Subject: [PATCH] Build the native linux keyboard library as part of the normal
 compilation task and place it in dist/lib/i686-Linux.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@2111 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 build.xml                                     |  4 ++-
 .../threerings/util/keybd/i686-Linux/Makefile | 27 ++++++++++++++++---
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/build.xml b/build.xml
index 756ee2839..76ebbfb82 100644
--- a/build.xml
+++ b/build.xml
@@ -89,12 +89,14 @@
     <delete dir="${deploy.dir}"/>
   </target>
 
-  <!-- build the java class files -->
+  <!-- build the java class files and native libraries -->
   <target name="compile" depends="prepare">
     <javac srcdir="src/java" destdir="${classes.dir}"
            debug="on" optimize="{$build.optimize}" deprecation="on">
       <classpath refid="classpath"/>
     </javac>
+    <exec dir="src/java/com/threerings/util/keybd/i686-Linux" 
+     executable="make"/>
   </target>
 
   <!-- build the javadoc documentation -->
diff --git a/src/java/com/threerings/util/keybd/i686-Linux/Makefile b/src/java/com/threerings/util/keybd/i686-Linux/Makefile
index f1f6276a8..32fcb0945 100644
--- a/src/java/com/threerings/util/keybd/i686-Linux/Makefile
+++ b/src/java/com/threerings/util/keybd/i686-Linux/Makefile
@@ -1,22 +1,41 @@
 #
-# $Id: Makefile,v 1.1 2003/01/12 00:26:39 shaper Exp $
+# $Id: Makefile,v 1.2 2003/01/12 02:04:19 shaper Exp $
+
+#
+# Executable definitions
 
 CC=gcc
 RM=rm
+CP=cp
+MKDIR=mkdir
+
+#
+# Directory definitions
+
+ROOT=../../../../../../..
+LIBRARIES_PATH=-L/usr/X11R6/lib
+INSTALL_PATH=${ROOT}/dist/lib/i686-Linux
+
+#
+# Parameter and file definitions
 
 INCLUDES=-I.. -I/usr/local/jdk1.4/include -I/usr/local/jdk1.4/include/linux
-LIBRARIES_PATH=-L/usr/X11R6/lib
 LIBRARIES=-lX11
 TARGET=libkeybd.so
+INSTALL_TARGET=${INSTALL_PATH}/${TARGET}
+
+#
+# Target definitions
 
 all: ${TARGET}
 
 ${TARGET}: com_threerings_util_keybd_Keyboard.c
 	${CC} ${INCLUDES} -c com_threerings_util_keybd_Keyboard.c \
 	    -o com_threerings_util_keybd_Keyboard.o
-	${CC} -o ${TARGET} com_threerings_util_keybd_Keyboard.o \
+	${MKDIR} -p ${INSTALL_PATH}
+	${CC} -o ${INSTALL_TARGET} com_threerings_util_keybd_Keyboard.o \
 	    ${LIBRARIES} ${LIBRARIES_PATH} -shared
 
 clean:
 	-${RM} *.o
-	-${RM} ${TARGET}
+	-${RM} ${INSTALL_TARGET}