harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r532468 - in /harmony/enhanced/classlib/trunk: depends/build/ depends/build/platform/ make/ modules/archive/src/main/native/archive/unix/ modules/archive/src/main/native/zlib/unix/ modules/auth/src/main/native/auth/unix/ modules/awt/src/mai...
Date Wed, 25 Apr 2007 20:08:46 GMT
Author: hindessm
Date: Wed Apr 25 13:08:45 2007
New Revision: 532468

URL: http://svn.apache.org/viewvc?view=rev&rev=532468
Log:
Adding flags for Mac OS/X.
Adding support for running ranlib to add an index to .a files - required
on OS/X 10.3.
Extend shlib.suffix to be used in Makefile - dylib on OS/X not .so.

Added:
    harmony/enhanced/classlib/trunk/depends/build/platform/macosx.ppc32.mk
Modified:
    harmony/enhanced/classlib/trunk/depends/build/defines.mk
    harmony/enhanced/classlib/trunk/depends/build/rules.mk
    harmony/enhanced/classlib/trunk/make/properties.xml
    harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/unix/makefile
    harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zlib/unix/makefile
    harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/unix/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/unix/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/unix/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/unix/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/unix/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/unix/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/unix/makefile
    harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/unix/makefile
    harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/pngencoder/unix/makefile
    harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/unix/makefile
    harmony/enhanced/classlib/trunk/modules/luni/build.xml
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/unix/makefile
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/unix/makefile
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmi/unix/makefile
    harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/unix/makefile
    harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/unix/makefile
    harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/makefile
    harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/sig/unix/makefile
    harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/unix/makefile
    harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thrstub/unix/makefile
    harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/unix/makefile

Modified: harmony/enhanced/classlib/trunk/depends/build/defines.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/defines.mk?view=diff&rev=532468&r1=532467&r2=532468
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/defines.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/defines.mk Wed Apr 25 13:08:45 2007
@@ -37,6 +37,10 @@
 
 include $(HY_HDK)/build/make/platform/$(HY_PLATFORM).mk
 
+ifeq ($(RANLIB),)
+RANLIB=echo
+endif
+
 ifneq ($(HY_OS),freebsd)
 OSLIBS += -ldl
 endif
@@ -66,13 +70,13 @@
 MDLLIBFILES = $(LIBPATH)libhycommon.a
 
 ifeq ($(HY_NO_THR),false)
-MDLLIBFILES += $(DLLPATH)libhythr.so
+MDLLIBFILES += $(DLLPATH)libhythr$(HY_SHLIB_SUFFIX)
 else
 DEFINES += -DHY_NO_THR
 endif
 
 ifeq ($(HY_NO_SIG),false)
-MDLLIBFILES += $(DLLPATH)libhysig.so
+MDLLIBFILES += $(DLLPATH)libhysig$(HY_SHLIB_SUFFIX)
 else
 DEFINES += -DHY_NO_SIG
 endif

Added: harmony/enhanced/classlib/trunk/depends/build/platform/macosx.ppc32.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/platform/macosx.ppc32.mk?view=auto&rev=532468
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/platform/macosx.ppc32.mk (added)
+++ harmony/enhanced/classlib/trunk/depends/build/platform/macosx.ppc32.mk Wed Apr 25 13:08:45
2007
@@ -0,0 +1,26 @@
+#  Licensed to the Apache Software Foundation (ASF) under one or more
+#  contributor license agreements.  See the NOTICE file distributed with
+#  this work for additional information regarding copyright ownership.
+#  The ASF licenses this file to You under the Apache License, Version 2.0
+#  (the "License"); you may not use this file except in compliance with
+#  the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+DEFINES += -DMACOSX -DMACOSX_PPC32 -DPPC32
+OPT += -fno-common
+OSLIBS = -lc -lm -ldl -liconv
+MDLLIBPREFIX =
+MDLLIBSUFFIX =
+EXERPATHPREFIX = 
+DLL_LD = $(CC)
+# TOFIX: exports?
+DLL_LDFLAGS = -dynamiclib -dynamic -install_name $(@F)
+
+RANLIB=ranlib

