Author: dlydick
Date: Fri Nov  4 12:41:02 2005
New Revision: 330888

URL: http://svn.apache.org/viewcvs?rev=330888&view=rev
Log:
Moved support utilities to 'support' subdirectory.

Modified:
    incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jni/src/harmony/generic/0.0/src/Makefile
    incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/Makefile
    incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/main/src/Makefile
    incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/test/src/Makefile

Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jni/src/harmony/generic/0.0/src/Makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jni/src/harmony/generic/0.0/src/Makefile?rev=330888&r1=330887&r2=330888&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jni/src/harmony/generic/0.0/src/Makefile (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jni/src/harmony/generic/0.0/src/Makefile Fri Nov  4 12:41:02 2005
@@ -9,9 +9,9 @@
 #
 # @see @link ./Makefile ./Makefile@endlink
 #
-# @see @link ./MakeSetup ./MakeSetup@endlink
+# @see @link support/MakeSetup support/MakeSetup@endlink
 #
-# @see @link ./MakeRules ./MakeRules@endlink
+# @see @link support/MakeRules support/MakeRules@endlink
 #
 #
 # @section Control
@@ -59,7 +59,7 @@
 
 # Set up directory knowledge and basic structure
 TOPDIR=../../../../../..
-include $(TOPDIR)/MakeSetup
+include $(TOPDIR)/support/MakeSetup
 
 # Roster of C source files and C header files
 include $(CFGDIR)/config_roster_jni_c.mak
@@ -76,7 +76,7 @@
 BIN_TARGET=$(BINDIR)/bootjvm$(DOT_BIN_EXTENSION)
 
 # Build rules
-include $(TOPDIR)/MakeRules
+include $(TOPDIR)/support/MakeRules
 
 # Default rule
 all:: $(BIN_TARGET) $(JAR_TARGET)

Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/Makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/Makefile?rev=330888&r1=330887&r2=330888&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/Makefile (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/jvm/src/Makefile Fri Nov  4 12:41:02 2005
@@ -35,9 +35,9 @@
 #
 # @see @link ./Makefile ./Makefile@endlink
 #
-# @see @link ./MakeSetup ./MakeSetup@endlink
+# @see @link support/MakeSetup support/MakeSetup@endlink
 #
-# @see @link ./MakeRules ./MakeRules@endlink
+# @see @link support/MakeRules support/MakeRules@endlink
 #
 #
 # @section Control
@@ -109,7 +109,7 @@
 
 # Set up directory knowledge and basic structure
 TOPDIR=../..
-include $(TOPDIR)/MakeSetup
+include $(TOPDIR)/support/MakeSetup
 
 # Roster of C source files and C header files
 include $(CFGDIR)/config_roster_c.mak
@@ -121,12 +121,13 @@
 endif
 
 ifeq (1,$(MAKELIBJVM))
+LIBDIR:=$(LIBJVM_LIBDIR)
+ECLIPSE_LIBDIR:=$(ECLIPSE_LIBJVM_LIBDIR)
 LIB_TARGET=$(LIBDIR)/libjvm.$(AR_ARCHIVE)
-LIBDIR=$(LIBJVM_LIBDIR)
 endif
 
 # Build rules
-include $(TOPDIR)/MakeRules
+include $(TOPDIR)/support/MakeRules
 
 # Default rule (one or the other sources may be an empty string here)
 all:: $(BIN_TARGET) $(LIB_TARGET)

Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/main/src/Makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/main/src/Makefile?rev=330888&r1=330887&r2=330888&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/main/src/Makefile (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/main/src/Makefile Fri Nov  4 12:41:02 2005
@@ -9,9 +9,9 @@
 #
 # @see @link ./Makefile ./Makefile@endlink
 #
-# @see @link ./MakeSetup ./MakeSetup@endlink
+# @see @link support/MakeSetup support/MakeSetup@endlink
 #
-# @see @link ./MakeRules ./MakeRules@endlink
+# @see @link support/MakeRules support/MakeRules@endlink
 #
 #
 # @section Control
@@ -59,7 +59,7 @@
 
 # Set up directory knowledge and basic structure
 TOPDIR=../..
-include $(TOPDIR)/MakeSetup
+include $(TOPDIR)/support/MakeSetup
 
 # Roster of C source files and C header files
 C_SOURCES=main.c
@@ -75,7 +75,7 @@
 LLFLAGS:=-ljvm
 
 # Build rules
-include $(TOPDIR)/MakeRules
+include $(TOPDIR)/support/MakeRules
 
 # Default rule
 all:: $(BIN_TARGET)

Modified: incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/test/src/Makefile
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/test/src/Makefile?rev=330888&r1=330887&r2=330888&view=diff
==============================================================================
--- incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/test/src/Makefile (original)
+++ incubator/harmony/enhanced/trunk/sandbox/contribs/bootjvm/bootJVM/test/src/Makefile Fri Nov  4 12:41:02 2005
@@ -9,9 +9,9 @@
 #
 # @see @link ./Makefile ./Makefile@endlink
 #
-# @see @link ./MakeSetup ./MakeSetup@endlink
+# @see @link support/MakeSetup support/MakeSetup@endlink
 #
-# @see @link ./MakeRules ./MakeRules@endlink
+# @see @link support/MakeRules support/MakeRules@endlink
 #
 #
 # @section Control
@@ -59,7 +59,7 @@
 
 # Set up directory knowledge and basic structure
 TOPDIR=../..
-include $(TOPDIR)/MakeSetup
+include $(TOPDIR)/support/MakeSetup
 
 # Roster of Java source files
 include $(CFGDIR)/config_roster_test_java.mak
@@ -68,7 +68,7 @@
 JAR_TARGET=$(BINDIR)/boottest.$(JAVA_ARCHIVE)
 
 # Build rules
-include $(TOPDIR)/MakeRules
+include $(TOPDIR)/support/MakeRules
 
 # Default rule
 all:: $(JAR_TARGET)