harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r818225 [1/2] - in /harmony/enhanced: classlib/trunk/depends/build/ classlib/trunk/depends/build/platform/ classlib/trunk/modules/archive/ classlib/trunk/modules/archive/src/main/native/archive/ classlib/trunk/modules/archive/src/main/nativ...
Date Wed, 23 Sep 2009 19:46:51 GMT
Author: hindessm
Date: Wed Sep 23 19:46:48 2009
New Revision: 818225

URL: http://svn.apache.org/viewvc?rev=818225&view=rev
Log:
Update make macro in common_resources to match classlib.
For everything using the classlib rules.{mk,mak} files:
  1) Create .pdb or gnu debug files in jdk/lib.
  2) build directly to appropriate location so no copying is needed.
Remove the copying and svn:ignore properties that aren't needed anymore.
Replace some jdktools antcalls with depends targets.
Added a couple of TODO items to remind me of outstanding things to be
fixed.

Modified:
    harmony/enhanced/classlib/trunk/depends/build/defines.mak
    harmony/enhanced/classlib/trunk/depends/build/defines.mk
    harmony/enhanced/classlib/trunk/depends/build/platform/linux.ia64.mk
    harmony/enhanced/classlib/trunk/depends/build/platform/linux.ppc32.mk
    harmony/enhanced/classlib/trunk/depends/build/platform/linux.ppc64.mk
    harmony/enhanced/classlib/trunk/depends/build/platform/linux.s390.mk
    harmony/enhanced/classlib/trunk/depends/build/platform/linux.s390x.mk
    harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86.mk
    harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86_64.mk
    harmony/enhanced/classlib/trunk/depends/build/rules.mak
    harmony/enhanced/classlib/trunk/depends/build/rules.mk
    harmony/enhanced/classlib/trunk/modules/archive/build.xml
    harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/   (props changed)
    harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/unix/makefile
    harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/windows/makefile
    harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zlib/   (props changed)
    harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zlib/unix/makefile
    harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zlib/windows/makefile
    harmony/enhanced/classlib/trunk/modules/auth/build.xml
    harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/   (props changed)
    harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/unix/makefile
    harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/windows/makefile
    harmony/enhanced/classlib/trunk/modules/awt/build.xml
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/   (props changed)
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/unix/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/windows/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/   (props changed)
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/unix/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/   (props changed)
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/unix/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/   (props changed)
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/unix/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/windows/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/   (props changed)
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/unix/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/   (props changed)
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/unix/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/windows/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/win32wrapper/   (props changed)
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/win32wrapper/windows/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/   (props changed)
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/makefile
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/   (props changed)
    harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/unix/makefile
    harmony/enhanced/classlib/trunk/modules/imageio/build.xml
    harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/   (props changed)
    harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/unix/makefile
    harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/makefile
    harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/pngencoder/   (props changed)
    harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/pngencoder/unix/makefile
    harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/pngencoder/windows/makefile
    harmony/enhanced/classlib/trunk/modules/instrument/build.xml
    harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/   (props changed)
    harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/unix/makefile
    harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/windows/makefile
    harmony/enhanced/classlib/trunk/modules/luni/build.xml
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/   (props changed)
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javae
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javaw
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/   (props changed)
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/unix/makefile
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/windows/makefile
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmi/   (props changed)
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmi/unix/makefile
    harmony/enhanced/classlib/trunk/modules/misc/build.xml
    harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/   (props changed)
    harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/unix/makefile
    harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/windows/makefile
    harmony/enhanced/classlib/trunk/modules/nio/build.xml
    harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/   (props changed)
    harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/unix/makefile
    harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/windows/makefile
    harmony/enhanced/classlib/trunk/modules/nio_char/build.xml
    harmony/enhanced/classlib/trunk/modules/nio_char/src/main/native/niochar/   (props changed)
    harmony/enhanced/classlib/trunk/modules/nio_char/src/main/native/niochar/unix/makefile
    harmony/enhanced/classlib/trunk/modules/nio_char/src/main/native/niochar/windows/makefile
    harmony/enhanced/classlib/trunk/modules/portlib/build.xml
    harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/a2e/unix/makefile
    harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/   (props changed)
    harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/makefile
    harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/windows/makefile
    harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/   (props changed)
    harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/unix/makefile
    harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thrstub/   (props changed)
    harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thrstub/unix/makefile
    harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thrstub/windows/makefile
    harmony/enhanced/classlib/trunk/modules/prefs/build.xml
    harmony/enhanced/classlib/trunk/modules/prefs/src/main/native/prefs/   (props changed)
    harmony/enhanced/classlib/trunk/modules/prefs/src/main/native/prefs/windows/makefile
    harmony/enhanced/classlib/trunk/modules/print/build.xml
    harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/   (props changed)
    harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/windows/makefile
    harmony/enhanced/classlib/trunk/modules/security/build.xml
    harmony/enhanced/classlib/trunk/modules/security/src/main/native/security/   (props changed)
    harmony/enhanced/classlib/trunk/modules/security/src/main/native/security/unix/makefile
    harmony/enhanced/classlib/trunk/modules/security/src/main/native/security/windows/makefile
    harmony/enhanced/common_resources/trunk/make/properties.xml
    harmony/enhanced/jdktools/trunk/modules/jpda/build.xml
    harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/   (props changed)
    harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/agent/makefile
    harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/transport/   (props changed)
    harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/unix/transport/dt_socket/makefile
    harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/   (props changed)
    harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/agent/   (props changed)
    harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/agent/makefile
    harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/   (props changed)
    harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/dt_shmem/   (props changed)
    harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/dt_shmem/makefile
    harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/dt_socket/   (props changed)
    harmony/enhanced/jdktools/trunk/modules/jpda/src/main/native/jdwp/windows/transport/dt_socket/makefile
    harmony/enhanced/jdktools/trunk/modules/samsa/build.xml
    harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/   (props changed)
    harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/unix/makefile
    harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/windows/makefile.javae
    harmony/enhanced/jdktools/trunk/modules/samsa/src/main/native/samsa/windows/makefile.javaw
    harmony/enhanced/trunk/build.xml

Modified: harmony/enhanced/classlib/trunk/depends/build/defines.mak
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/defines.mak?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/defines.mak (original)
+++ harmony/enhanced/classlib/trunk/depends/build/defines.mak Wed Sep 23 19:46:48 2009
@@ -26,8 +26,9 @@
 !include <win32.mak>
 
 LIBPATH=$(HY_HDK)\lib\# comment to avoid \ being treated as continuation
-EXEPATH=..\# ditto
 DLLPATH=$(HY_HDK)\jdk\jre\bin\# ditto
+EXEPATH=$(HY_HDK)\jdk\jre\bin\# ditto
+DBGPATH=$(HY_HDK)\jdk\lib\# ditto
 SHAREDSUB=..\shared\# ditto
 
 !IF "$(HY_OS)-$(HY_ARCH)" == "windows-x86_64" 

Modified: harmony/enhanced/classlib/trunk/depends/build/defines.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/defines.mk?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/defines.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/defines.mk Wed Sep 23 19:46:48 2009
@@ -41,9 +41,10 @@
 HYDEBUGCFLAGS = -ggdb -O0
 HYRELEASECFLAGS = -O1 -DNDEBUG
 
-EXEPATH=../
 LIBPATH=$(HY_HDK)/lib/
 DLLPATH=$(HY_HDK)/jdk/jre/bin/
+EXEPATH=$(HY_HDK)/jdk/jre/bin/
+DBGPATH=$(HY_HDK)/jdk/lib/
 SHAREDSUB=../shared/
 INCLUDES += -I$(HY_HDK)/include -I$(HY_HDK)/jdk/include -I. -I$(SHAREDSUB)
 

Modified: harmony/enhanced/classlib/trunk/depends/build/platform/linux.ia64.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/platform/linux.ia64.mk?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/platform/linux.ia64.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/platform/linux.ia64.mk Wed Sep 23 19:46:48 2009
@@ -15,3 +15,4 @@
 
 DEFINES += -DLINUX -DLINUX_IA64 -DHYIA64 -DIPv6_FUNCTION_SUPPORT
 OSLIBS += -ldl
+HY_CAN_LINK_DEBUG = yes