Modified: harmony/enhanced/classlib/trunk/depends/build/rules.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/rules.mk?view=diff&rev=532468&r1=532467&r2=532468
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/rules.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/rules.mk Wed Apr 25 13:08:45 2007
@@ -25,6 +25,7 @@
 
 $(LIBNAME): $(BUILDFILES)
 	$(AR) $(ARFLAGS) $@ $(BUILDFILES)
+	$(RANLIB) $@
 
 $(EXPFILE): exports.txt
 ifeq ($(HY_OS),aix)

Modified: harmony/enhanced/classlib/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/properties.xml?view=diff&rev=532468&r1=532467&r2=532468
==============================================================================
--- harmony/enhanced/classlib/trunk/make/properties.xml (original)
+++ harmony/enhanced/classlib/trunk/make/properties.xml Wed Apr 25 13:08:45 2007
@@ -441,6 +441,7 @@
                 <env key="HY_PLATFORM" value="${hy.platform}" />
                 <env key="HY_NO_SIG" value="${hy.no.sig}" />
                 <env key="HY_NO_THR" value="${hy.no.thr}" />
+                <env key="HY_SHLIB_SUFFIX" value="${shlib.suffix}" />
                 <arg line="${make.arg}" />
                 <arg line="@{target}" />
             </exec>

Modified: harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/unix/makefile?view=diff&rev=532468&r1=532467&r2=532468
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/unix/makefile
(original)
+++ harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/unix/makefile
Wed Apr 25 13:08:45 2007
@@ -27,10 +27,10 @@
 	$(SHAREDSUB)jarfile.o $(SHAREDSUB)deflater.o $(SHAREDSUB)archiveglob.o
 
 MDLLIBFILES += \
-	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so \
-	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi.so
+	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_SHLIB_SUFFIX) \
+	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi$(HY_SHLIB_SUFFIX)
 
-DLLNAME=../libhyarchive.so
+DLLNAME=../libhyarchive$(HY_SHLIB_SUFFIX)
 EXPNAME=HYARCHIVE_0.1
 
 include $(HY_HDK)/build/make/rules.mk

Modified: harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zlib/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zlib/unix/makefile?view=diff&rev=532468&r1=532467&r2=532468
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zlib/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zlib/unix/makefile Wed
Apr 25 13:08:45 2007
@@ -28,11 +28,13 @@
 	$(ZLIB_DIST)crc32.o $(ZLIB_DIST)deflate.o $(ZLIB_DIST)infback.o $(ZLIB_DIST)inffast.o \
 	$(ZLIB_DIST)inflate.o $(ZLIB_DIST)inftrees.o $(ZLIB_DIST)trees.o $(ZLIB_DIST)uncompr.o $(ZLIB_DIST)zutil.o
 
-DLLNAME = ../libhyzlib.so
+DLLNAME = ../libhyzlib$(HY_SHLIB_SUFFIX)
 EXPNAME = HYZLIB_0.1
 
 ifeq ($(DLL_LD),$(CC))
+ifneq ($(HY_OS),macosx)
 LDFLAGS += -Wl,-Bsymbolic
+endif
 endif
 
 include $(HY_HDK)/build/make/rules.mk

Modified: harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/unix/makefile?view=diff&rev=532468&r1=532467&r2=532468
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/unix/makefile Wed Apr
25 13:08:45 2007
@@ -22,10 +22,10 @@
 CFLAGS += -fpic
 BUILDFILES = $(SHAREDSUB)auth_copyright.o authnix.o
 MDLLIBFILES += \
