You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2006/06/16 19:24:56 UTC
svn commit: r414865 - in /incubator/harmony/enhanced/classlib/trunk:
depends/build/ native-src/ native-src/linux.IA32/
native-src/linux.IA32/archive/ native-src/linux.IA32/auth/
native-src/linux.IA32/common/ native-src/linux.IA32/fdlibm/ native-src/lin...
Author: hindessm
Date: Fri Jun 16 10:24:54 2006
New Revision: 414865
URL: http://svn.apache.org/viewvc?rev=414865&view=rev
Log:
Applied patch from '[#HARMONY-613] [classlib] Move makefile includes to a
shared location at build time'.
Added:
incubator/harmony/enhanced/classlib/trunk/depends/build/
incubator/harmony/enhanced/classlib/trunk/depends/build/defines.mak
- copied unchanged from r414860, incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/defines.mak
incubator/harmony/enhanced/classlib/trunk/depends/build/makefile.include
- copied unchanged from r414860, incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/makefile.include
incubator/harmony/enhanced/classlib/trunk/depends/build/rules.mak
- copied unchanged from r414860, incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/rules.mak
incubator/harmony/enhanced/classlib/trunk/depends/build/rules.mk
- copied unchanged from r414860, incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/rules.mk
Removed:
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/makefile.include
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/rules.mk
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/defines.mak
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/rules.mak
Modified:
incubator/harmony/enhanced/classlib/trunk/native-src/build.xml
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/archive/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/auth/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/common/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/fdlibm/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/launcher/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/pool/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/port/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/sig/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/text/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/thread/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/vmi/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/vmls/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zlib/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/archive/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/auth/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/common/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/fdlibm/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/makefile.javae
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/makefile.javaw
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/pool/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/port/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/prefs/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/sig/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/text/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/thread/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/vmi/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/vmls/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/zip/makefile
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/zlib/makefile
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/build.xml?rev=414865&r1=414864&r2=414865&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/build.xml Fri Jun 16 10:24:54 2006
@@ -52,6 +52,7 @@
<target name="properties" depends="init, windows-properties, linux-properties">
<property name="hy.hdk" location="${basedir}/../deploy" />
<property name="hy.jdk" location="${hy.hdk}/jdk" />
+ <property name="depends.build" location="../depends/build" />
<property name="depends.oss" location="../depends/oss" />
<property name="depends.libs" location="../depends/libs/${target.platform}" />
<property name="depends.files" location="../depends/files" />
@@ -108,6 +109,8 @@
<target name="make-all" depends="properties">
<mkdir dir="${native.lib.target}"/>
+ <antcall target="copy-makefile-includes" />
+
<exec failonerror="true"
executable="${make.command}"
dir="${target.platform}">
@@ -121,6 +124,8 @@
target: make-clean
================================= -->
<target name="make-clean" depends="properties">
+ <antcall target="copy-makefile-includes" />
+
<exec failonerror="true"
executable="${make.command}"
dir="${target.platform}">
@@ -129,6 +134,8 @@
</exec>
<delete dir="${native.lib.target}" />
+
+ <antcall target="clean-makefile-includes" />
</target>
@@ -230,6 +237,28 @@
target="clean.native.includes" />
<ant dir="${basedir}/../modules/luni" antfile="make/build.xml"
target="clean.native.includes" />
+ </target>
+
+ <!-- =================================
+ target: copy-makefile-includes
+ ================================= -->
+ <target name="copy-makefile-includes" depends="properties" >
+ <!-- copy generic defines and rules for each platform into a shared
+ place -->
+ <mkdir dir="${hy.hdk}/build" />
+ <copy todir="${hy.hdk}/build" overwrite="yes">
+ <fileset dir="${depends.build}">
+ <include name="*" />
+ </fileset>
+ </copy>
+ </target>
+
+ <!-- =================================
+ target: clean-makefile-includes
+ ================================= -->
+ <target name="clean-makefile-includes">
+ <!-- delete generic defines and rules -->
+ <delete dir="${hy.hdk}/build" />
</target>
<!-- =================================
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/archive/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/archive/makefile?rev=414865&r1=414864&r2=414865&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/archive/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/archive/makefile Fri Jun 16 10:24:54 2006
@@ -16,7 +16,7 @@
# Makefile for module 'archive'
#
-include ../makefile.include
+include $(HY_HDK)/build/makefile.include
CFLAGS += -fpic -I$(SHARED)common -I../zlib/dist \
-I../../../modules/archive/src/main/native/include/shared
@@ -31,4 +31,4 @@
DLLNAME=../libhyarchive.so
-include ../rules.mk
+include $(HY_HDK)/build/rules.mk
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/auth/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/auth/makefile?rev=414865&r1=414864&r2=414865&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/auth/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/auth/makefile Fri Jun 16 10:24:54 2006
@@ -16,7 +16,7 @@
# Makefile for module 'auth'
#
-include ../makefile.include
+include $(HY_HDK)/build/makefile.include
CFLAGS += -fpic
BUILDFILES = $(SHAREDSUB)auth_copyright.o authnix.o
@@ -26,4 +26,4 @@
DLLNAME = ../libhyauth.so
-include ../rules.mk
+include $(HY_HDK)/build/rules.mk
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/common/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/common/makefile?rev=414865&r1=414864&r2=414865&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/common/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/common/makefile Fri Jun 16 10:24:54 2006
@@ -16,11 +16,11 @@
# Makefile for module 'common'
#
-include ../makefile.include
+include $(HY_HDK)/build/makefile.include
BUILDFILES = $(SHAREDSUB)libglob.o $(SHAREDSUB)iohelp.o \
$(SHAREDSUB)utf8encode.o $(SHAREDSUB)utf8decode.o
LIBNAME = $(LIBPATH)libhycommon.a
CFLAGS += -I../../../modules/luni/src/main/native/include/shared -I../../../modules/luni/src/main/native/include/linux
-include ../rules.mk
+include $(HY_HDK)/build/rules.mk
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/fdlibm/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/fdlibm/makefile?rev=414865&r1=414864&r2=414865&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/fdlibm/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/fdlibm/makefile Fri Jun 16 10:24:54 2006
@@ -16,7 +16,7 @@
# Makefile for module 'fdlibm'
#
-include ../makefile.include
+include $(HY_HDK)/build/makefile.include
BUILDFILES = \
dist/e_acos.o dist/e_acosh.o dist/e_asin.o dist/e_atan2.o \
@@ -50,4 +50,4 @@
LIBNAME = $(LIBPATH)libhyfdlibm.a
-include ../rules.mk
+include $(HY_HDK)/build/rules.mk
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/launcher/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/launcher/makefile?rev=414865&r1=414864&r2=414865&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/launcher/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/launcher/makefile Fri Jun 16 10:24:54 2006
@@ -16,7 +16,7 @@
# Makefile for 'launcher'
#
-include ../makefile.include
+include $(HY_HDK)/build/makefile.include
BUILDFILES = $(SHAREDSUB)main.o $(SHAREDSUB)cmain.o \
$(SHAREDSUB)launcher_copyright.o $(SHAREDSUB)strbuf.o \
@@ -24,4 +24,4 @@
MDLLIBFILES = ../libhyprt.so ../libhythr.so
EXENAME = $(EXEPATH)java
-include ../rules.mk
+include $(HY_HDK)/build/rules.mk
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/makefile?rev=414865&r1=414864&r2=414865&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/makefile Fri Jun 16 10:24:54 2006
@@ -16,7 +16,7 @@
# Makefile for module 'luni'
#
-include ../makefile.include
+include $(HY_HDK)/build/makefile.include
CFLAGS += -fpic -I$(SHARED)common -I$(SHARED)fdlibm \
-I../../../modules/luni/src/main/native/include/shared -I../../../modules/luni/src/main/native/include/linux
@@ -41,4 +41,4 @@
DLLNAME = ../libhyluni.so
-include ../rules.mk
+include $(HY_HDK)/build/rules.mk
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/pool/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/pool/makefile?rev=414865&r1=414864&r2=414865&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/pool/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/pool/makefile Fri Jun 16 10:24:54 2006
@@ -16,10 +16,10 @@
# Makefile for module 'pool'
#
-include ../makefile.include
+include $(HY_HDK)/build/makefile.include
CFLAGS += -I../../../modules/luni/src/main/native/include/shared -I../../../modules/luni/src/main/native/include/linux
BUILDFILES = $(SHAREDSUB)pool.o $(SHAREDSUB)pool_cap.o
LIBNAME = $(LIBPATH)libhypool.a
-include ../rules.mk
+include $(HY_HDK)/build/rules.mk
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/port/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/port/makefile?rev=414865&r1=414864&r2=414865&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/port/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/port/makefile Fri Jun 16 10:24:54 2006
@@ -16,7 +16,7 @@
# Makefile for module 'port'
#
-include ../makefile.include
+include $(HY_HDK)/build/makefile.include
CFLAGS += -fpic -DHYPORT_LIBRARY_DEFINE \
-I../../../modules/luni/src/main/native/include/shared -I../../../modules/luni/src/main/native/include/linux
@@ -35,4 +35,4 @@
DLLNAME = ../libhyprt.so
-include ../rules.mk
+include $(HY_HDK)/build/rules.mk
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/sig/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/sig/makefile?rev=414865&r1=414864&r2=414865&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/sig/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/sig/makefile Fri Jun 16 10:24:54 2006
@@ -16,10 +16,10 @@
# Makefile for module 'hysig'
#
-include ../makefile.include
+include $(HY_HDK)/build/makefile.include
CFLAGS += -fpic -I../../../modules/luni/src/main/native/include/shared -I../../../modules/luni/src/main/native/include/linux
BUILDFILES = $(SHAREDSUB)hysig_copyright.o hysiglinux.o hysigunix.o
DLLNAME = ../libhysig.so
-include ../rules.mk
+include $(HY_HDK)/build/rules.mk
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/text/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/text/makefile?rev=414865&r1=414864&r2=414865&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/text/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/text/makefile Fri Jun 16 10:24:54 2006
@@ -16,7 +16,7 @@
# Makefile for module 'text'
#
-include ../makefile.include
+include $(HY_HDK)/build/makefile.include
CFLAGS += -fpic
BUILDFILES = text_copyright.o $(SHAREDSUB)BidiWrapper.o
@@ -28,4 +28,4 @@
DLLNAME = ../libhytext.so
-include ../rules.mk
+include $(HY_HDK)/build/rules.mk
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/thread/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/thread/makefile?rev=414865&r1=414864&r2=414865&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/thread/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/thread/makefile Fri Jun 16 10:24:54 2006
@@ -16,7 +16,7 @@
# Makefile for module 'thread'
#
-include ../makefile.include
+include $(HY_HDK)/build/makefile.include
CFLAGS += -fpic -I../../../modules/luni/src/main/native/include/shared -I../../../modules/luni/src/main/native/include/linux
@@ -29,4 +29,4 @@
MDLLIBFILES = $(LIBPATH)libhypool.a $(LIBPATH)libhycommon.a
DLLNAME = ../libhythr.so
-include ../rules.mk
+include $(HY_HDK)/build/rules.mk
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/vmi/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/vmi/makefile?rev=414865&r1=414864&r2=414865&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/vmi/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/vmi/makefile Fri Jun 16 10:24:54 2006
@@ -16,7 +16,7 @@
# Makefile for module 'vmi stubs'
#
-include ../makefile.include
+include $(HY_HDK)/build/makefile.include
CFLAGS += -fpic -I../../../modules/luni/src/main/native/include/shared -I../../../modules/luni/src/main/native/include/linux
BUILDFILES = $(SHAREDSUB)vmi_copyright.o $(SHAREDSUB)vmi.o
@@ -24,4 +24,4 @@
DLLNAME = ../libvmi.so
-include ../rules.mk
+include $(HY_HDK)/build/rules.mk
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/vmls/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/vmls/makefile?rev=414865&r1=414864&r2=414865&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/vmls/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/vmls/makefile Fri Jun 16 10:24:54 2006
@@ -16,10 +16,10 @@
# Makefile for module 'common'
#
-include ../makefile.include
+include $(HY_HDK)/build/makefile.include
CFLAGS += -I../../../modules/luni/src/main/native/include/shared -I../../../modules/luni/src/main/native/include/linux
BUILDFILES = $(SHAREDSUB)vmls.o
LIBNAME = $(LIBPATH)libhyvmls.a
-include ../rules.mk
+include $(HY_HDK)/build/rules.mk
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/makefile?rev=414865&r1=414864&r2=414865&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/makefile Fri Jun 16 10:24:54 2006
@@ -16,11 +16,11 @@
# Makefile for module 'zip'
#
-include ../makefile.include
+include $(HY_HDK)/build/makefile.include
CFLAGS += -I../zlib/dist -I../../../modules/archive/src/main/native/include/shared
BUILDFILES = $(SHAREDSUB)zcpool.o $(SHAREDSUB)zipalloc.o \
$(SHAREDSUB)zipcache.o $(SHAREDSUB)zipsup.o
LIBNAME = $(LIBPATH)libhyzip.a
-include ../rules.mk
+include $(HY_HDK)/build/rules.mk
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zlib/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zlib/makefile?rev=414865&r1=414864&r2=414865&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zlib/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zlib/makefile Fri Jun 16 10:24:54 2006
@@ -16,7 +16,7 @@
# Makefile for module 'zlib'
#
-include ../makefile.include
+include $(HY_HDK)/build/makefile.include
CFLAGS += -fpic -I../../../modules/archive/src/main/native/include/shared
@@ -27,4 +27,4 @@
DLLNAME = ../libhyzlib.so
-include ../rules.mk
+include $(HY_HDK)/build/rules.mk
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/archive/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/archive/makefile?rev=414865&r1=414864&r2=414865&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/archive/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/archive/makefile Fri Jun 16 10:24:54 2006
@@ -16,7 +16,7 @@
# Makefile for module 'archive'
#
-!include <..\defines.mak>
+!include <$(HY_HDK)\build\defines.mak>
SHAREDSUB=$(SHARED)archive\# comment to avoid \ being treated as continuation
LIBBASE=hyarchive
@@ -42,4 +42,4 @@
$(LIBPATH)hythr.lib $(LIBPATH)vmi.lib
DLLBASE=0x13100000
-!include <..\rules.mak>
+!include <$(HY_HDK)\build\rules.mak>
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/auth/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/auth/makefile?rev=414865&r1=414864&r2=414865&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/auth/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/auth/makefile Fri Jun 16 10:24:54 2006
@@ -16,7 +16,7 @@
# Makefile for module 'auth'
#
-!include <..\defines.mak>
+!include <$(HY_HDK)\build\defines.mak>
SHAREDSUB=$(SHARED)auth\# comment to avoid \ being treated as continuation
LIBBASE=hyauth
@@ -34,4 +34,4 @@
DLLBASE=0x1300000
COMMENT=/comment:"Auth component native code. (c) Copyright 2005, 2006 The Apache Software Foundation or its licensors, as applicable."
-!include <..\rules.mak>
+!include <$(HY_HDK)\build\rules.mak>
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/common/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/common/makefile?rev=414865&r1=414864&r2=414865&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/common/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/common/makefile Fri Jun 16 10:24:54 2006
@@ -16,7 +16,7 @@
# Makefile for module 'common'
#
-!include <..\defines.mak>
+!include <$(HY_HDK)\build\defines.mak>
SHAREDSUB=$(SHARED)common\# comment to avoid \ being treated as continuation
LIBNAME=$(LIBPATH)hycommon.lib
@@ -28,4 +28,4 @@
HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I..\..\..\modules\luni\src\main\native\include\shared /I..\..\..\modules\luni\src\main\native\include\windows
-!include <..\rules.mak>
+!include <$(HY_HDK)\build\rules.mak>
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/fdlibm/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/fdlibm/makefile?rev=414865&r1=414864&r2=414865&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/fdlibm/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/fdlibm/makefile Fri Jun 16 10:24:54 2006
@@ -16,7 +16,7 @@
# Makefile for module 'fdlibm'
#
-!include <..\defines.mak>
+!include <$(HY_HDK)\build\defines.mak>
SHAREDSUB=$(SHARED)fdlibm\# comment to avoid \ being treated as continuation
LIBNAME=$(LIBPATH)hyfdlibm.lib
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/makefile.javae
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/makefile.javae?rev=414865&r1=414864&r2=414865&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/makefile.javae (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/makefile.javae Fri Jun 16 10:24:54 2006
@@ -16,7 +16,7 @@
# Makefile for module 'launcher.java'
#
-!include <..\defines.mak>
+!include <$(HY_HDK)\build\defines.mak>
SHAREDSUB=$(SHARED)launcher\# comment to avoid \ being treated as continuation
EXENAME=$(EXEPATH)java.exe
@@ -29,4 +29,4 @@
EXEFLAGS=$(conlflags) -subsystem:console
EXEDLLFILES=$(conlibsdll)
-!include <..\rules.mak>
+!include <$(HY_HDK)\build\rules.mak>
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/makefile.javaw
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/makefile.javaw?rev=414865&r1=414864&r2=414865&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/makefile.javaw (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/makefile.javaw Fri Jun 16 10:24:54 2006
@@ -16,7 +16,7 @@
# Makefile for module 'launcher.javaw'
#
-!include <..\defines.mak>
+!include <$(HY_HDK)\build\defines.mak>
SHAREDSUB=$(SHARED)launcher\# comment to avoid \ being treated as continuation
EXENAME=$(EXEPATH)javaw.exe
@@ -27,4 +27,4 @@
EXEFLAGS=$(guilflags) -subsystem:windows
EXEDLLFILES=$(guilibsdll)
-!include <..\rules.mak>
+!include <$(HY_HDK)\build\rules.mak>
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/makefile?rev=414865&r1=414864&r2=414865&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/makefile Fri Jun 16 10:24:54 2006
@@ -16,7 +16,7 @@
# Makefile for module 'luni'
#
-!include <..\defines.mak>
+!include <$(HY_HDK)\build\defines.mak>
SHAREDSUB=$(SHARED)luni\# comment to avoid \ being treated as continuation
LIBBASE=hyluni
@@ -51,4 +51,4 @@
DLLBASE=0x13200000
COMMENT=/comment:"LUNI component native code. (c) Copyright 1991, 2005 The Apache Software Foundation or its licensors, as applicable."
-!include <..\rules.mak>
+!include <$(HY_HDK)\build\rules.mak>
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/pool/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/pool/makefile?rev=414865&r1=414864&r2=414865&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/pool/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/pool/makefile Fri Jun 16 10:24:54 2006
@@ -16,11 +16,11 @@
# Makefile for module 'pool'
#
-!include <..\defines.mak>
+!include <$(HY_HDK)\build\defines.mak>
SHAREDSUB=$(SHARED)pool\# comment to avoid \ being treated as continuation
LIBNAME=$(LIBPATH)hypool.lib
BUILDFILES = $(SHAREDSUB)pool.obj $(SHAREDSUB)pool_cap.obj
HYCFLAGS = $(HYCFLAGS) /I..\..\..\modules\luni\src\main\native\include\shared /I..\..\..\modules\luni\src\main\native\include\windows
-!include <..\rules.mak>
+!include <$(HY_HDK)\build\rules.mak>
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/port/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/port/makefile?rev=414865&r1=414864&r2=414865&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/port/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/port/makefile Fri Jun 16 10:24:54 2006
@@ -16,7 +16,7 @@
# Makefile for module 'port'
#
-!include <..\defines.mak>
+!include <$(HY_HDK)\build\defines.mak>
SHAREDSUB=$(SHARED)port\# comment to avoid \ being treated as continuation
LIBBASE=hyprt
@@ -47,4 +47,4 @@
DLLBASE=0x11100000
COMMENT=/comment:"Platform port library. (c) Copyright 1993, 2005 The Apache Software Foundation or its licensors, as applicable."
-!include <..\rules.mak>
+!include <$(HY_HDK)\build\rules.mak>
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/prefs/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/prefs/makefile?rev=414865&r1=414864&r2=414865&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/prefs/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/prefs/makefile Fri Jun 16 10:24:54 2006
@@ -16,7 +16,7 @@
# Makefile for module 'prefs'
#
-!include <..\defines.mak>
+!include <$(HY_HDK)\build\defines.mak>
SHAREDSUB=$(SHARED)prefs\# comment to avoid \ being treated as continuation
LIBBASE=hyprefs
@@ -38,4 +38,4 @@
DLLBASE=0x13300000
COMMENT=/comment:"Preferences component native code. (c) Copyright 1993, 2005 The Apache Software Foundation or its licensors, as applicable."
-!include <..\rules.mak>
+!include <$(HY_HDK)\build\rules.mak>
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/sig/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/sig/makefile?rev=414865&r1=414864&r2=414865&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/sig/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/sig/makefile Fri Jun 16 10:24:54 2006
@@ -16,7 +16,7 @@
# Makefile for module 'sig'
#
-!include <..\defines.mak>
+!include <$(HY_HDK)\build\defines.mak>
SHAREDSUB=$(SHARED)sig\# comment to avoid \ being treated as continuation
LIBBASE=hysig
@@ -29,4 +29,4 @@
DLLBASE=0x13100000
COMMENT=/comment:"Signal handling support DLL. (c) Copyright 1993, 2005 The Apache Software Foundation or its licensors, as applicable."
-!include <..\rules.mak>
+!include <$(HY_HDK)\build\rules.mak>
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/text/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/text/makefile?rev=414865&r1=414864&r2=414865&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/text/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/text/makefile Fri Jun 16 10:24:54 2006
@@ -16,7 +16,7 @@
# Makefile for module 'text'
#
-!include <..\defines.mak>
+!include <$(HY_HDK)\build\defines.mak>
SHAREDSUB=$(SHARED)text\# comment to avoid \ being treated as continuation
LIBBASE=hytext
@@ -35,4 +35,4 @@
DLLBASE=0x13300000
COMMENT=/comment:"Text component native code. (c) Copyright 1993, 2005 The Apache Software Foundation or its licensors, as applicable."
-!include <..\rules.mak>
+!include <$(HY_HDK)\build\rules.mak>
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/thread/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/thread/makefile?rev=414865&r1=414864&r2=414865&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/thread/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/thread/makefile Fri Jun 16 10:24:54 2006
@@ -16,7 +16,7 @@
# Makefile for module 'thread'
#
-!include <..\defines.mak>
+!include <$(HY_HDK)\build\defines.mak>
SHAREDSUB=$(SHARED)thread\# comment to avoid \ being treated as continuation
LIBBASE=hythr
@@ -38,4 +38,4 @@
DLLBASE=0x11500000
COMMENT=/comment:"Thread support library. (c) Copyright 1993, 2005 The Apache Software Foundation or its licensors, as applicable."
-!include <..\rules.mak>
+!include <$(HY_HDK)\build\rules.mak>
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/vmi/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/vmi/makefile?rev=414865&r1=414864&r2=414865&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/vmi/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/vmi/makefile Fri Jun 16 10:24:54 2006
@@ -16,7 +16,7 @@
# Makefile for module 'vmi'
#
-!include <..\defines.mak>
+!include <$(HY_HDK)\build\defines.mak>
SHAREDSUB=$(SHARED)vmi\# comment to avoid \ being treated as continuation
LIBBASE=vmi
@@ -28,4 +28,4 @@
VIRTFILES = vmi.res
-!include <..\rules.mak>
+!include <$(HY_HDK)\build\rules.mak>
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/vmls/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/vmls/makefile?rev=414865&r1=414864&r2=414865&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/vmls/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/vmls/makefile Fri Jun 16 10:24:54 2006
@@ -16,7 +16,7 @@
# Makefile for module 'vmls'
#
-!include <..\defines.mak>
+!include <$(HY_HDK)\build\defines.mak>
SHAREDSUB=$(SHARED)vmls\# comment to avoid \ being treated as continuation
LIBNAME=$(LIBPATH)hyvmls.lib
@@ -26,4 +26,4 @@
HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I..\..\..\modules\luni\src\main\native\include\shared /I..\..\..\modules\luni\src\main\native\include\windows
-!include <..\rules.mak>
+!include <$(HY_HDK)\build\rules.mak>
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/zip/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/zip/makefile?rev=414865&r1=414864&r2=414865&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/zip/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/zip/makefile Fri Jun 16 10:24:54 2006
@@ -16,7 +16,7 @@
# Makefile for module 'zip'
#
-!include <..\defines.mak>
+!include <$(HY_HDK)\build\defines.mak>
SHAREDSUB=$(SHARED)zip\# comment to avoid \ being treated as continuation
LIBBASE=hyzip
@@ -25,4 +25,4 @@
$(SHAREDSUB)zipcache.obj $(SHAREDSUB)zipsup.obj
HYCFLAGS = $(HYCFLAGS) /I..\zlib\dist /I..\..\..\modules\archive\src\main\native\include\shared
-!include <..\rules.mak>
+!include <$(HY_HDK)\build\rules.mak>
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/zlib/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/zlib/makefile?rev=414865&r1=414864&r2=414865&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/zlib/makefile (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/zlib/makefile Fri Jun 16 10:24:54 2006
@@ -16,7 +16,7 @@
# Makefile for module 'zlib'
#
-!include <..\defines.mak>
+!include <$(HY_HDK)\build\defines.mak>
SHAREDSUB=$(SHARED)zlib\# comment to avoid \ being treated as continuation
LIBBASE=hyzlib
@@ -40,4 +40,4 @@
DLLBASE=0x11700000
COMMENT=/comment:"zlib data compression library Copyright (C) 1995-2003 Jean-loup Gailly and Mark Adler"
-!include <..\rules.mak>
+!include <$(HY_HDK)\build\rules.mak>