1.1 --- a/make/common/Defs.gmk Fri Aug 13 11:38:10 2010 -0700
1.2 +++ b/make/common/Defs.gmk Mon Aug 30 14:39:42 2010 -0700
1.3 @@ -73,54 +73,10 @@
1.4 #
1.5 JRE_NONEXIST_LOCALES = en en_US de_DE es_ES fr_FR it_IT ja_JP ko_KR sv_SE zh
1.6
1.7 -#
1.8 -# All libraries except libjava and libjvm itself link against libjvm and
1.9 -# libjava, the latter for its exported common utilities. libjava only links
1.10 -# against libjvm. Programs' makefiles take their own responsibility for
1.11 -# adding other libs.
1.12 -#
1.13 -ifdef PACKAGE
1.14 -# put JAVALIB first, but do not lose any platform specific values....
1.15 - LDLIBS_COMMON = $(JAVALIB)
1.16 -endif # PACKAGE
1.17 -
1.18 -#
1.19 -# Libraries that must appear ahead of libc.so on the link command line
1.20 -#
1.21 -ifdef PROGRAM
1.22 -
1.23 - ifeq ($(PLATFORM), solaris)
1.24 - LDLIBS_COMMON = -lthread -ldl
1.25 - endif
1.26 -
1.27 - ifeq ($(PLATFORM), linux)
1.28 - LDLIBS_COMMON = -ldl
1.29 - endif
1.30 -
1.31 -endif # PROGRAM
1.32 -
1.33 -LDLIBS_COMMON += $(EXTRA_LIBS)
1.34 -
1.35 -#
1.36 -# Default is to build, not import native binaries
1.37 -#
1.38 -ifndef IMPORT_NATIVE_BINARIES
1.39 - IMPORT_NATIVE_BINARIES=false
1.40 -endif
1.41 -# If importing libraries in, no incremental builds
1.42 -ifeq ($(IMPORT_NATIVE_BINARIES),true)
1.43 - INCREMENTAL_BUILD=false
1.44 -endif
1.45 -
1.46 -# for generated libraries
1.47 LIBDIR = $(OUTPUTDIR)/lib
1.48 ABS_LIBDIR = $(ABS_OUTPUTDIR)/lib
1.49 -# Optional place to save the windows .lib files
1.50 -LIBFILES_DIR = $(OUTPUTDIR)/libfiles
1.51 # for ext jre files
1.52 EXTDIR = $(LIBDIR)/ext
1.53 -# for generated include files
1.54 -INCLUDEDIR = $(OUTPUTDIR)/include
1.55 # for generated class files
1.56 CLASSBINDIR = $(OUTPUTDIR)/classes
1.57 DEMOCLASSDIR = $(OUTPUTDIR)/democlasses
1.58 @@ -131,8 +87,6 @@
1.59 ABS_BUILDTOOLJARDIR = $(ABS_OUTPUTDIR)/btjars
1.60 # for generated java source files
1.61 GENSRCDIR = $(OUTPUTDIR)/gensrc
1.62 -# for generated C source files (not javah)
1.63 -GENNATIVESRCDIR = $(OUTPUTDIR)/gennativesrc
1.64 # for imported source files
1.65 IMPORTSRCDIR = $(OUTPUTDIR)/impsrc
1.66 # for imported documents
1.67 @@ -196,19 +150,6 @@
1.68 dummy1:=$(shell $(MKDIR) -p $(TEMPDIR))
1.69 dummy2:=$(shell $(MKDIR) -p $(TEMP_DISK))
1.70
1.71 -# OBJDIRNAME is the name of the directory where the object code is to
1.72 -# be placed. It's name depends on whether the data model architecture
1.73 -# is 32-bit or not.
1.74 -ifneq ($(ARCH_DATA_MODEL), 32)
1.75 - OBJDIRNAME = obj$(ARCH_DATA_MODEL)$(OBJDIRNAME_SUFFIX)
1.76 -else
1.77 - OBJDIRNAME = obj$(OBJDIRNAME_SUFFIX)
1.78 -endif
1.79 -OBJDIR = $(TEMPDIR)/$(OBJDIRNAME)
1.80 -
1.81 -# CLASSHDRDIR is where the generated C Class Header files go.
1.82 -CLASSHDRDIR = $(TEMPDIR)/CClassHeaders
1.83 -
1.84 #
1.85 # CLASSDESTDIR can be used to specify the directory where generated classes
1.86 # are to be placed. The default is CLASSBINDIR.
1.87 @@ -217,11 +158,6 @@
1.88 CLASSDESTDIR = $(CLASSBINDIR)
1.89 endif
1.90
1.91 -INCLUDES = -I. -I$(CLASSHDRDIR) \
1.92 - $(patsubst %,-I%,$(subst $(CLASSPATH_SEPARATOR), ,$(VPATH.h))) $(OTHER_INCLUDES)
1.93 -OTHER_CPPFLAGS = $(INCLUDES)
1.94 -
1.95 -
1.96 #
1.97 # vpaths. These are the default locations searched for source files.
1.98 # GNUmakefiles of individual areas often override the default settings.
1.99 @@ -235,35 +171,6 @@
1.100 VPATH.java = $(VPATH0.java)
1.101 vpath %.java $(VPATH.java)
1.102 vpath %.class $(CLASSBINDIR)
1.103 -vpath %.$(OBJECT_SUFFIX) $(OBJDIR)
1.104 -
1.105 -#
1.106 -# VPATH.h is used elsewhere to generate include flags. By default,
1.107 -# anyone has access to the include files that the JVM area exports,
1.108 -# namely jni.h, jvm.h, and jni_utils.h, plus their platform-specific
1.109 -# relatives.
1.110 -#
1.111 -ifeq ($(PLATFORM), windows)
1.112 - VPATH.h = $(BOOTDIR)/include;$(BOOTDIR)/include/$(PLATFORM_INCLUDE_NAME)
1.113 -else
1.114 - VPATH.h = $(PLATFORM_SRC)/javavm/export$(CLASSPATH_SEPARATOR)$(SHARE_SRC)/javavm/export$(CLASSPATH_SEPARATOR)$(SHARE_SRC)/javavm/include$(CLASSPATH_SEPARATOR)$(PLATFORM_SRC)/javavm/include
1.115 -endif
1.116 -vpath %.h $(VPATH.h)
1.117 -
1.118 -#
1.119 -# Used in two ways: helps link against libjava.so. Also if overridden
1.120 -# determines where your shared library is installed.
1.121 -#
1.122 -ifndef LIB_LOCATION
1.123 - LIB_LOCATION = $(LIBDIR)/$(LIBARCH)
1.124 -endif
1.125 -
1.126 -#
1.127 -# Java header and stub variables
1.128 -#
1.129 -CLASSHDRS = $(patsubst %,$(CLASSHDRDIR)/%.h,$(subst .,_,$(CLASSES.export)))
1.130 -CLASSSTUBOBJS = classstubs.$(OBJECT_SUFFIX)
1.131 -STUBPREAMBLE = $(INCLUDEDIR)/StubPreamble.h
1.132
1.133 #
1.134 # Classpath seen by javac (different from the one seen by the VM
1.135 @@ -338,38 +245,9 @@
1.136 done
1.137 endef
1.138
1.139 -#
1.140 -# Create BYFILE OPT and DBG settings, if CFLAGS_OPT/foobar.o is set then it is
1.141 -# used for this file, otherwise the default settings are used.
1.142 -#
1.143 -CFLAGS_$(VARIANT)/BYFILE = $(CFLAGS_$(VARIANT)/$(@F)) \
1.144 - $(CFLAGS_$(VARIANT)$(CFLAGS_$(VARIANT)/$(@F)))
1.145 -CXXFLAGS_$(VARIANT)/BYFILE = $(CXXFLAGS_$(VARIANT)/$(@F)) \
1.146 - $(CXXFLAGS_$(VARIANT)$(CXXFLAGS_$(VARIANT)/$(@F)))
1.147 -
1.148 -#
1.149 -# Tool flags
1.150 -#
1.151 -ASFLAGS = $(ASFLAGS_$(VARIANT)) $(ASFLAGS_COMMON) $(OTHER_ASFLAGS)
1.152 -CFLAGS = $(CFLAGS_$(VARIANT)/BYFILE) $(CFLAGS_COMMON) $(OTHER_CFLAGS)
1.153 -CXXFLAGS = $(CXXFLAGS_$(VARIANT)/BYFILE) $(CXXFLAGS_COMMON) $(OTHER_CXXFLAGS)
1.154 -CPPFLAGS = $(CPPFLAGS_$(VARIANT)) $(CPPFLAGS_COMMON) $(OTHER_CPPFLAGS) \
1.155 - $(DEFINES) $(OPTIONS:%=-D%)
1.156 -LDFLAGS = $(LDFLAGS_$(VARIANT)) $(LDFLAGS_COMMON) $(OTHER_LDFLAGS)
1.157 -LDLIBS = $(OTHER_LDLIBS) $(LDLIBS_$(VARIANT)) $(LDLIBS_COMMON)
1.158 -LINTFLAGS = $(LINTFLAGS_$(VARIANT)) $(LINTFLAGS_COMMON) \
1.159 - $(OTHER_LINTFLAGS)
1.160 -
1.161 -# this should be moved into Defs-<platform>.gmk.....
1.162 -ifeq ($(PLATFORM), windows)
1.163 - VERSION_DEFINES = -DRELEASE="\"$(RELEASE)\""
1.164 -else
1.165 - VERSION_DEFINES = -DRELEASE='"$(RELEASE)"'
1.166 -endif
1.167 -
1.168 # Prevent the use of many default suffix rules we do not need
1.169 .SUFFIXES:
1.170 -.SUFFIXES: .c .o .h .obj .cpp .hpp .java .class
1.171 +.SUFFIXES: .java .class
1.172
1.173 # Make sure we are all insane
1.174 ifdef INSANE