-        $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so \
-        $(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi.so
+        $(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_SHLIB_SUFFIX) \
+        $(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi$(HY_SHLIB_SUFFIX)
 
-DLLNAME = ../libhyauth.so
+DLLNAME = ../libhyauth$(HY_SHLIB_SUFFIX)
 EXPNAME = HYAUTH_0.1
 
 include $(HY_HDK)/build/make/rules.mk

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/unix/makefile?view=diff&rev=532468&r1=532467&r2=532468
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/unix/makefile Wed Apr 25
13:08:45 2007
@@ -29,12 +29,12 @@
   libpng.a
 
 MDLLIBFILES += \
-	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so \
-	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi.so
+	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_SHLIB_SUFFIX) \
+	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi$(HY_SHLIB_SUFFIX)
 
 OSLIBS += $(STDCLIBS)
 
-DLLNAME=../libgl.so
+DLLNAME=../libgl$(HY_SHLIB_SUFFIX)
 EXPNAME=HYGL_0.1
 
 include $(HY_HDK)/build/make/rules.mk

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/unix/makefile?view=diff&rev=532468&r1=532467&r2=532468
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/unix/makefile
(original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/unix/makefile
Wed Apr 25 13:08:45 2007
@@ -25,10 +25,10 @@
   libjpeg.a
 
 MDLLIBFILES += \
-	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so \
-	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi.so
+	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_SHLIB_SUFFIX) \
+	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi$(HY_SHLIB_SUFFIX)
 
-DLLNAME=../libjpegdecoder.so
+DLLNAME=../libjpegdecoder$(HY_SHLIB_SUFFIX)
 EXPNAME=HYJPEGDECODER_0.1
 
 CLEANFILES=jconfig.h

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/unix/makefile?view=diff&rev=532468&r1=532467&r2=532468
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/unix/makefile Wed Apr
25 13:08:45 2007
@@ -29,10 +29,10 @@
   liblcms.a
 
 MDLLIBFILES += \
-	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so \
-	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi.so
+	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_SHLIB_SUFFIX) \
+	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi$(HY_SHLIB_SUFFIX)
 
-DLLNAME=../liblcmm.so
+DLLNAME=../liblcmm$(HY_SHLIB_SUFFIX)
 EXPNAME=HYLCMM_0.1
 
 include $(HY_HDK)/build/make/rules.mk

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/unix/makefile?view=diff&rev=532468&r1=532467&r2=532468
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/unix/makefile Wed
Apr 25 13:08:45 2007
@@ -25,12 +25,12 @@
 BUILDFILES = LinuxNativeFont.o
 
 MDLLIBFILES += \
-	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so \
-	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi.so
+	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_SHLIB_SUFFIX) \
+	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi$(HY_SHLIB_SUFFIX)
 
 OSLIBS += $(XLIBS)
 
-DLLNAME=../liblinuxfont.so
+DLLNAME=../liblinuxfont$(HY_SHLIB_SUFFIX)
 EXPNAME=HYLINUXFONT_0.1
 
 include $(HY_HDK)/build/make/rules.mk

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/unix/makefile?view=diff&rev=532468&r1=532467&r2=532468
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/unix/makefile Wed
Apr 25 13:08:45 2007
@@ -22,12 +22,12 @@
   $(SHAREDSUB)/org_apache_harmony_awt_gl_opengl_GL.o
 
 MDLLIBFILES += \
-	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so \
-	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi.so
+	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_SHLIB_SUFFIX) \
+	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi$(HY_SHLIB_SUFFIX)
 
 OSLIBS += $(STDCLIBS)
 
-DLLNAME=../liboglwrapper.so
+DLLNAME=../liboglwrapper$(HY_SHLIB_SUFFIX)
 EXPNAME=HYOGLWRAPPER_0.1
 
 include $(HY_HDK)/build/make/rules.mk

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/unix/makefile?view=diff&rev=532468&r1=532467&r2=532468
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/unix/makefile Wed
Apr 25 13:08:45 2007
@@ -25,12 +25,12 @@
   org_apache_harmony_awt_nativebridge_linux_Xft.o
 
 MDLLIBFILES += \
-	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so \
-	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi.so
+	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_SHLIB_SUFFIX) \
+	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi$(HY_SHLIB_SUFFIX)
 
 OSLIBS += $(STDCLIBS) $(XLIBS)
 
-DLLNAME=../libX11Wrapper.so
+DLLNAME=../libX11Wrapper$(HY_SHLIB_SUFFIX)
 EXPNAME=HYX11WRAPPER_0.1
 
 include $(HY_HDK)/build/make/rules.mk

Modified: harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/unix/makefile?view=diff&rev=532468&r1=532467&r2=532468
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/unix/makefile
(original)
+++ harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/unix/makefile
Wed Apr 25 13:08:45 2007
@@ -25,10 +25,10 @@
   libjpeg.a
 
 MDLLIBFILES += \
-	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so \
-	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi.so
+	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_SHLIB_SUFFIX) \
+	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi$(HY_SHLIB_SUFFIX)
 
-DLLNAME=../libjpegencoder.so
+DLLNAME=../libjpegencoder$(HY_SHLIB_SUFFIX)
 EXPNAME=HYJPEGENCODER_0.1
 
 CLEANFILES=jconfig.h