Modified: harmony/enhanced/classlib/trunk/depends/build/platform/linux.ppc32.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/platform/linux.ppc32.mk?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/platform/linux.ppc32.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/platform/linux.ppc32.mk Wed Sep 23 19:46:48 2009
@@ -18,3 +18,4 @@
 ASFLAGS += -a32
 LDFLAGS += -m32
 OSLIBS += -ldl
+HY_CAN_LINK_DEBUG = yes

Modified: harmony/enhanced/classlib/trunk/depends/build/platform/linux.ppc64.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/platform/linux.ppc64.mk?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/platform/linux.ppc64.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/platform/linux.ppc64.mk Wed Sep 23 19:46:48 2009
@@ -19,3 +19,4 @@
 ASFLAGS += -a64
 LDFLAGS += -m64
 OSLIBS += -ldl
+HY_CAN_LINK_DEBUG = yes

Modified: harmony/enhanced/classlib/trunk/depends/build/platform/linux.s390.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/platform/linux.s390.mk?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/platform/linux.s390.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/platform/linux.s390.mk Wed Sep 23 19:46:48 2009
@@ -18,3 +18,4 @@
 ASFLAGS += -m31
 LDFLAGS += -m31
 OSLIBS += -ldl
+HY_CAN_LINK_DEBUG = yes

Modified: harmony/enhanced/classlib/trunk/depends/build/platform/linux.s390x.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/platform/linux.s390x.mk?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/platform/linux.s390x.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/platform/linux.s390x.mk Wed Sep 23 19:46:48 2009
@@ -18,3 +18,4 @@
 ASFLAGS += -m64
 LDFLAGS += -m64
 OSLIBS += -ldl
+HY_CAN_LINK_DEBUG = yes

Modified: harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86.mk?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86.mk Wed Sep 23 19:46:48 2009
@@ -16,3 +16,4 @@
 DEFINES += -DLINUX -DLINUX_X86 -DHYX86 -DIPv6_FUNCTION_SUPPORT
 PLATFORM += -march=pentium3
 OSLIBS += -ldl
+HY_CAN_LINK_DEBUG = yes

Modified: harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86_64.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86_64.mk?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86_64.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/platform/linux.x86_64.mk Wed Sep 23 19:46:48 2009
@@ -16,3 +16,4 @@
 DEFINES += -DLINUX -DLINUX_X86_64 -DHYX86_64 -DIPv6_FUNCTION_SUPPORT
 XLIBS = -L/usr/X11R6/lib64 -lX11 -lXft -lXext -lXtst
 OSLIBS += -ldl
+HY_CAN_LINK_DEBUG = yes

Modified: harmony/enhanced/classlib/trunk/depends/build/rules.mak
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/rules.mak?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/rules.mak (original)
+++ harmony/enhanced/classlib/trunk/depends/build/rules.mak Wed Sep 23 19:46:48 2009
@@ -45,31 +45,41 @@
 
 !ifdef DLLNAME
 $(DLLNAME): $(LIBNAME)
+	-mkdir $(DBGPATH)
 	link $(VMLINK) /debug /opt:icf /opt:ref /INCREMENTAL:NO /NOLOGO \
 	/NODEFAULTLIB:libcmt /NODEFAULTLIB:libc /FORCE:UNRESOLVED \
 	-entry:_DllMainCRTStartup$(DLLENTRY) -dll /BASE:$(DLLBASE) -machine:$(CPU) \
 	$(COMMENT) \
-	-subsystem:windows -out:$@ -map:$*.map \
+	-subsystem:windows -out:$@ \
+	-map:$(LIBPATH)$(*F).map -pdb:$(DBGPATH)$(*F).pdb \
+        -manifestfile:$(LIBPATH)$(*F).manifest \
 	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES) $(SYSLIBFILES) \
 	kernel32.lib  msvcrt.lib ws2_32.lib advapi32.lib user32.lib gdi32.lib \
 	comdlg32.lib winspool.lib  $(LIBPATH)$(*F).exp
-	if exist $(DLLNAME).manifest \
-		mt -manifest $(DLLNAME).manifest -outputresource:$(DLLNAME);#2
+	if exist $(LIBPATH)$(*F).manifest \
+            mt -manifest $(LIBPATH)$(*F).manifest -outputresource:$(DLLNAME);#2
+        -del $(LIBPATH)$(*F).manifest >nul 2>&1
 !endif
 
 !ifdef EXENAME
 $(EXENAME): $(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES)
+	-mkdir $(DBGPATH)
 	link /NOLOGO $(EXEFLAGS) /debug /opt:icf /opt:ref $(VMLINK) \
-	-out:$(EXENAME) -machine:$(CPU) setargv.obj  \
+	-out:$(EXENAME) -pdb:$(DBGPATH)$(*F).pdb \
+        -manifestfile:$(LIBPATH)$(*F).manifest \
+	-machine:$(CPU) setargv.obj  \
 	$(BUILDFILES) $(VIRTFILES) $(MDLLIBFILES) $(EXEDLLFILES)
-	if exist $(EXENAME).manifest \
-		mt -manifest $(EXENAME).manifest -outputresource:$(EXENAME);#1
+	if exist $(LIBPATH)$(*F).manifest \
+            mt -manifest $(LIBPATH)$(*F).manifest -outputresource:$(EXENAME);#1
+        -del $(LIBPATH)$(*F).manifest >nul 2>&1
 !endif
 
 clean:
     -del $(BUILDFILES) *.res *.pdb \
              $(LIBNAME) $(LIBNAME:.lib=.exp) \
-             $(DLLNAME) $(DLLNAME:.dll=.pdb) $(DLLNAME:.dll=.map) \
-			 $(DLLNAME).manifest \
-             $(EXENAME) $(EXENAME:.exe=.pdb) $(EXENAME).manifest \
+                        $(LIBNAME:.lib=.map) \
+			$(LIBNAME:.lib=.manifest) \
+             $(DLLNAME) $(DBGPATH)$(LIBBASE).pdb \
+             $(EXENAME) $(DBGPATH)$(EXEBASE).pdb \
+                        $(LIBPATH)$(EXEBASE).manifest \
              $(CLEANFILES) >nul 2>&1

Modified: harmony/enhanced/classlib/trunk/depends/build/rules.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/build/rules.mk?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/build/rules.mk (original)
+++ harmony/enhanced/classlib/trunk/depends/build/rules.mk Wed Sep 23 19:46:48 2009
@@ -54,12 +54,24 @@
 $(DLLNAME): $(BUILDFILES) $(MDLLIBFILES) $(EXPFILE)
 	$(DLL_LD) $(DLL_LDFLAGS) $(LDFLAGS) $(VMLINK) -o $@ \
 	$(BUILDFILES) $(MDLLIBARGS) $(OSLIBS)
+ifeq ($(HY_CAN_LINK_DEBUG),yes)
+	objcopy --only-keep-debug $@ $@.dbg
+	strip --strip-debug --strip-unneeded $@
+	( cd $(@D) && objcopy --add-gnu-debuglink=$(@F).dbg $(@F) )
+	-mkdir -p $(DBGPATH)
+	test "$@.dbg" = "$(DBGPATH)$(@F).dbg" || \
+		mv $@.dbg $(DBGPATH)$(@F).dbg
+endif
+ifeq ($(HY_OS),zos)
+	mv $(basename $(DLLNAME))$(HY_LINKLIB_SUFFIX) $(LIBPATH)
+endif
 
 $(EXENAME): $(BUILDFILES) $(MDLLIBFILES)
 	$(CC) $(VMLINK) $(EXELDFLAGS) \
 	$(BUILDFILES) $(MDLLIBARGS) -o $@ $(OSLIBS) \
-	$(EXERPATHPREFIX) -L$(HY_HDK)/jdk/jre/bin
+	$(EXERPATHPREFIX) -L$(DLLPATH)
+	@chmod 755 $(EXENAME)
 
 clean:
 	-rm -f $(BUILDFILES) $(DLLNAME) $(EXENAME) $(LIBNAME) $(EXPFILE) \
-	       $(CLEANFILES)
+	       $(CLEANFILES) $(DBGPATH)$(notdir $(DLLNAME)).dbg

Modified: harmony/enhanced/classlib/trunk/modules/archive/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/archive/build.xml?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/archive/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/archive/build.xml Wed Sep 23 19:46:48 2009
@@ -95,36 +95,10 @@
         
     <target name="-build-native-zlib" unless="hy.skip.zlib">
         <make dir="src/main/native/zlib/${hy.os.family}" />
