harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dlyd...@apache.org
Subject svn commit: r565119 - /harmony/enhanced/sandbox/bootjvm/bootJVM/main/src/Makefile
Date Sun, 12 Aug 2007 19:08:55 GMT
Author: dlydick
Date: Sun Aug 12 12:08:54 2007
New Revision: 565119

URL: http://svn.apache.org/viewvc?view=rev&rev=565119
Log:
Pick up thread library, math library, and compression library.

Make absolutely sure that libJVM is built before linking.

Renamed main program from 'main.c' to 'jvmmain.c'

Modified:
    harmony/enhanced/sandbox/bootjvm/bootJVM/main/src/Makefile

Modified: harmony/enhanced/sandbox/bootjvm/bootJVM/main/src/Makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/sandbox/bootjvm/bootJVM/main/src/Makefile?view=diff&rev=565119&r1=565118&r2=565119
==============================================================================
--- harmony/enhanced/sandbox/bootjvm/bootJVM/main/src/Makefile (original)
+++ harmony/enhanced/sandbox/bootjvm/bootJVM/main/src/Makefile Sun Aug 12 12:08:54 2007
@@ -62,8 +62,7 @@
 include $(TOPDIR)/support/MakeSetup
 
 # Roster of C source files and C header files
-C_SOURCES=main.c
-BIN_OBJECTS=$(BINDIR)/main.o
+C_SOURCES=jvmmain.c
 
 # Target to build
 BIN_TARGET=$(BINDIR)/bootjvm$(DOT_BIN_EXTENSION)
@@ -71,14 +70,28 @@
 # Additional include paths, before main list
 PRE_INCLUDE_PATHS:=-I$(TOPDIR)/jvm/src
 
-# Pick up JVM library
-LLFLAGS:=-ljvm
+# Linkage flags to pick up JVM library, Posix thread library,
+# math library, and compression library.
+LLFLAGS:=-ljvm -lpthread -lm -lz
 
 # Build rules
 include $(TOPDIR)/support/MakeRules
 
+#
+# Pick up JVM library dependency, declare both the library and
+# the top-level directory where its source code resides.
+# (This dependency makes SURE that the library is built properly.
+# It depends on the $(TOPDIR)/Makefile token to compile the
+# requested library.)
+#
+LIB_DEPEND_ARCHIVE=$(LIBJVM_LIBDIR)/libjvm.$(AR_ARCHIVE)
+LIB_DEPEND_TOKEN=libjvm
+
+$(LIB_DEPEND_ARCHIVE)::
+	$(MAKE) -C $(TOPDIR) libjvm
+
 # Default rule
-all:: $(BIN_TARGET)
+all:: $(LIB_DEPEND_ARCHIVE) $(BIN_TARGET)
 
 ###################################################################
 #



Mime
View raw message