Modified: harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/pngencoder/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/pngencoder/unix/makefile?view=diff&rev=532468&r1=532467&r2=532468
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/pngencoder/unix/makefile
(original)
+++ harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/pngencoder/unix/makefile
Wed Apr 25 13:08:45 2007
@@ -25,12 +25,12 @@
   libpng.a
 
 MDLLIBFILES += \
-	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so \
-	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi.so
+	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_SHLIB_SUFFIX) \
+	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi$(HY_SHLIB_SUFFIX)
 
 OSLIBS += $(STDCLIBS)
 
-DLLNAME=../libpngencoder.so
+DLLNAME=../libpngencoder$(HY_SHLIB_SUFFIX)
 EXPNAME=HYPNGENCODER_0.1
 
 CLEANFILES=jconfig.h

Modified: harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/unix/makefile?view=diff&rev=532468&r1=532467&r2=532468
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/unix/makefile
(original)
+++ harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/unix/makefile
Wed Apr 25 13:08:45 2007
@@ -27,9 +27,9 @@
 MDLLIBFILES += \
 	$(LIBPATH)libhyzip.a \
 	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a \
-	$(LIBPATH)libvmi.so
+	$(LIBPATH)libvmi$(HY_SHLIB_SUFFIX)
 
-DLLNAME = ../libhyinstrument.so
+DLLNAME = ../libhyinstrument$(HY_SHLIB_SUFFIX)
 EXPNAME = HYINSTRUMENT_0.1
 
 include $(HY_HDK)/build/make/rules.mk

Modified: harmony/enhanced/classlib/trunk/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/build.xml?view=diff&rev=532468&r1=532467&r2=532468
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/build.xml Wed Apr 25 13:08:45 2007
@@ -110,7 +110,7 @@
           -->
         <copy todir="${hy.hdk}/lib" overwrite="yes" failonerror="false">
             <fileset dir="${hy.luni.src.main.native}/vmi">
-                <include name="libvmi.so"/>
+                <include name="libvmi${shlib.suffix}"/>
             </fileset>
         </copy>
     </target>

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/unix/makefile?view=diff&rev=532468&r1=532467&r2=532468
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/unix/makefile Wed
Apr 25 13:08:45 2007
@@ -23,7 +23,7 @@
 	$(SHAREDSUB)launcher_copyright.o $(SHAREDSUB)strbuf.o \
 	$(SHAREDSUB)libhlp.o
 ifeq ($(HY_NO_THR),false)
-MDLLIBFILES += $(DLLPATH)libhyprt.so
+MDLLIBFILES += $(DLLPATH)libhyprt$(HY_SHLIB_SUFFIX)
 else
 BUILDFILES += main_hlp.o
 endif

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/unix/makefile?view=diff&rev=532468&r1=532467&r2=532468
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/unix/makefile Wed Apr
25 13:08:45 2007
@@ -37,10 +37,10 @@
 	OSNetworkSystemLinux.o hyenv.o
 
 MDLLIBFILES += \
-	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so \
-	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi.so
+	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_SHLIB_SUFFIX) \
+	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi$(HY_SHLIB_SUFFIX)
 
-DLLNAME = ../libhyluni.so
+DLLNAME = ../libhyluni$(HY_SHLIB_SUFFIX)
 EXPNAME = HYLUNI_0.1
 
 include $(HY_HDK)/build/make/rules.mk

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmi/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmi/unix/makefile?view=diff&rev=532468&r1=532467&r2=532468
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmi/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmi/unix/makefile Wed Apr
25 13:08:45 2007
@@ -23,7 +23,7 @@
 BUILDFILES = $(SHAREDSUB)vmi_copyright.o $(SHAREDSUB)vmi.o
 MDLLIBFILES = $(LIBPATH)libhypool.a
 
-DLLNAME = ../libvmi.so
+DLLNAME = ../libvmi$(HY_SHLIB_SUFFIX)
 EXPNAME = VMI_0.1
 
 include $(HY_HDK)/build/make/rules.mk

Modified: harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/unix/makefile?view=diff&rev=532468&r1=532467&r2=532468
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/unix/makefile Wed
Apr 25 13:08:45 2007
@@ -27,10 +27,10 @@
 
 
 MDLLIBFILES += \