-        <copy todir="${hy.jdk}/jre/bin" preservelastmodified="true">
-            <fileset dir="src/main/native/zlib">
-                <include name="*${shlib.suffix}*"/>
-                <include name="*${progdb.suffix}*" if="is.windows" />
-                <exclude name="*${manifest.suffix}"/>
-            </fileset>
-        </copy>
-        <!-- Copy link exports file on z/OS -->
-        <copy todir="${hy.hdk}/lib" preservelastmodified="true">
-            <fileset dir="src/main/native/zlib/${hy.os.family}">
-                <include name="*${linklib.suffix}" if="is.zos" />
-            </fileset>
-        </copy>
     </target>
         
     <target name="-build-native-archive">
         <make dir="src/main/native/archive/${hy.os.family}" />
-        <copy todir="${hy.jdk}/jre/bin" preservelastmodified="true">
-            <fileset dir="src/main/native/archive">
-                <include name="*${shlib.suffix}*"/>
-                <include name="*${progdb.suffix}*" if="is.windows" />
-                <exclude name="*${manifest.suffix}"/>
-            </fileset>
-        </copy>
-        <!-- Copy link exports file on z/OS -->
-        <copy todir="${hy.hdk}/lib" preservelastmodified="true">
-            <fileset dir="src/main/native/archive/${hy.os.family}">
-                <include name="*${linklib.suffix}" if="is.zos" />
-            </fileset>
-        </copy>
     </target>
     
     <target name="clean-native"

Propchange: harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/
            ('svn:ignore' removed)

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?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- 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 Sep 23 19:46:48 2009
@@ -33,7 +33,7 @@
 	$(MDLLIBZLIB) $(LIBPATH)libhypool.a \
 	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
-DLLNAME=../libhyarchive$(HY_SHLIB_SUFFIX)
+DLLNAME=$(DLLPATH)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/archive/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/windows/makefile?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/windows/makefile Wed Sep 23 19:46:48 2009
@@ -20,7 +20,7 @@
 !include <$(HY_HDK)\build\make\defines.mak>
 
 LIBBASE=hyarchive
-DLLNAME=..\$(LIBBASE).dll
+DLLNAME=$(DLLPATH)$(LIBBASE).dll
 LIBNAME=$(LIBPATH)$(LIBBASE).lib
 HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I$(SHARED)common /I..\..\zlib_dist \
 	   /I..\..\include\shared

