From f26c58ef4de3b5363b5b74926fdb567e8dc34e8f Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Thu, 3 Feb 2005 01:02:58 +0000
Subject: [PATCH] Revamped things to work in multiple flavors of Joonix.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3327 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 .../util/signal/i686-Linux/libsignal.so          | Bin 9706 -> 0 bytes
 .../util/signal/{i686-Linux => unix}/Makefile    |  15 ++++++++++-----
 .../com_threerings_util_signal_SignalManager.c   |   2 +-
 .../util/signal/unix/i386-FreeBSD/libsignal.so   | Bin 0 -> 6700 bytes
 4 files changed, 11 insertions(+), 6 deletions(-)
 delete mode 100755 src/java/com/threerings/util/signal/i686-Linux/libsignal.so
 rename src/java/com/threerings/util/signal/{i686-Linux => unix}/Makefile (69%)
 rename src/java/com/threerings/util/signal/{i686-Linux => unix}/com_threerings_util_signal_SignalManager.c (96%)
 create mode 100755 src/java/com/threerings/util/signal/unix/i386-FreeBSD/libsignal.so

diff --git a/src/java/com/threerings/util/signal/i686-Linux/libsignal.so b/src/java/com/threerings/util/signal/i686-Linux/libsignal.so
deleted file mode 100755
index 0f6360de948b1c951c26c8ff577e734825513266..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9706
zcmeHNYiwM_6`p-0EG7xI2_+>V+ysX@V6Wr66kHxooK2d@Av6wY3Jo{w-Rt!>>s@#6
zT@zCf35zAn$}|FjRJE0$5lF3q3IbJqAe7co)3g$b0#Z?_L|T#7X<Ta5sN!Mje&0OS
z*PBp6DWN|&*4cB;oHJ+MbMDOe-dOv(Kp-FtghWV4=|UlvBk|DZlxDfGL|D{|E5zkW
zZ!&=1KU3i}rd1222PIF8z~Ro25Yx3j2s#7l27e8iNPQUi<r7{K<P0$SMbI>9Z3F1M
zGb{yaDMS=lr*)R5S7}OerRM8F7izvyQ<C|>t9`OzzX0YMEnK1LwMO|V(z)kYHv5mT
z7`Q-kAN=#YR_R$GW^nKTA)%OY4w#fNz<`J3AXBdtqh(pn4l(ZnX$HMgd^cibr8rQQ
z6?3R8V?q)%35hBx?wcVA{9PoOgJoGWoP&Unz$67k%JM8Ja}E+h;$lf(Da(raLs_no
z`ZvmQt&~T~@+DHXlo|ZZma_Q?iAxPDX-MdWrBg%VvI_m23i<PLU77mUh_@#0&=z-t
zvNp$n&!Ag2O1Vn>29&@#PyH@n1N8Sxxk@BK39kXE{}~0q(?H5Upa8fINSSNSj8CnI
zh+E`FA;e0p9|k3G<k=0oppWSOs78HPAkB<dEynAMkO_|fx&D$B_Nb~b{mb^=3H?sh
z&Dd7nny7{RE{s@@TFi%yus2|VxfSUI(?6D!)Q{xtwO_q?^`;GN!d~CLdClr}d-J+=
z9kH$U*41m;W45sER8KBzyIwr+*$~s&v?uH?5U3Kn<7DHR^j(gyH}=_EoK)KNoP1j*
z?z)aE?#!n>N4V(}Y{bTRU))aQdTg&d?>PB%Hs#s{FP*WK-tLfQo8sAc%E{aDgqQA%
zd(M~Q*<{AaqckU<&*tn*E)n<AxvX%#JW_IbFi9|?s~0Z4u8&wu(y1)yqg6ARc6;Mq
zqFYto6}{<RN93J&Qe@JdiKv^4t`xSDjC*mkpwo3#Pa-Ls6zkhJtZB2CMw_F{%KQ@F
z_?$Z%z)oZ^sClLYum<_dKOuK3THOXgFInMUnZ|As5_jvg>U0{LL{L1S=S>yn7Pp_v
zHEq$fUDIuvepAzjHT}M(PigvsrbjgWlcr;uUWl!W<<w}}p{c9svzor7=|41`hAmER
zk7y8SSkqeg4I&s^O^P5F)AUtM?;u?u#0~I6`W;QXnQjTOo-*i@n(je*piYSGkV${6
z>C2i{p&m?sfcX&+cQPO7i<-WsX)WxSzML{Pr6E!T+;P-<I)f_qis=n#2PuO0X{29(
z^tVZoe(T_g;%H=K11v{Q^XFS3A&v}-iRZZEOzf9^AvqKzx`E>4@d?0wI1t@bpF9eY
z3Ip)jF+$<?y~D2~1l>|9@^fO~pckAtTG}ywWO&~cpnY*PJi@rRclZEu?D_dB<}b9B
z9^sZhaIA0xe4v<8^}sRj>QghP<S!l!4@&LCu}Q1K$zK)eB(VMV9mA#K9Aq90*NrR(
zJ@wqs^YR;H=mqwW?t{S{<0DHU?H#@bH7FIwVTmeNl}d~n14jxGRDE!C$MC)(siU`l
z{tMnlO7rT5Wk1e2ytXdFejAEK2G`bwpJ+v|(~iEN3!lc?I2^8Hn3rism=A5AUD{D?
z^rcv}$ub!J-cEQxO7Z#uaubD{WWG|_D~g%H94MF$7^<Iu_p%<k!(o}1si$UX8KH-D
zDIS`Q-jQ{WOqL?N6%a})8`}ZNR7vMYT?krYAOpzO6i4ezu}F!{nei9Y1~f7XT8hn3
zt|D+%y6+J7gNdVqvC*N}+s606!T!cGn<v}FFO4bfI{7*ZEFo{~bSXBzpB>GTROgSW
zl1>}PgRzm~JtLz3nh)^4u+saf=V)KJj9uD#hVrrEJ!4|`CHTGR-kGJ?7zc-4P*?!L
zj6|w3+sUtC63DJmRv5NX8dr48a!ihiqbHkSY}N_JXIsa}WA9H)>>YjxEgUM2K|9nt
zUTPgLzCGd1ty~XphOy43Lsd9^`yFz8%j<D7@^2Y=5ED`^L=M{-5Mvm$T*vbeQ!N!u
zt!@=Jt@=gD#Vyt%w@TD+SiDWg;w?_XN%uKP<!W6#opF+um$MRxT%KcGFqWyTD!N%r
zuo&E|E}2Cs#TnYX;}!B*xV+2B=d8|t&vBzw!W3$C=28XM6vFyJ`5AoH1D{$CAT%Cl
zcm!aZlix>-p8U?ot{}hHxlu9R@dU^79#3vO2Xf{<j7$jQ@|z0LSbncFWY8tUAva&1
zY<SKi&+{MmpFPOOPk9Dqa}q*;%JIC24I{_8VCTs3Jozr@)YB1^{{fI+#&|<%YR*mM
ze~&`{%7V`Y*0;5_SoP~~zICy+EV?YZ!m3~Ebf)83tGPwWjm?Yk#q?oDOV6(n>!hFo
zgyVs)D*4Ov7sr9)%W>m*dZE;)pE{7BcptyY{wdgV+<yUk<wx1QBkjnCIaH#lJJ;hh
zrE*@brzt5rs42x$KvSa6ZR#wfGs!4VFBz4J5C3J+rO~9@+}OM-iY?MxrWB23h04^3
zgO1abUbbpwqw?k!ni6?09qssJOO$n2m1#=21%dImR(Du9udEP(J*x4X;^Dxt^WOOE
zr`z~Iji{a;ip-5Hid@2(Q7ONKw4fNECh*>@D*Vdp#lZQSAwuXWB4_5bAm@B&X<&ZC
z{IASU25}w?h-pDCfY3rDwgjiC6fT9(McQnBvZ0}|WxljN@c+>wj=OFVS7oR+pzDX$
zaCwF<45<2wsN3J;#XCX0yrSKP>yEqKBAV>a!bDLoFQTbzA=>BUUEVGD1sl4&lcBw0
zdNZDg%6ky3+TGygZAdhqlc)Ts`gOYPu6(@5k^bX7>4b<Tyj<RetjO0BEHj7fxD|jh
z*VE%<Az|Yvr0jS;o=xEbMT_ZdSI+S9&d$8kXQWIz>tJZk8F)X+8Owc)@r<|~J!<wf
z?s&unK<<r9XPhIB0U6(TuS^>*er~c%qaEWSk@3)gVVjY_m_|FsGa~QqC=*DDHv$<0
z$ukZTmw;y(^u=-sn}C?BG7sY^k@3{{qaEgh*ygii{3Wv9v}1l_XM?AI6er^Xmxe#y
znsRUR+3{YM$od(e9g%}#{K<k)*giHw1M5K81vGYCqePC80aNZbkU%@un}<f?A!7t;
zX}%wncCsiI0z?(dVEo;S6yuNg!9=5@vEc{7vrp*H|5jm|LOc3@7--7n{W0-u<$l{|
z$9rYs+3X(o+3~)aXzB!2nSat}$9qzuMFS1YL;N9-<*?osf<Lj<OctgA2|og|9R_Ik
zQzL*H-A{Zx)yHACos0(4ro)g;9;#O1!|z>Rf?;2-uv>}`M~fLW7`s10Hat~ZV0WJ{
z!LX=~ngcWfyn?IuzbRJ!8aq;7H;8sjzQ?ga@B%0XWZ$7n<rFq!4pEF+Sf{=LG5)Bl
z1nx0}&)!csDrzp1hU6(g%~>U@i+#>HC1Y@X@V|IJ@wr3!+{q^)G-c;u{pL-XYhk=M
zxRd6X8*fdVsF3~hfcmity*!lYw6p2up~t7M^mi8%xN!r5IDI|nGoZgmA)EKB0A}uf
z$mabjAZo<3kj?v50R8_WWZoGQ0yypc5;FTA1UOr~1ZIh^yf+{}<C81PAA|nYvcGEa
zKIG$NxkglBv2m{@1jH;c2eQ9DylcD#dpm*cYw;~kw(rCGztVn8xst!k|55wD(%*rK
z`uq+uZzg$l%liHqax40eTLb&=O~^YrpV1GL-=oaKua?8yR7`&aXNnrgW2S$DxU_<7
z&aHg^YSx>OdCyt{+5g^mpVnUmw=CvS$o}`fm$m*itv{jVr?vc!mao(DrDzDh1qgia
zo2&Oc^WJx@mPy#m8^HMA`!+ykOegTYkN0_mM}P}~yDIGSkQu`WZ0`e*{qKE4kp1s{
zzlChT0`t0-P5=D8LjTDg8PESAb!v%8r^}6Y3x1sQqdb}r*Ym>~SD_X^ly5w5t<Pn<
z(kayBdLH||#&q^ZfrEd>_n6A_nd=q0x==~mZri$fi`~AVV=LcS?X^>+jcsLBZ*+-3
zgL*TL=Om-eFiqy{R3_IM&)D)@VaE%*g*<rJ$wE(0zi}PAdF`ZUBdpu9dQ;3c5{ohX
zq*r-pkzUW=*_F2&Jm{V4TQPc2U3%O4(p$YdcO^wGlQe0r&`OuR=H_%dg!IZ)E2AmL
zvwIVGnl5B_MLTzk^0T;n!ftIfZ?#K4_WQDar~dC<Rz6s(w)_2=r*VH;<@@;*ojlF*
zcHf_>-qrmnQ(myo@;?BRwtUhy&)#SMzXCphf4rymv;D&XA15Yju>_+#<=+?n4L+jc
A0{{R3

diff --git a/src/java/com/threerings/util/signal/i686-Linux/Makefile b/src/java/com/threerings/util/signal/unix/Makefile
similarity index 69%
rename from src/java/com/threerings/util/signal/i686-Linux/Makefile
rename to src/java/com/threerings/util/signal/unix/Makefile
index 1292ac9a2..e7c3747dd 100644
--- a/src/java/com/threerings/util/signal/i686-Linux/Makefile
+++ b/src/java/com/threerings/util/signal/unix/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.2 2004/10/20 03:30:20 mdb Exp $
+# $Id$
 
 #
 # Executable definitions
@@ -14,14 +14,18 @@ MKDIR=mkdir
 
 ROOT=../../../../../../..
 LIBRARIES_PATH=
-INSTALL_PATH=${ROOT}/dist/lib/i686-Linux
+ARCH!=uname -p
+OS!=uname -s
+OSINCDIR!=uname -s | tr 'A-Z' 'a-z'
+OSDIR=${ARCH}-${OS}
+INSTALL_PATH=${ROOT}/dist/lib/${OSDIR}
 
 #
 # Parameter and file definitions
 
-INCLUDES=-I.. -I${JAVA_HOME}/include -I${JAVA_HOME}/include/linux
+INCLUDES=-I.. -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OSINCDIR}
 LIBRARIES=
-TARGET=libsignal.so
+TARGET=${OSDIR}/libsignal.so
 
 #
 # Target definitions
@@ -33,7 +37,8 @@ install: ${TARGET}
 	cp ${TARGET} ${INSTALL_PATH}
 
 ${TARGET}: com_threerings_util_signal_SignalManager.c
-	@echo Compiling 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/i686-Linux/com_threerings_util_signal_SignalManager.c b/src/java/com/threerings/util/signal/unix/com_threerings_util_signal_SignalManager.c
similarity index 96%
rename from src/java/com/threerings/util/signal/i686-Linux/com_threerings_util_signal_SignalManager.c
rename to src/java/com/threerings/util/signal/unix/com_threerings_util_signal_SignalManager.c
index 6045fd35e..e8113cf77 100644
--- a/src/java/com/threerings/util/signal/i686-Linux/com_threerings_util_signal_SignalManager.c
+++ b/src/java/com/threerings/util/signal/unix/com_threerings_util_signal_SignalManager.c
@@ -1,5 +1,5 @@
 /**
- * $Id: com_threerings_util_signal_SignalManager.c,v 1.1 2003/03/31 02:10:04 mdb Exp $
+ * $Id$
  */
 
 #include <signal.h>
diff --git a/src/java/com/threerings/util/signal/unix/i386-FreeBSD/libsignal.so b/src/java/com/threerings/util/signal/unix/i386-FreeBSD/libsignal.so
new file mode 100755
index 0000000000000000000000000000000000000000..c9ded61ebd03d460a75feca15ff1012a22b27617
GIT binary patch
literal 6700
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
Y?i?m%0Pg|UqbxvZ-XTDG=TPdu0By-0dH?_b

literal 0
HcmV?d00001