-	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so \
-	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi.so
+	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_SHLIB_SUFFIX) \
+	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi$(HY_SHLIB_SUFFIX)
 
-DLLNAME=../libaccessors.so
+DLLNAME=../libaccessors$(HY_SHLIB_SUFFIX)
 EXPNAME=HYMISC_0.1
 
 include $(HY_HDK)/build/make/rules.mk

Modified: harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/unix/makefile?view=diff&rev=532468&r1=532467&r2=532468
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/unix/makefile Wed Apr
25 13:08:45 2007
@@ -28,7 +28,7 @@
 	$(LIBPATH)libhycommon.a $(LIBPATH)libhyzip.a \
 	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a
 
-DLLNAME = ../libhynio.so
+DLLNAME = ../libhynio$(HY_SHLIB_SUFFIX)
 EXPNAME = HYNIO_0.1
 
 include $(HY_HDK)/build/make/rules.mk

Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/makefile?view=diff&rev=532468&r1=532467&r2=532468
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/makefile Wed
Apr 25 13:08:45 2007
@@ -37,9 +37,9 @@
 endif
 
 ifeq ($(HY_NO_THR),true)
-MDLLIBFILES += $(LIBPATH)libhythr.so
+MDLLIBFILES += $(LIBPATH)libhythr$(HY_SHLIB_SUFFIX)
 endif
-DLLNAME = ../libhyprt.so
+DLLNAME = ../libhyprt$(HY_SHLIB_SUFFIX)
 EXPNAME = HYPRT_0.1
 
 # temp by geir - please ignore

Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/sig/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/sig/unix/makefile?view=diff&rev=532468&r1=532467&r2=532468
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/sig/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/sig/unix/makefile Wed
Apr 25 13:08:45 2007
@@ -22,7 +22,7 @@
 CFLAGS += -fpic
 BUILDFILES = $(SHAREDSUB)hysig_copyright.o hysiglinux.o hysigunix.o
 MDLLIBFILES =
-DLLNAME = ../libhysig.so
+DLLNAME = ../libhysig$(HY_SHLIB_SUFFIX)
 EXPNAME = HYSIG_0.1
 
 include $(HY_HDK)/build/make/rules.mk

Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/unix/makefile?view=diff&rev=532468&r1=532467&r2=532468
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/unix/makefile Wed
Apr 25 13:08:45 2007
@@ -28,7 +28,7 @@
 
 OSLIBS += -lpthread
 MDLLIBFILES = $(LIBPATH)libhypool.a $(LIBPATH)libhycommon.a
-DLLNAME = ../libhythr.so
+DLLNAME = ../libhythr$(HY_SHLIB_SUFFIX)
 EXPNAME = HYTHR_0.1
 
 include $(HY_HDK)/build/make/rules.mk

Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thrstub/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thrstub/unix/makefile?view=diff&rev=532468&r1=532467&r2=532468
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thrstub/unix/makefile
(original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thrstub/unix/makefile
Wed Apr 25 13:08:45 2007
@@ -23,7 +23,7 @@
 
 BUILDFILES = $(SHAREDSUB)hythread.o
 
-DLLNAME = ../libhythr.so
+DLLNAME = ../libhythr$(HY_SHLIB_SUFFIX)
 EXPNAME = HYTHR_0.2
 
 include $(HY_HDK)/build/make/rules.mk

Modified: harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/unix/makefile?view=diff&rev=532468&r1=532467&r2=532468
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/text/src/main/native/text/unix/makefile Wed Apr
25 13:08:45 2007
@@ -25,11 +25,11 @@
 BUILDFILES = $(SHAREDSUB)text_copyright.o $(SHAREDSUB)BidiWrapper.o
 
 MDLLIBFILES += \
-	$(DLLPATH)libicuuc.so.34 \
-	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib.so \
-	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi.so
+	$(DLLPATH)libicuuc$(HY_SHLIB_SUFFIX).34 \
+	$(LIBPATH)libhyzip.a $(DLLPATH)libhyzlib$(HY_SHLIB_SUFFIX) \
+	$(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi$(HY_SHLIB_SUFFIX)
 
-DLLNAME = ../libhytext.so
+DLLNAME = ../libhytext$(HY_SHLIB_SUFFIX)
 EXPNAME = HYTEXT_0.1
 
 include $(HY_HDK)/build/make/rules.mk



Mime
View raw message