Propchange: harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zlib/
            ('svn:ignore' removed)

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?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- 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 Sep 23 19:46:48 2009
@@ -36,7 +36,7 @@
 	$(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$(HY_SHLIB_SUFFIX)
+DLLNAME = $(DLLPATH)libhyzlib$(HY_SHLIB_SUFFIX)
 EXPNAME = HYZLIB_0.1
 
 ifeq ($(DLL_LD),$(CC))

Modified: harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zlib/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zlib/windows/makefile?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zlib/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/archive/src/main/native/zlib/windows/makefile Wed Sep 23 19:46:48 2009
@@ -20,7 +20,7 @@
 !include <$(HY_HDK)\build\make\defines.mak>
 
 LIBBASE=hyzlib
-DLLNAME=..\$(LIBBASE).dll
+DLLNAME=$(DLLPATH)$(LIBBASE).dll
 LIBNAME=$(LIBPATH)$(LIBBASE).lib
 
 ZLIB_DIST=..\..\zlib_dist\# Path to zlib

Modified: harmony/enhanced/classlib/trunk/modules/auth/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/build.xml?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/build.xml Wed Sep 23 19:46:48 2009
@@ -48,21 +48,6 @@
     <target name="build-native" depends="build-native-all" />
     <target name="build-native-all" >
         <make dir="src/main/native/auth/${hy.os.family}" />
-
-        <!-- Copy the built shared libs over to the jre/bin dir -->
-        <copy todir="${hy.jdk}/jre/bin" preservelastmodified="true">
-            <fileset dir="src/main/native/auth">
-                <include name="*${shlib.suffix}*"/>
-                <include name="*${progdb.suffix}*" if="is.windows" />
-                <exclude name="*${manifest.suffix}"/>
-            </fileset>
-        </copy>
-        <!-- Copy link exports file on z/OS -->
-        <copy todir="${hy.hdk}/lib" preservelastmodified="true">
-            <fileset dir="src/main/native/auth/${hy.os.family}">
-                <include name="*${linklib.suffix}" if="is.zos" />
-            </fileset>
-        </copy>
     </target>
     
     <target name="clean-java" depends="class-patternset">

Propchange: harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/
            ('svn:ignore' removed)

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?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- 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 Sep 23 19:46:48 2009
@@ -29,7 +29,7 @@
         $(LIBPATH)libhypool.a \
 	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
-DLLNAME = ../libhyauth$(HY_SHLIB_SUFFIX)
+DLLNAME = $(DLLPATH)libhyauth$(HY_SHLIB_SUFFIX)
 EXPNAME = HYAUTH_0.1
 
 include $(HY_HDK)/build/make/rules.mk

Modified: harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/windows/makefile?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/main/native/auth/windows/makefile Wed Sep 23 19:46:48 2009
@@ -20,7 +20,7 @@
 !include <$(HY_HDK)\build\make\defines.mak>
 
 LIBBASE=hyauth
-DLLNAME=..\$(LIBBASE).dll
+DLLNAME=$(DLLPATH)$(LIBBASE).dll
 LIBNAME=$(LIBPATH)$(LIBBASE).lib
 BUILDFILES = $(SHAREDSUB)auth_copyright.obj authwin32.obj
 VIRTFILES = $(LIBBASE).res

Modified: harmony/enhanced/classlib/trunk/modules/awt/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/build.xml?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/build.xml Wed Sep 23 19:46:48 2009
@@ -252,145 +252,30 @@
             </make-elements>
         </make>
 
-        <!-- Copy the built shared libs over to the jre/bin dir -->
-        <copy todir="${hy.jdk}/jre/bin" preservelastmodified="true">
-            <fileset dir="src/main/native/lcmm">
-                <include name="*${shlib.suffix}*"/>
-                <include name="*${progdb.suffix}*" if="is.windows" />
-                <exclude name="*${manifest.suffix}"/>
-            </fileset>
-        </copy>
-        <!-- Copy link exports file on z/OS -->
-        <copy todir="${hy.hdk}/lib" preservelastmodified="true">
-            <fileset dir="src/main/native/lcmm/${hy.os.family}">
-                <include name="*${linklib.suffix}" if="is.zos" />
-            </fileset>
-        </copy>
-
         <make dir="src/main/native/jpegdecoder/${hy.os.family}">
             <make-elements>
                 <env key="HY_JPEG_VER" value="${jpeg.ver}" />
             </make-elements>
         </make>
-        <!-- Copy the built shared libs over to the jre/bin dir -->
-        <copy todir="${hy.jdk}/jre/bin" preservelastmodified="true">
-            <fileset dir="src/main/native/jpegdecoder">
-                <include name="*${shlib.suffix}*"/>
-                <include name="*${progdb.suffix}*" if="is.windows" />
-                <exclude name="*${manifest.suffix}"/>
-            </fileset>
-        </copy>
-        <!-- Copy link exports file on z/OS -->
-        <copy todir="${hy.hdk}/lib" preservelastmodified="true">
-            <fileset dir="src/main/native/jpegdecoder/${hy.os.family}">
-                <include name="*${linklib.suffix}" if="is.zos" />
-            </fileset>
-        </copy>
 
         <make dir="src/main/native/gl/${hy.os.family}">
             <make-elements>
                 <env key="HY_PNG_VER" value="${png.ver}" />
             </make-elements>
         </make>
-
-        <!-- Copy the built shared libs over to the jre/bin dir -->
-        <copy todir="${hy.jdk}/jre/bin" preservelastmodified="true">
-            <fileset dir="src/main/native/gl">
-                <include name="*${shlib.suffix}*"/>
-                <include name="*${progdb.suffix}*" if="is.windows" />
-                <exclude name="*${manifest.suffix}"/>
-            </fileset>
-        </copy>
-        <!-- Copy link exports file on z/OS -->
-        <copy todir="${hy.hdk}/lib" preservelastmodified="true">
-            <fileset dir="src/main/native/gl/${hy.os.family}">
-                <include name="*${linklib.suffix}" if="is.zos" />
-            </fileset>
-        </copy>
         
         <make dir="src/main/native/oglwrapper/${hy.os.family}" />
-        <!-- Copy the built shared libs over to the jre/bin dir -->
-        <copy todir="${hy.jdk}/jre/bin" preservelastmodified="true">
-            <fileset dir="src/main/native/oglwrapper">
-                <include name="*${shlib.suffix}*"/>
-                <include name="*${progdb.suffix}*" if="is.windows" />
-                <exclude name="*${manifest.suffix}"/>
-            </fileset>
-        </copy>
-        <!-- Copy link exports file on z/OS -->
-        <copy todir="${hy.hdk}/lib" preservelastmodified="true">
-            <fileset dir="src/main/native/oglwrapper/${hy.os.family}">
-                <include name="*${linklib.suffix}" if="is.zos" />
-            </fileset>
-        </copy>
-
         <make dir="src/main/native/fontlib/${hy.os.family}" />
-        <!-- Copy the built shared libs over to the jre/bin dir -->
-        <copy todir="${hy.jdk}/jre/bin" preservelastmodified="true">
-            <fileset dir="src/main/native/fontlib">
-                <include name="*${shlib.suffix}*"/>
-                <include name="*${progdb.suffix}*" if="is.windows" />
-                <exclude name="*${manifest.suffix}"/>
-            </fileset>
-        </copy>
-        <!-- Copy link exports file on z/OS -->
-        <copy todir="${hy.hdk}/lib" preservelastmodified="true">
-            <fileset dir="src/main/native/fontlib/${hy.os.family}">
-                <include name="*${linklib.suffix}" if="is.zos" />
-            </fileset>
-        </copy>
     </target>
 
     <target name="-build-native-unix" if="is.unix">
         <make dir="src/main/native/x11wrapper/${hy.os.family}" />
-        <!-- Copy the built shared libs over to the jre/bin dir -->
-        <copy todir="${hy.jdk}/jre/bin" preservelastmodified="true">
-            <fileset dir="src/main/native/x11wrapper">
-                <include name="*${shlib.suffix}*"/>
-            </fileset>
-        </copy>
-        <!-- Copy link exports file on z/OS -->
-        <copy todir="${hy.hdk}/lib" preservelastmodified="true">
-            <fileset dir="src/main/native/x11wrapper/${hy.os.family}">
-                <include name="*${linklib.suffix}" if="is.zos" />
-            </fileset>
-        </copy>
-
         <make dir="src/main/native/linuxfont/${hy.os.family}" />
-        <!-- Copy the built shared libs over to the jre/bin dir -->
-        <copy todir="${hy.jdk}/jre/bin" preservelastmodified="true">
-            <fileset dir="src/main/native/linuxfont">
-                <include name="*${shlib.suffix}*"/>
-            </fileset>
-        </copy>
-        <!-- Copy link exports file on z/OS -->
-        <copy todir="${hy.hdk}/lib" preservelastmodified="true">
-            <fileset dir="src/main/native/linuxfont/${hy.os.family}">
-                <include name="*${linklib.suffix}" if="is.zos" />
-            </fileset>
-        </copy>
     </target>
 
     <target name="-build-native-windows" if="is.windows">
         <make dir="src/main/native/win32wrapper/${hy.os.family}" />
-        <!-- Copy the built shared libs over to the jre/bin dir -->
-        <copy todir="${hy.jdk}/jre/bin" preservelastmodified="true">
-            <fileset dir="src/main/native/win32wrapper">
-                <include name="*${shlib.suffix}*"/>
-                <include name="*${progdb.suffix}*" />
-                <exclude name="*${manifest.suffix}"/>
-            </fileset>
-        </copy>
-
         <make dir="src/main/native/winfont/${hy.os.family}" />
-        <!-- Copy the built shared libs over to the jre/bin dir -->
-        <copy todir="${hy.jdk}/jre/bin" preservelastmodified="true">
-            <fileset dir="src/main/native/winfont">
-                <include name="*${shlib.suffix}*"/>
-                <include name="*${progdb.suffix}*" />
-                <exclude name="*${manifest.suffix}"/>
-            </fileset>
-        </copy>
     </target>
 
     <target name="clean-native"

Propchange: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/
            ('svn:ignore' removed)

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/unix/makefile?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/unix/makefile Wed Sep 23 19:46:48 2009
@@ -41,7 +41,7 @@
 
 OSLIBS += $(STDCLIBS)
 
-DLLNAME=../libFL$(HY_LINKLIB_SUFFIX)
+DLLNAME=$(DLLPATH)libFL$(HY_LINKLIB_SUFFIX)
 EXPNAME=HYFONTLIB_0.1
 
 include $(HY_HDK)/build/make/rules.mk

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/windows/makefile?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/fontlib/windows/makefile Wed Sep 23 19:46:48 2009
@@ -16,7 +16,7 @@
 !include <$(HY_HDK)\build\make\defines.mak>
 
 LIBBASE=FL
-DLLNAME=..\$(LIBBASE).dll
+DLLNAME=$(DLLPATH)$(LIBBASE).dll
 LIBNAME=$(LIBPATH)$(LIBBASE).lib
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 

Propchange: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/
            ('svn:ignore' removed)

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?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- 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 Sep 23 19:46:48 2009
@@ -44,7 +44,7 @@
 
 OSLIBS += $(STDCLIBS) $(XLIBS)
 
-DLLNAME=../libgl$(HY_SHLIB_SUFFIX)
+DLLNAME=$(DLLPATH)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/gl/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/makefile?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/gl/windows/makefile Wed Sep 23 19:46:48 2009
@@ -19,7 +19,7 @@
 PNG_DIR=$(HY_HDK)\..\depends\libs\$(HY_PLATFORM)\png-$(HY_PNG_VER)\# avoid continuation
 
 LIBBASE=gl
-DLLNAME=..\$(LIBBASE).dll
+DLLNAME=$(DLLPATH)$(LIBBASE).dll
 LIBNAME=$(LIBPATH)$(LIBBASE).lib
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 

Propchange: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/
            ('svn:ignore' removed)

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?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- 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 Sep 23 19:46:48 2009
@@ -28,7 +28,7 @@
 MDLLIBFILES += $(LIBPATH)libhypool.a \
 	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
-DLLNAME=../libjpegdecoder$(HY_SHLIB_SUFFIX)
+DLLNAME=$(DLLPATH)libjpegdecoder$(HY_SHLIB_SUFFIX)
 EXPNAME=HYJPEGDECODER_0.1
 
 include $(HY_HDK)/build/make/rules.mk

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/makefile?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/jpegdecoder/windows/makefile Wed Sep 23 19:46:48 2009
@@ -18,7 +18,7 @@
 JPEG_DIR=$(HY_HDK)\..\depends\libs\$(HY_PLATFORM)\jpeg-$(HY_JPEG_VER)\# avoid continuation
 
 LIBBASE=jpegdecoder
-DLLNAME=..\$(LIBBASE).dll
+DLLNAME=$(DLLPATH)$(LIBBASE).dll
 LIBNAME=$(LIBPATH)$(LIBBASE).lib
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 

Propchange: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/
            ('svn:ignore' removed)

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?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- 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 Sep 23 19:46:48 2009
@@ -33,7 +33,7 @@
 MDLLIBFILES += $(LIBPATH)libhypool.a \
 	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
-DLLNAME=../liblcmm$(HY_SHLIB_SUFFIX)
+DLLNAME=$(DLLPATH)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/lcmm/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/windows/makefile?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/lcmm/windows/makefile Wed Sep 23 19:46:48 2009
@@ -18,7 +18,7 @@
 LCMS_DIR=$(HY_HDK)\..\depends\libs\$(HY_PLATFORM)\lcms-$(HY_LCMS_VER)\# avoid continuation
 
 LIBBASE=lcmm
-DLLNAME=..\$(LIBBASE).dll
+DLLNAME=$(DLLPATH)$(LIBBASE).dll
 LIBNAME=$(LIBPATH)$(LIBBASE).lib
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 

Propchange: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/
            ('svn:ignore' removed)

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?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- 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 Sep 23 19:46:48 2009
@@ -31,11 +31,12 @@
 endif
 
 MDLLIBFILES += $(LIBPATH)libhypool.a \
-	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX) ../../fontlib/libFL$(HY_LINKLIB_SUFFIX)
+	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX) \
+	$(DLLPATH)libFL$(HY_LINKLIB_SUFFIX)
 
 OSLIBS += $(XLIBS)
 
