From ecf7c7f4159386451d6e6b5701cdb12a45eeb019 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Thu, 3 Feb 2005 01:16:12 +0000 Subject: [PATCH] Fuck me riding a pony; whatever goddamned make that FreeBSD uses is sufficiently incompatible with GNU make that I'd rather just have two whole separate goddamned directories with their own Makefile than try to get everyone to agree on how to do things. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3328 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../util/signal/{unix => FreeBSD}/Makefile | 3 +-- .../com_threerings_util_signal_SignalManager.c | 0 .../{unix/i386-FreeBSD => FreeBSD}/libsignal.so | Bin 3 files changed, 1 insertion(+), 2 deletions(-) rename src/java/com/threerings/util/signal/{unix => FreeBSD}/Makefile (94%) rename src/java/com/threerings/util/signal/{unix => FreeBSD}/com_threerings_util_signal_SignalManager.c (100%) rename src/java/com/threerings/util/signal/{unix/i386-FreeBSD => FreeBSD}/libsignal.so (100%) diff --git a/src/java/com/threerings/util/signal/unix/Makefile b/src/java/com/threerings/util/signal/FreeBSD/Makefile similarity index 94% rename from src/java/com/threerings/util/signal/unix/Makefile rename to src/java/com/threerings/util/signal/FreeBSD/Makefile index e7c3747dd..835281f52 100644 --- a/src/java/com/threerings/util/signal/unix/Makefile +++ b/src/java/com/threerings/util/signal/FreeBSD/Makefile @@ -25,7 +25,7 @@ INSTALL_PATH=${ROOT}/dist/lib/${OSDIR} INCLUDES=-I.. -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OSINCDIR} LIBRARIES= -TARGET=${OSDIR}/libsignal.so +TARGET=libsignal.so # # Target definitions @@ -38,7 +38,6 @@ install: ${TARGET} ${TARGET}: com_threerings_util_signal_SignalManager.c @echo "Compiling SignalManager.c - @mkdir -p ${OSDIR} @${CC} ${INCLUDES} -c com_threerings_util_signal_SignalManager.c \ -o com_threerings_util_signal_SignalManager.o @echo Creating libsignal.so diff --git a/src/java/com/threerings/util/signal/unix/com_threerings_util_signal_SignalManager.c b/src/java/com/threerings/util/signal/FreeBSD/com_threerings_util_signal_SignalManager.c similarity index 100% rename from src/java/com/threerings/util/signal/unix/com_threerings_util_signal_SignalManager.c rename to src/java/com/threerings/util/signal/FreeBSD/com_threerings_util_signal_SignalManager.c diff --git a/src/java/com/threerings/util/signal/unix/i386-FreeBSD/libsignal.so b/src/java/com/threerings/util/signal/FreeBSD/libsignal.so similarity index 100% rename from src/java/com/threerings/util/signal/unix/i386-FreeBSD/libsignal.so rename to src/java/com/threerings/util/signal/FreeBSD/libsignal.so