-DLLNAME=../liblinuxfont$(HY_SHLIB_SUFFIX)
+DLLNAME=$(DLLPATH)liblinuxfont$(HY_SHLIB_SUFFIX)
 EXPNAME=HYLINUXFONT_0.1
 
 include $(HY_HDK)/build/make/rules.mk

Propchange: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/
            ('svn:ignore' removed)

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?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- 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 Sep 23 19:46:48 2009
@@ -29,7 +29,7 @@
 
 OSLIBS += $(STDCLIBS)
 
-DLLNAME=../liboglwrapper$(HY_SHLIB_SUFFIX)
+DLLNAME=$(DLLPATH)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/oglwrapper/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/windows/makefile?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/oglwrapper/windows/makefile Wed Sep 23 19:46:48 2009
@@ -16,7 +16,7 @@
 !include <$(HY_HDK)\build\make\defines.mak>
 
 LIBBASE=oglwrapper
-DLLNAME=..\$(LIBBASE).dll
+DLLNAME=$(DLLPATH)$(LIBBASE).dll
 LIBNAME=$(LIBPATH)$(LIBBASE).lib
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 

Propchange: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/win32wrapper/
            ('svn:ignore' removed)

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/win32wrapper/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/win32wrapper/windows/makefile?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/win32wrapper/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/win32wrapper/windows/makefile Wed Sep 23 19:46:48 2009
@@ -16,7 +16,7 @@
 !include <$(HY_HDK)\build\make\defines.mak>
 
 LIBBASE=Win32Wrapper
-DLLNAME=..\$(LIBBASE).dll
+DLLNAME=$(DLLPATH)$(LIBBASE).dll
 LIBNAME=$(LIBPATH)$(LIBBASE).lib
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 

Propchange: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/
            ('svn:ignore' removed)

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/makefile?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/native/winfont/windows/makefile Wed Sep 23 19:46:48 2009
@@ -18,7 +18,7 @@
 !include <$(HY_HDK)\build\make\defines.mak>
 
 LIBBASE=fontlib
-DLLNAME=..\$(LIBBASE).dll
+DLLNAME=$(DLLPATH)$(LIBBASE).dll
 LIBNAME=$(LIBPATH)$(LIBBASE).lib
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 

Propchange: harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/
            ('svn:ignore' removed)

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?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- 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 Sep 23 19:46:48 2009
@@ -32,7 +32,7 @@
 
 OSLIBS += $(STDCLIBS) $(XLIBS)
 
-DLLNAME=../libX11Wrapper$(HY_SHLIB_SUFFIX)
+DLLNAME=$(DLLPATH)libX11Wrapper$(HY_SHLIB_SUFFIX)
 EXPNAME=HYX11WRAPPER_0.1
 
 include $(HY_HDK)/build/make/rules.mk

Modified: harmony/enhanced/classlib/trunk/modules/imageio/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/imageio/build.xml?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/imageio/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/imageio/build.xml Wed Sep 23 19:46:48 2009
@@ -154,40 +154,12 @@
                 <env key="HY_JPEG_VER" value="${jpeg.ver}" />
             </make-elements>
         </make>
-        <!-- Copy the built shared libs over to the jre/bin dir -->
-        <copy todir="${hy.jdk}/jre/bin" preservelastmodified="true">
-            <fileset dir="src/main/native/jpegencoder/">
-                <include name="*${shlib.suffix}*"/>
-                <include name="*${progdb.suffix}*" if="is.windows" />
-                <exclude name="*${manifest.suffix}"/>
-            </fileset>
-        </copy>
-        <!-- Copy link exports file on z/OS -->
-        <copy todir="${hy.hdk}/lib" preservelastmodified="true">
-            <fileset dir="src/main/native/jpegencoder/${hy.os.family}">
-                <include name="*${linklib.suffix}" if="is.zos" />
-            </fileset>
-        </copy>
 
         <make dir="src/main/native/pngencoder/${hy.os.family}">
             <make-elements>
                 <env key="HY_PNG_VER" value="${png.ver}" />
             </make-elements>
         </make>
-        <!-- Copy the built shared libs over to the jre/bin dir -->
-        <copy todir="${hy.jdk}/jre/bin" preservelastmodified="true">
-            <fileset dir="src/main/native/pngencoder/">
-                <include name="*${shlib.suffix}*"/>
-                <include name="*${progdb.suffix}*" if="is.windows" />
-                <exclude name="*${manifest.suffix}"/>
-            </fileset>
-        </copy>
-        <!-- Copy link exports file on z/OS -->
-        <copy todir="${hy.hdk}/lib" preservelastmodified="true">
-            <fileset dir="src/main/native/pngencoder/${hy.os.family}">
-                <include name="*${linklib.suffix}" if="is.zos" />
-            </fileset>
-        </copy>
     </target>
 
     <target name="build-jar" depends="svn-info,class-patternset">

Propchange: harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/
            ('svn:ignore' removed)

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?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- 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 Sep 23 19:46:48 2009
@@ -32,7 +32,7 @@
 MDLLIBFILES += $(LIBPATH)libhypool.a \
 	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
-DLLNAME=../libjpegencoder$(HY_SHLIB_SUFFIX)
+DLLNAME=$(DLLPATH)libjpegencoder$(HY_SHLIB_SUFFIX)
 EXPNAME=HYJPEGENCODER_0.1
 
 include $(HY_HDK)/build/make/rules.mk

Modified: harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/makefile?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/jpegencoder/windows/makefile Wed Sep 23 19:46:48 2009
@@ -18,7 +18,7 @@
 JPEG_DIR=$(HY_HDK)\..\depends\libs\$(HY_PLATFORM)\jpeg-$(HY_JPEG_VER)\# avoid continuation
 
 LIBBASE=jpegencoder
-DLLNAME=..\$(LIBBASE).dll
+DLLNAME=$(DLLPATH)$(LIBBASE).dll
 LIBNAME=$(LIBPATH)$(LIBBASE).lib
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 

Propchange: harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/pngencoder/
            ('svn:ignore' removed)

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?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- 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 Sep 23 19:46:48 2009
@@ -39,7 +39,7 @@
 MDLLIBFILES += $(MDLLIBZLIB)
 endif
 
-DLLNAME=../libpngencoder$(HY_SHLIB_SUFFIX)
+DLLNAME=$(DLLPATH)libpngencoder$(HY_SHLIB_SUFFIX)
 EXPNAME=HYPNGENCODER_0.1
 
 include $(HY_HDK)/build/make/rules.mk

Modified: harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/pngencoder/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/pngencoder/windows/makefile?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/pngencoder/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/imageio/src/main/native/pngencoder/windows/makefile Wed Sep 23 19:46:48 2009
@@ -18,7 +18,7 @@
 PNG_DIR=$(HY_HDK)\..\depends\libs\$(HY_PLATFORM)\png-$(HY_PNG_VER)\# avoid continuation
 
 LIBBASE=pngencoder
-DLLNAME=..\$(LIBBASE).dll
+DLLNAME=$(DLLPATH)$(LIBBASE).dll
 LIBNAME=$(LIBPATH)$(LIBBASE).lib
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 

Modified: harmony/enhanced/classlib/trunk/modules/instrument/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/instrument/build.xml?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/instrument/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/instrument/build.xml Wed Sep 23 19:46:48 2009
@@ -47,21 +47,6 @@
     <target name="build-native" depends="build-native-all" />
     <target name="build-native-all" >
         <make dir="src/main/native/instrument/${hy.os.family}" />
-
-        <!-- Copy the built shared libs over to the jre/bin dir -->
-        <copy todir="${hy.jdk}/jre/bin" preservelastmodified="true">
-            <fileset dir="src/main/native/instrument">
-                <include name="*${shlib.suffix}*" />
-                <include name="*${progdb.suffix}*" if="is.windows" />
-                <exclude name="*${manifest.suffix}*" />
-            </fileset>
-        </copy>
-        <!-- Copy link exports file on z/OS -->
-        <copy todir="${hy.hdk}/lib" preservelastmodified="true">
-            <fileset dir="src/main/native/instrument/${hy.os.family}">
-                <include name="*${linklib.suffix}" if="is.zos" />
-            </fileset>
-        </copy>
     </target>
     
     <target name="clean-java" depends="class-patternset">

Propchange: harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/
            ('svn:ignore' removed)

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?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- 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 Sep 23 19:46:48 2009
@@ -30,7 +30,7 @@
 	$(LIBPATH)libhypool.a \
 	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
-DLLNAME = ../libhyinstrument$(HY_SHLIB_SUFFIX)
+DLLNAME = $(DLLPATH)libhyinstrument$(HY_SHLIB_SUFFIX)
 EXPNAME = HYINSTRUMENT_0.1
 
 include $(HY_HDK)/build/make/rules.mk

Modified: harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/windows/makefile?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/instrument/src/main/native/instrument/windows/makefile Wed Sep 23 19:46:48 2009
@@ -20,7 +20,7 @@
 !include <$(HY_HDK)\build\make\defines.mak>
 
 LIBBASE=hyinstrument
-DLLNAME=..\$(LIBBASE).dll
+DLLNAME=$(DLLPATH)$(LIBBASE).dll
 LIBNAME=$(LIBPATH)$(LIBBASE).lib
 HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I$(SHARED)common /I$(SHARED)fdlibm
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def

Modified: harmony/enhanced/classlib/trunk/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/build.xml?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/build.xml Wed Sep 23 19:46:48 2009
@@ -93,19 +93,6 @@
 
         <!-- Build luni dll -->
         <make dir="src/main/native/luni/${hy.os.family}" />
-        <copy todir="${hy.jdk}/jre/bin" preservelastmodified="true">
-            <fileset dir="src/main/native/luni">
-                <include name="*${shlib.suffix}*" />
-                <include name="*${progdb.suffix}*" if="is.windows" />
-                <exclude name="*${manifest.suffix}"/>
-            </fileset>
-        </copy>
-        <!-- Copy link exports file on z/OS -->
-        <copy todir="${hy.hdk}/lib" preservelastmodified="true">
-            <fileset dir="src/main/native/luni/${hy.os.family}">
-                <include name="*${linklib.suffix}" if="is.zos" />
-            </fileset>
-        </copy>
 
         <!-- Build vmls lib -->
         <make dir="src/main/native/vmls/${hy.os.family}" />
@@ -117,21 +104,8 @@
     </target>
 
     <target name="-build-native-secondary2" >
-
         <!-- Build launcher executables -->
         <make dir="src/main/native/launcher/${hy.os.family}" />
-
-        <!-- Copy across the built executables -->
-        <copy todir="${hy.jdk}/jre/bin" preservelastmodified="true">
-            <fileset dir="src/main/native/launcher">
-                <patternset includes="java${exe.suffix}" />
-                <patternset includes="javaw${exe.suffix}" />
-                <include name="*${progdb.suffix}*" if="is.windows" />
-            </fileset>
-        </copy>
-
-        <!-- Make sure the Linux launcher has execute permission -->
-        <chmod file="${hy.jdk}/jre/bin/java${exe.suffix}" perm="ugo+x" />
     </target>
 
     <!-- Overlay OSS packages into their required locations -->

Propchange: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/
            ('svn:ignore' removed)

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javae
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javae?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javae (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javae Wed Sep 23 19:46:48 2009
@@ -19,7 +19,8 @@
 
 !include <$(HY_HDK)\build\make\defines.mak>
 
-EXENAME=$(EXEPATH)java.exe
+EXEBASE=java
+EXENAME=$(EXEPATH)$(EXEBASE).exe
 HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB)
 
 BUILDFILES = $(SHAREDSUB)launcher_copyright.obj $(SHAREDSUB)cmain.obj \

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javaw
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javaw?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javaw (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/launcher/windows/makefile.javaw Wed Sep 23 19:46:48 2009
@@ -19,7 +19,8 @@
 
 !include <$(HY_HDK)\build\make\defines.mak>
 
-EXENAME=$(EXEPATH)javaw.exe
+EXEBASE=javaw
+EXENAME=$(EXEPATH)$(EXEBASE).exe
 HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB)
 
 BUILDFILES = $(SHAREDSUB)launcher_copyright.obj $(SHAREDSUB)main.obj \

Propchange: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/
            ('svn:ignore' removed)

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?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- 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 Sep 23 19:46:48 2009
@@ -47,7 +47,7 @@
 MDLLIBFILES += $(LIBPATH)libhypool.a $(LIBPATH)libhyfdlibm.a \
 	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
-DLLNAME = ../libhyluni$(HY_SHLIB_SUFFIX)
+DLLNAME = $(DLLPATH)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/luni/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/windows/makefile?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/windows/makefile Wed Sep 23 19:46:48 2009
@@ -20,7 +20,7 @@
 !include <$(HY_HDK)\build\make\defines.mak>
 
 LIBBASE=hyluni
-DLLNAME=..\$(LIBBASE).dll
+DLLNAME=$(DLLPATH)$(LIBBASE).dll
 LIBNAME=$(LIBPATH)$(LIBBASE).lib
 HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB)
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def

Propchange: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/vmi/
            ('svn:ignore' removed)

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?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- 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 Sep 23 19:46:48 2009
@@ -24,5 +24,6 @@
 
 DLLNAME = ../libvmi$(HY_SHLIB_SUFFIX)
 EXPNAME = VMI_0.1
+HY_CAN_LINK_DEBUG=no
 
 include $(HY_HDK)/build/make/rules.mk

Modified: harmony/enhanced/classlib/trunk/modules/misc/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/misc/build.xml?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/misc/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/misc/build.xml Wed Sep 23 19:46:48 2009
@@ -110,21 +110,6 @@
     <target name="build-native" depends="build-native-all" />
     <target name="build-native-all" >
         <make dir="src/main/native/accessors/${hy.os.family}" />
-
-        <!-- Copy the built shared libs over to the jre/bin dir -->
-        <copy todir="${hy.jdk}/jre/bin" preservelastmodified="true">
-            <fileset dir="src/main/native/accessors">
-                <include name="*${shlib.suffix}*"/>
-                <include name="*${progdb.suffix}*" if="is.windows" />
-                <exclude name="*${manifest.suffix}"/>
-            </fileset>
-        </copy>
-        <!-- Copy link exports file on z/OS -->
-        <copy todir="${hy.hdk}/lib" preservelastmodified="true">
-            <fileset dir="src/main/native/accessors/${hy.os.family}">
-                <include name="*${linklib.suffix}" if="is.zos" />
-            </fileset>
-        </copy>
     </target>
     
     <target name="test-jar" depends="svn-info,compile-tests">

Propchange: harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/
            ('svn:ignore' removed)

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?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- 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 Sep 23 19:46:48 2009
@@ -31,7 +31,7 @@
 MDLLIBFILES += $(LIBPATH)libhypool.a \
 	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
-DLLNAME=../libaccessors$(HY_SHLIB_SUFFIX)
+DLLNAME=$(DLLPATH)libaccessors$(HY_SHLIB_SUFFIX)
 EXPNAME=HYMISC_0.1
 
 include $(HY_HDK)/build/make/rules.mk

Modified: harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/windows/makefile?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/misc/src/main/native/accessors/windows/makefile Wed Sep 23 19:46:48 2009
@@ -16,7 +16,7 @@
 !include <$(HY_HDK)\build\make\defines.mak>
 
 LIBBASE=accessors
-DLLNAME=..\$(LIBBASE).dll
+DLLNAME=$(DLLPATH)$(LIBBASE).dll
 LIBNAME=$(LIBPATH)$(LIBBASE).lib
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 

Modified: harmony/enhanced/classlib/trunk/modules/nio/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio/build.xml?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/nio/build.xml Wed Sep 23 19:46:48 2009
@@ -47,21 +47,6 @@
     <target name="build-native" depends="build-native-all" />
     <target name="build-native-all" >
         <make dir="src/main/native/nio/${hy.os.family}" />
-
-        <!-- Copy the built shared libs over to the jre/bin dir -->
-        <copy todir="${hy.jdk}/jre/bin" preservelastmodified="true">
-            <fileset dir="src/main/native/nio">
-                <include name="*${shlib.suffix}*" />
-                <include name="*${progdb.suffix}*" if="is.windows" />
-                <exclude name="*${manifest.suffix}" />
-            </fileset>
-        </copy>
-        <!-- Copy link exports file on z/OS -->
-        <copy todir="${hy.hdk}/lib" preservelastmodified="true">
-            <fileset dir="src/main/native/nio/${hy.os.family}">
-                <include name="*${linklib.suffix}" if="is.zos" />
-            </fileset>
-        </copy>
     </target>
 
     <target name="clean-java" depends="class-patternset">

Propchange: harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/
            ('svn:ignore' removed)

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?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- 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 Sep 23 19:46:48 2009
@@ -33,7 +33,7 @@
 	$(LIBPATH)libhycommon.a \
 	$(LIBPATH)libhypool.a
 
-DLLNAME = ../libhynio$(HY_SHLIB_SUFFIX)
+DLLNAME = $(DLLPATH)libhynio$(HY_SHLIB_SUFFIX)
 EXPNAME = HYNIO_0.1
 
 include $(HY_HDK)/build/make/rules.mk

Modified: harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/windows/makefile?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/nio/src/main/native/nio/windows/makefile Wed Sep 23 19:46:48 2009
@@ -20,7 +20,7 @@
 !include <$(HY_HDK)\build\make\defines.mak>
 
 LIBBASE=hynio
-DLLNAME=..\$(LIBBASE).dll
+DLLNAME=$(DLLPATH)$(LIBBASE).dll
 LIBNAME=$(LIBPATH)$(LIBBASE).lib
 HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I$(SHARED)common /I$(SHARED)fdlibm
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def

Modified: harmony/enhanced/classlib/trunk/modules/nio_char/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio_char/build.xml?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio_char/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/nio_char/build.xml Wed Sep 23 19:46:48 2009
@@ -32,15 +32,7 @@
     <!-- Build natives.-->
     <target name="build-native" depends="build-native-all" />
     <target name="build-native-all" >
-
         <make dir="src/main/native/niochar/${hy.os.family}" />
-
-        <!-- Copy the built shared libs over to the jre/bin dir -->
-        <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
-            <fileset dir="src/main/native/niochar">
-                <patternset includes="*${shlib.suffix}*" />
-            </fileset>
-        </copy>
     </target>
 
     <target name="test" depends="-test-module">

Propchange: harmony/enhanced/classlib/trunk/modules/nio_char/src/main/native/niochar/
            ('svn:ignore' removed)

Modified: harmony/enhanced/classlib/trunk/modules/nio_char/src/main/native/niochar/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio_char/src/main/native/niochar/unix/makefile?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio_char/src/main/native/niochar/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/nio_char/src/main/native/niochar/unix/makefile Wed Sep 23 19:46:48 2009
@@ -114,9 +114,7 @@
   ../shared/additional/x_MS950_HKSCS.o \
   ../shared/additional/x_windows_949.o 
 
-
-DLLNAME = ../libhyniochar$(HY_SHLIB_SUFFIX)
-
+DLLNAME = $(DLLPATH)libhyniochar$(HY_SHLIB_SUFFIX)
 MDLLIBFILES += $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 include $(HY_HDK)/build/make/rules.mk

Modified: harmony/enhanced/classlib/trunk/modules/nio_char/src/main/native/niochar/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio_char/src/main/native/niochar/windows/makefile?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio_char/src/main/native/niochar/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/nio_char/src/main/native/niochar/windows/makefile Wed Sep 23 19:46:48 2009
@@ -20,7 +20,7 @@
 !include <$(HY_HDK)\build\make\defines.mak>
 
 LIBBASE=hyniochar
-DLLNAME=..\$(LIBBASE).dll
+DLLNAME=$(DLLPATH)$(LIBBASE).dll
 LIBNAME=$(LIBPATH)$(LIBBASE).lib
 HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I$(SHARED)common /I$(SHARED)fdlibm
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def 

Modified: harmony/enhanced/classlib/trunk/modules/portlib/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/build.xml?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/build.xml Wed Sep 23 19:46:48 2009
@@ -135,18 +135,6 @@
     <target name="-build-ascii-ebcdic" if="is.zos" >
         <!-- Build a2e lib for zOS platforms -->
         <make dir="src/main/native/a2e/${hy.os.family}" />
-
-        <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
-            <fileset dir="src/main/native/a2e">
-                <include name="*${shlib.suffix}*" />
-                <exclude name="*${manifest.suffix}"/>
-            </fileset>
-        </copy>
-        <copy todir="${hy.hdk}/lib" overwrite="yes">
-            <fileset dir="src/main/native/a2e/${hy.os.family}">
-                <include name="*${linklib.suffix}" if="is.zos" />
-            </fileset>
-        </copy>
     </target>
 
     <target name="-build-native-thread" unless="hy.skip.thr">
@@ -176,37 +164,11 @@
     <target name="-build-native-thrstub" if="hy.skip.thr">
         <!-- Build thread dll -->
         <make dir="src/main/native/thrstub/${hy.os.family}" />
-
-        <copy todir="${hy.hdk}/lib" preservelastmodified="true">
-            <fileset dir="src/main/native/thrstub">
-                <include name="*${shlib.suffix}*" />
-                <include name="*${progdb.suffix}*" if="is.windows" />
-                <exclude name="*${manifest.suffix}"/>
-            </fileset>
-            <!-- Copy link exports file on z/OS -->
-            <fileset dir="src/main/native/thrstub/${hy.os.family}">
-                <include name="*${linklib.suffix}" if="is.zos" />
-            </fileset>
-        </copy>
     </target>
 
     <target name="-build-native-port">
         <!-- Build port dll -->
         <make dir="src/main/native/port/${hy.os.family}" />
-
-        <copy todir="${hy.jdk}/jre/bin" preservelastmodified="true">
-            <fileset dir="src/main/native/port">
-                <include name="*${shlib.suffix}*" />
-                <include name="*${progdb.suffix}*" if="is.windows" />
-                <exclude name="*${manifest.suffix}"/>
-            </fileset>
-        </copy>
-        <!-- Copy link exports file on z/OS -->
-        <copy todir="${hy.hdk}/lib" preservelastmodified="true">
-            <fileset dir="src/main/native/port/${hy.os.family}">
-                <include name="*${linklib.suffix}" if="is.zos" />
-            </fileset>
-        </copy>
     </target>
 
     <!-- Clean natives -->

Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/a2e/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/a2e/unix/makefile?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/a2e/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/a2e/unix/makefile Wed Sep 23 19:46:48 2009
@@ -25,7 +25,7 @@
 
 MDLLIBFILES =
 
-DLLNAME = ../libhya2e$(HY_SHLIB_SUFFIX)
+DLLNAME = $(DLLPATH)libhya2e$(HY_SHLIB_SUFFIX)
 LIBNAME = $(LIBPATH)libhya2e.a
 
 include $(HY_HDK)/build/make/rules.mk

Propchange: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/
            ('svn:ignore' removed)

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?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- 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 Sep 23 19:46:48 2009
@@ -41,7 +41,7 @@
 ifeq ($(HY_NO_THR),true)
 MDLLIBFILES += $(LIBPATH)libhythr$(HY_LINKLIB_SUFFIX)
 endif
-DLLNAME = ../libhyprt$(HY_SHLIB_SUFFIX)
+DLLNAME = $(DLLPATH)libhyprt$(HY_SHLIB_SUFFIX)
 EXPNAME = HYPRT_0.1
 
 include $(HY_HDK)/build/make/rules.mk

Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/windows/makefile?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/windows/makefile Wed Sep 23 19:46:48 2009
@@ -20,7 +20,7 @@
 !include <$(HY_HDK)\build\make\defines.mak>
 
 LIBBASE=hyprt
-DLLNAME=..\$(LIBBASE).dll
+DLLNAME=$(DLLPATH)$(LIBBASE).dll
 LIBNAME=$(LIBPATH)$(LIBBASE).lib
 
 HYCFLAGS = $(HYCFLAGS) -DHYPORT_LIBRARY_DEFINE /I$(SHAREDSUB)

Propchange: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/
            ('svn:ignore' removed)

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?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- 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 Sep 23 19:46:48 2009
@@ -28,5 +28,6 @@
 MDLLIBFILES = $(LIBPATH)libhypool.a $(LIBPATH)libhycommon.a
 DLLNAME = ../libhythr$(HY_SHLIB_SUFFIX)
 EXPNAME = HYTHR_0.2
+HY_CAN_LINK_DEBUG=no
 
 include $(HY_HDK)/build/make/rules.mk

Propchange: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thrstub/
            ('svn:ignore' removed)

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?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- 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 Sep 23 19:46:48 2009
@@ -21,7 +21,8 @@
 
 BUILDFILES = $(SHAREDSUB)hythread.o
 
-DLLNAME = ../libhythr$(HY_SHLIB_SUFFIX)
+DLLNAME = $(LIBPATH)libhythr$(HY_SHLIB_SUFFIX)
+DBGPATH = $(LIBPATH)
 EXPNAME = HYTHR_0.2
 
 include $(HY_HDK)/build/make/rules.mk

Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thrstub/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thrstub/windows/makefile?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thrstub/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thrstub/windows/makefile Wed Sep 23 19:46:48 2009
@@ -20,8 +20,9 @@
 !include <$(HY_HDK)\build\make\defines.mak>
 
 LIBBASE=hythr
-DLLNAME=..\$(LIBBASE).dll
+DLLNAME=$(LIBPATH)$(LIBBASE).dll
 LIBNAME=$(LIBPATH)$(LIBBASE).lib
+DBGPATH=$(LIBPATH)
 
 BUILDFILES = $(SHAREDSUB)hythread.obj
 

Modified: harmony/enhanced/classlib/trunk/modules/prefs/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/prefs/build.xml?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/prefs/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/prefs/build.xml Wed Sep 23 19:46:48 2009
@@ -50,15 +50,6 @@
     <target name="build-native" depends="build-native-all" />
     <target name="build-native-all" if="is.windows">
         <make dir="src/main/native/prefs/${hy.os.family}" />
-
-        <!-- Copy the built shared libs over to the jre/bin dir -->
-        <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
-            <fileset dir="src/main/native/prefs">
-                <include name="*${shlib.suffix}*"/>
-                <include name="*${progdb.suffix}*" if="is.windows" />
-                <exclude name="*${manifest.suffix}"/>
-            </fileset>
-        </copy>
     </target>
 
     <target name="clean-java" depends="class-patternset">

Propchange: harmony/enhanced/classlib/trunk/modules/prefs/src/main/native/prefs/
            ('svn:ignore' removed)

Modified: harmony/enhanced/classlib/trunk/modules/prefs/src/main/native/prefs/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/prefs/src/main/native/prefs/windows/makefile?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/prefs/src/main/native/prefs/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/prefs/src/main/native/prefs/windows/makefile Wed Sep 23 19:46:48 2009
@@ -20,7 +20,7 @@
 !include <$(HY_HDK)\build\make\defines.mak>
 
 LIBBASE=hyprefs
-DLLNAME=..\$(LIBBASE).dll
+DLLNAME=$(DLLPATH)$(LIBBASE).dll
 LIBNAME=$(LIBPATH)$(LIBBASE).lib
 HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB)
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def

Modified: harmony/enhanced/classlib/trunk/modules/print/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/print/build.xml?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/print/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/print/build.xml Wed Sep 23 19:46:48 2009
@@ -88,14 +88,6 @@
     <target name="build-native" depends="build-native-all" />
     <target name="build-native-all" if="is.windows">
         <make dir="src/main/native/print/${hy.os.family}" />
-        <!-- Copy the built shared libs over to the jre/bin dir -->
-        <copy todir="${hy.jdk}/jre/bin" preservelastmodified="true">
-            <fileset dir="src/main/native/print/">
-                <include name="*${shlib.suffix}*"/>
-                <include name="*${progdb.suffix}*" if="is.windows" />
-                <exclude name="*${manifest.suffix}"/>
-            </fileset>
-        </copy>
     </target>
 
     <target name="build-jar" depends="svn-info,class-patternset">

Propchange: harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/
            ('svn:ignore' removed)

Modified: harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/windows/makefile?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/print/src/main/native/print/windows/makefile Wed Sep 23 19:46:48 2009
@@ -16,7 +16,7 @@
 !include <$(HY_HDK)\build\make\defines.mak>
 
 LIBBASE=print
-DLLNAME=..\$(LIBBASE).dll
+DLLNAME=$(DLLPATH)$(LIBBASE).dll
 LIBNAME=$(LIBPATH)$(LIBBASE).lib
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 

Modified: harmony/enhanced/classlib/trunk/modules/security/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/build.xml?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/security/build.xml Wed Sep 23 19:46:48 2009
@@ -50,19 +50,6 @@
     <target name="build-native" depends="build-native-all" />
     <target name="build-native-all" if="native.present" >
         <make dir="src/main/native/security/${hy.os.family}" />
-
-        <!-- Copy the built shared libs over to the jre/bin dir -->
-        <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
-            <fileset dir="src/main/native/security">
-                <include name="*${shlib.suffix}*"/>
-                <include name="*${progdb.suffix}*" if="is.windows" />
-                <exclude name="*${manifest.suffix}"/>
-            </fileset>
-            <!-- Copy link exports file on z/OS -->
-            <fileset dir="src/main/native/security/${hy.os.family}">
-                <include name="*${linklib.suffix}*" if="is.zos" />
-            </fileset>
-        </copy>
     </target>
     
     <target name="clean-java" depends="class-patternset">

Propchange: harmony/enhanced/classlib/trunk/modules/security/src/main/native/security/
            ('svn:ignore' removed)

Modified: harmony/enhanced/classlib/trunk/modules/security/src/main/native/security/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/src/main/native/security/unix/makefile?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security/src/main/native/security/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/security/src/main/native/security/unix/makefile Wed Sep 23 19:46:48 2009
@@ -22,7 +22,7 @@
 BUILDFILES = \
 	$(SHAREDSUB)security_copyright.o getUnixSystemRandom.o
 
-DLLNAME = ../libhysecurity$(HY_SHLIB_SUFFIX)
+DLLNAME = $(DLLPATH)libhysecurity$(HY_SHLIB_SUFFIX)
 EXPNAME = HYSECURITY_0.1
 
 MDLLIBFILES += $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)

Modified: harmony/enhanced/classlib/trunk/modules/security/src/main/native/security/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/src/main/native/security/windows/makefile?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security/src/main/native/security/windows/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/security/src/main/native/security/windows/makefile Wed Sep 23 19:46:48 2009
@@ -20,7 +20,7 @@
 !include <$(HY_HDK)\build\make\defines.mak>
 
 LIBBASE=hysecurity
-DLLNAME=..\$(LIBBASE).dll
+DLLNAME=$(DLLPATH)$(LIBBASE).dll
 LIBNAME=$(LIBPATH)$(LIBBASE).lib
 BUILDFILES = $(SHAREDSUB)security_copyright.obj getWindowsRandom.obj
 VIRTFILES = $(LIBBASE).res

Modified: harmony/enhanced/common_resources/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/common_resources/trunk/make/properties.xml?rev=818225&r1=818224&r2=818225&view=diff
==============================================================================
--- harmony/enhanced/common_resources/trunk/make/properties.xml (original)
+++ harmony/enhanced/common_resources/trunk/make/properties.xml Wed Sep 23 19:46:48 2009
@@ -262,12 +262,14 @@
     <macrodef name="make">
         <attribute name="dir" />
         <attribute name="target" default="" />
+        <element name="make-elements" optional="true" />
         <sequential>
             <echo>Making "@{target}" in @{dir}</echo>
             <exec failonerror="true"
                   executable="${make.command}"
                   dir="@{dir}">
                 <env key="HY_ZIP_API" value="${hy.zip.api}" />
+                <env key="HY_PORTLIB_STUBS" value="${hy.portlib.stubs}" />
                 <env key="HY_HDK" value="${hy.hdk}" />
                 <env key="HY_CFG" value="${hy.cfg}" />
                 <env key="HY_ARCH" value="${hy.arch}" />
@@ -280,6 +282,7 @@
                 <env key="HY_LINKLIB_SUFFIX" value="${linklib.suffix}" />
                 <arg line="${make.arg}" />
                 <arg line="@{target}" />
+                <make-elements />
             </exec>
         </sequential>
     </macrodef>



Mime
View raw message