From ccb1b04250c4874084b3cebb084a5487042517bb Mon Sep 17 00:00:00 2001 From: mchung Date: Wed, 9 Mar 2011 23:11:07 -0800 Subject: [PATCH] 7025631: Remove the modules build support from jdk 7 Reviewed-by: alanb, ohair --- make/Makefile | 2 - make/com/sun/crypto/provider/Makefile | 2 +- make/com/sun/java/pack/Makefile | 2 - make/com/sun/java/pack/prop/Makefile | 1 - make/com/sun/jndi/cosnaming/Makefile | 1 - make/com/sun/jndi/dns/Makefile | 1 - make/com/sun/jndi/ldap/Makefile | 1 - make/com/sun/jndi/rmi/registry/Makefile | 1 - make/com/sun/nio/sctp/Makefile | 1 - make/com/sun/org/apache/xml/Makefile | 1 - make/com/sun/rowset/Makefile | 1 - make/com/sun/script/Makefile | 1 - make/com/sun/security/auth/module/Makefile | 1 - make/com/sun/servicetag/Makefile | 1 - make/com/sun/tools/attach/Makefile | 4 +- make/common/Defs.gmk | 71 +----------- make/common/Demo.gmk | 2 - make/common/Library.gmk | 10 -- make/common/Program.gmk | 1 - make/common/Release.gmk | 2 +- make/common/Sanity.gmk | 3 +- make/common/Subdirs.gmk | 102 ++++-------------- make/common/shared/Sanity.gmk | 22 +--- make/java/awt/Makefile | 1 - make/java/fdlibm/Makefile | 1 - make/java/instrument/Makefile | 1 - make/java/java/Makefile | 6 +- make/java/java_crw_demo/Makefile | 1 - make/java/java_hprof_demo/Makefile | 1 - make/java/jli/Makefile | 1 - make/java/jvm/Makefile | 5 +- make/java/logging/Makefile | 1 - make/java/main/java/Makefile | 1 - make/java/main/javaw/Makefile | 1 - make/java/management/Makefile | 1 - make/java/net/Makefile | 1 - make/java/nio/Makefile | 7 +- make/java/npt/Makefile | 1 - make/java/redist/Makefile | 9 +- make/java/redist/fonts/Makefile | 1 - make/java/redist/sajdi/Makefile | 1 - make/java/security/Makefile | 1 - make/java/sql/Makefile | 1 - make/java/text/base/Makefile | 1 - make/java/verify/Makefile | 1 - make/java/zip/Makefile | 1 - make/javax/crypto/Makefile | 18 +--- make/javax/imageio/Makefile | 1 - make/javax/print/Makefile | 1 - make/javax/sound/Makefile | 1 - make/javax/sound/jsoundalsa/Makefile | 1 - make/javax/sound/jsoundds/Makefile | 1 - make/javax/sql/Makefile | 1 - make/javax/swing/Makefile | 1 - make/javax/swing/plaf/Makefile | 1 - make/jpda/back/Makefile | 1 - make/jpda/transport/Makefile | 1 - make/jpda/transport/shmem/Makefile | 1 - make/jpda/transport/socket/Makefile | 1 - make/jpda/tty/Makefile | 1 - make/launchers/Makefile | 2 - make/mkdemo/jvmti/Makefile | 1 - make/mkdemo/management/Makefile | 1 - make/mksample/dtrace/Makefile | 1 - make/mksample/jmx/jmx-scandir/Makefile | 1 - make/mksample/nbproject/Makefile | 1 - make/mksample/nio/file/Makefile | 1 - make/mksample/nio/multicast/Makefile | 1 - make/mksample/nio/server/Makefile | 1 - make/mksample/scripting/scriptpad/Makefile | 1 - make/mksample/webservices/EbayClient/Makefile | 1 - make/mksample/webservices/EbayServer/Makefile | 1 - make/sun/applet/Makefile | 1 - make/sun/awt/Makefile | 2 - make/sun/cmm/Makefile | 1 - make/sun/cmm/kcms/Makefile | 1 - make/sun/cmm/lcms/Makefile | 1 - make/sun/dcpr/Makefile | 1 - make/sun/font/Makefile | 2 - make/sun/font/t2k/Makefile | 1 - make/sun/headless/Makefile | 1 - make/sun/image/generic/Makefile | 1 - make/sun/image/vis/Makefile | 1 - make/sun/jar/Makefile | 1 - make/sun/javazic/Makefile | 2 - make/sun/jawt/Makefile | 1 - make/sun/jconsole/Makefile | 1 - make/sun/jdbc/Makefile | 1 - make/sun/jdga/Makefile | 1 - make/sun/jpeg/Makefile | 1 - make/sun/launcher/Makefile | 1 - make/sun/management/Makefile | 1 - make/sun/native2ascii/Makefile | 1 - make/sun/net/others/Makefile | 1 - make/sun/net/spi/nameservice/dns/Makefile | 1 - make/sun/nio/cs/Makefile | 1 - make/sun/org/mozilla/javascript/Makefile | 1 - make/sun/pisces/Makefile | 1 - make/sun/rmi/cgi/Makefile | 1 - make/sun/rmi/oldtools/Makefile | 1 - make/sun/rmi/registry/Makefile | 1 - make/sun/rmi/rmi/Makefile | 1 - make/sun/rmi/rmic/Makefile | 1 - make/sun/rmi/rmid/Makefile | 1 - make/sun/security/ec/Makefile | 3 +- make/sun/security/jgss/wrapper/Makefile | 1 - make/sun/security/krb5/Makefile | 1 - make/sun/security/mscapi/Makefile | 3 +- make/sun/security/pkcs11/Makefile | 3 +- make/sun/security/smartcardio/Makefile | 1 - make/sun/security/tools/Makefile | 1 - make/sun/serialver/Makefile | 1 - make/sun/splashscreen/Makefile | 1 - make/sun/text/Makefile | 1 - make/sun/tools/Makefile | 1 - make/sun/tracing/dtrace/Makefile | 1 - make/sun/xawt/Makefile | 1 - 117 files changed, 45 insertions(+), 333 deletions(-) diff --git a/make/Makefile b/make/Makefile index 74651fca2..afcdda1ee 100644 --- a/make/Makefile +++ b/make/Makefile @@ -74,7 +74,6 @@ import -- copy in the pre-built components (e.g. VM) \n\ import_product -- copy in the product components \n\ import_fastdebug -- copy in the fastdebug components \n\ import_debug -- copy in the debug components \n\ -modules -- build the jdk and jre module images (experimental) \n\ create_links -- create softlinks in Solaris 32bit build to 64bit dirs \n\ " @@ -261,7 +260,6 @@ docs:: sanity-docs post-sanity-docs # Release engineering targets. # include $(BUILDDIR)/common/Release.gmk -include $(BUILDDIR)/common/Modules.gmk # # Cscope targets. diff --git a/make/com/sun/crypto/provider/Makefile b/make/com/sun/crypto/provider/Makefile index 3df93501c..f52fb576f 100644 --- a/make/com/sun/crypto/provider/Makefile +++ b/make/com/sun/crypto/provider/Makefile @@ -249,7 +249,7 @@ $(JAR_DESTFILE): $(UNSIGNED_DIR)/sunjce_provider.jar else $(JAR_DESTFILE): $(SIGNED_DIR)/sunjce_provider.jar endif - $(install-non-module-file) + $(install-file) ifndef OPENJDK install-prebuilt: diff --git a/make/com/sun/java/pack/Makefile b/make/com/sun/java/pack/Makefile index e7fe8d44b..0e73e0556 100644 --- a/make/com/sun/java/pack/Makefile +++ b/make/com/sun/java/pack/Makefile @@ -28,7 +28,6 @@ # BUILDDIR = ../../../.. -MODULE = pack200 PACKAGE = com.sun.java.util.jar.pack LIBRARY = unpack PRODUCT = sun @@ -156,7 +155,6 @@ ifdef MT endif $(CP) $(TEMPDIR)/unpack200$(EXE_SUFFIX) $(UNPACK_EXE) @$(call binary_file_verification,$@) - $(install-module-file) ifeq ($(PLATFORM), windows) $(RES):: $(VERSIONINFO_RESOURCE) diff --git a/make/com/sun/java/pack/prop/Makefile b/make/com/sun/java/pack/prop/Makefile index 7f8ac7f76..b023d0505 100644 --- a/make/com/sun/java/pack/prop/Makefile +++ b/make/com/sun/java/pack/prop/Makefile @@ -29,7 +29,6 @@ # to a collision of rules with Classes.gmk and Library.gmk BUILDDIR = ../../../../.. -MODULE = pack200 PACKAGE = com.sun.java.util.jar.pack PRODUCT = sun include $(BUILDDIR)/common/Defs.gmk diff --git a/make/com/sun/jndi/cosnaming/Makefile b/make/com/sun/jndi/cosnaming/Makefile index 73a64ecd8..17425dba5 100644 --- a/make/com/sun/jndi/cosnaming/Makefile +++ b/make/com/sun/jndi/cosnaming/Makefile @@ -28,7 +28,6 @@ # BUILDDIR = ../../../.. -MODULE = jndi-cosnaming PACKAGE = com.sun.jndi.cosnaming PRODUCT = sun include $(BUILDDIR)/common/Defs.gmk diff --git a/make/com/sun/jndi/dns/Makefile b/make/com/sun/jndi/dns/Makefile index ccb98d848..4b34bdafa 100644 --- a/make/com/sun/jndi/dns/Makefile +++ b/make/com/sun/jndi/dns/Makefile @@ -28,7 +28,6 @@ # BUILDDIR = ../../../.. -MODULE = jndi-dns PACKAGE = com.sun.jndi.dns PRODUCT = sun include $(BUILDDIR)/common/Defs.gmk diff --git a/make/com/sun/jndi/ldap/Makefile b/make/com/sun/jndi/ldap/Makefile index eaf663841..5b74b9101 100644 --- a/make/com/sun/jndi/ldap/Makefile +++ b/make/com/sun/jndi/ldap/Makefile @@ -28,7 +28,6 @@ # BUILDDIR = ../../../.. -MODULE = jndi-ldap PACKAGE = com.sun.jndi.ldap PRODUCT = sun include $(BUILDDIR)/common/Defs.gmk diff --git a/make/com/sun/jndi/rmi/registry/Makefile b/make/com/sun/jndi/rmi/registry/Makefile index 1138bc94b..d8b3e6b51 100644 --- a/make/com/sun/jndi/rmi/registry/Makefile +++ b/make/com/sun/jndi/rmi/registry/Makefile @@ -28,7 +28,6 @@ # BUILDDIR = ../../../../.. -MODULE = jndi-rmiregistry PACKAGE = com.sun.jndi.rmi.registry PRODUCT = sun include $(BUILDDIR)/common/Defs.gmk diff --git a/make/com/sun/nio/sctp/Makefile b/make/com/sun/nio/sctp/Makefile index a3d9d0db4..975776889 100644 --- a/make/com/sun/nio/sctp/Makefile +++ b/make/com/sun/nio/sctp/Makefile @@ -28,7 +28,6 @@ # BUILDDIR = ../../../.. -MODULE = sctp PACKAGE = com.sun.nio.sctp LIBRARY = sctp PRODUCT = sun diff --git a/make/com/sun/org/apache/xml/Makefile b/make/com/sun/org/apache/xml/Makefile index 195c90893..dc0f48317 100644 --- a/make/com/sun/org/apache/xml/Makefile +++ b/make/com/sun/org/apache/xml/Makefile @@ -28,7 +28,6 @@ # BUILDDIR = ../../../../.. -MODULE = security-xmldsig PACKAGE = com.sun.org.apache.xml PRODUCT = xml include $(BUILDDIR)/common/Defs.gmk diff --git a/make/com/sun/rowset/Makefile b/make/com/sun/rowset/Makefile index 3a73d9878..672aecef3 100644 --- a/make/com/sun/rowset/Makefile +++ b/make/com/sun/rowset/Makefile @@ -28,7 +28,6 @@ # BUILDDIR = ../../.. -MODULE = jdbc-enterprise PACKAGE = com.sun.rowset PRODUCT = sun include $(BUILDDIR)/common/Defs.gmk diff --git a/make/com/sun/script/Makefile b/make/com/sun/script/Makefile index e30127e1b..1554d1f59 100644 --- a/make/com/sun/script/Makefile +++ b/make/com/sun/script/Makefile @@ -25,7 +25,6 @@ BUILDDIR = ../../.. -MODULE = scripting-rhino PACKAGE = com.sun.script PRODUCT = sun include $(BUILDDIR)/common/Defs.gmk diff --git a/make/com/sun/security/auth/module/Makefile b/make/com/sun/security/auth/module/Makefile index 0de24cd7b..b53e1b307 100644 --- a/make/com/sun/security/auth/module/Makefile +++ b/make/com/sun/security/auth/module/Makefile @@ -26,7 +26,6 @@ # Makefile for building auth modules. BUILDDIR = ../../../../.. -MODULE = security-auth PACKAGE = com.sun.security.auth.module PRODUCT = sun diff --git a/make/com/sun/servicetag/Makefile b/make/com/sun/servicetag/Makefile index a0d384d4f..d647fc8df 100644 --- a/make/com/sun/servicetag/Makefile +++ b/make/com/sun/servicetag/Makefile @@ -22,7 +22,6 @@ # questions. BUILDDIR = ../../.. -MODULE = servicetag PACKAGE = com.sun.servicetag PRODUCT = sun include $(BUILDDIR)/common/Defs.gmk diff --git a/make/com/sun/tools/attach/Makefile b/make/com/sun/tools/attach/Makefile index 100562c93..0fa41d9d9 100644 --- a/make/com/sun/tools/attach/Makefile +++ b/make/com/sun/tools/attach/Makefile @@ -25,7 +25,6 @@ BUILDDIR = ../../../.. -MODULE = attach PACKAGE = com.sun.tools.attach LIBRARY = attach PRODUCT = sun @@ -66,8 +65,7 @@ $(SERVICEDIR)/%: $(SHARE_SRC)/classes/sun/tools/attach/META-INF/services/% @$(MKDIR) -p $(@D) @$(RM) $@ @$(CAT) $< | $(SED) -e "s/^#\[$(PLATFORM)\]//" > $@ - @$(install-module-file) - + .PHONY: copy-files diff --git a/make/common/Defs.gmk b/make/common/Defs.gmk index 6854d4e87..ebd619798 100644 --- a/make/common/Defs.gmk +++ b/make/common/Defs.gmk @@ -224,9 +224,6 @@ INCLUDEDIR = $(OUTPUTDIR)/include # for generated class files CLASSBINDIR = $(OUTPUTDIR)/classes DEMOCLASSDIR = $(OUTPUTDIR)/democlasses -# for modules -MODULES_DIR = $(OUTPUTDIR)/modules -ABS_MODULES_DIR = $(ABS_OUTPUTDIR)/modules # for generated tool class files BUILDTOOLCLASSDIR = $(OUTPUTDIR)/btclasses # for build tool jar files @@ -297,22 +294,6 @@ ifneq ($(LIBRARY),) endif endif -# -# Build units may or may not define MODULE. Default to "other". -# -# MODULE variable defines the lowest-level module name that -# might or might not be the name of the modules created in -# the modules build (see make/modules/modules.config and -# modules.group). -# -MODULES_TEMPDIR = $(OUTPUTDIR)/tmp/modules -ABS_MODULES_TEMPDIR = $(ABS_OUTPUTDIR)/tmp/modules - -ifndef MODULE - MODULE = other -endif -override MODULE_DEST_DIR = $(MODULES_TEMPDIR)/$(MODULE) - # the use of += above makes a space separated list which we need to # remove for filespecs. # @@ -422,52 +403,13 @@ PKGDIR = $(subst .,/,$(PACKAGE)) # include $(JDK_MAKE_SHARED_DIR)/Defs-java.gmk -# -# Macros to find the module that $@ belongs to -# - UNIQUE_PATH_PATTERN = $(subst /,.,$(UNIQUE_PATH)) -MODULE_PATH_PATTERN = -e 's%.*\/classes\/%classes\/%' \ - -e 's%.*\/$(UNIQUE_PATH_PATTERN)\/%classes\/%' \ - -e 's%.*\/lib\/%lib\/%' \ - -e 's%.*\/bin\/%bin\/%' \ - -e 's%.*\/include\/%include\/%' \ - -e 's%.*\/demo\/%demo\/%' \ - -e 's%.*\/sample\/%sample\/%' - -# Install a file to its module -define install-module-file -dest=`echo $(@D)/ | $(SED) $(MODULE_PATH_PATTERN)` ; \ -$(MKDIR) -p $(MODULE_DEST_DIR)/$$dest; \ -$(CP) -f $@ $(MODULE_DEST_DIR)/$$dest -endef - -# Install all files from the directory to its module -define install-module-dir -dest=`echo $(@D)/ | $(SED) $(MODULE_PATH_PATTERN)` ; \ -$(MKDIR) -p $(MODULE_DEST_DIR)/$$dest; \ -$(CP) -rf $(@D)/* $(MODULE_DEST_DIR)/$$dest -endef - -# chmod the file in its module -define chmod-module-file -dest=`echo $@ | $(SED) $(MODULE_PATH_PATTERN)` ; \ -$(CHMOD) $1 $(MODULE_DEST_DIR)/$$dest -endef - -# install a sym link in its module -define install-module-sym-link -dest=`echo $@ | $(SED) $(MODULE_PATH_PATTERN)` ; \ -$(LN) -sf $1 $(MODULE_DEST_DIR)/$$dest -endef - # Run MAKE $@ for a launcher: # $(call make-launcher, name, mainclass, java-args, main-args) define make-launcher $(CD) $(BUILDDIR)/launchers && \ $(MAKE) -f Makefile.launcher \ - MODULE=$(MODULE) \ PROGRAM=$(strip $1) \ MAIN_CLASS=$(strip $2) \ MAIN_JAVA_ARGS="$(strip $3)" \ @@ -488,28 +430,18 @@ endef define install-file $(prep-target) $(CP) $< $@ -@$(install-module-file) endef define chmod-file $(CHMOD) $1 $@ -@$(call chmod-module-file, $1) endef define install-sym-link $(LN) -s $1 $@ -@$(call install-module-sym-link, $1) -endef - -# -# Marcos for files not belonging to any module -define install-non-module-file -$(prep-target) -$(CP) $< $@ endef define install-manifest-file -$(install-non-module-file) +$(install-file) endef # Cleanup rule for after debug java run (hotspot.log file is left around) @@ -577,7 +509,6 @@ endef define install-import-file $(install-importonly-file) -@$(install-module-file) endef .PHONY: all build clean clobber diff --git a/make/common/Demo.gmk b/make/common/Demo.gmk index 24ee29f0b..576f81034 100644 --- a/make/common/Demo.gmk +++ b/make/common/Demo.gmk @@ -25,8 +25,6 @@ # JDK Demo building jar file. -MODULE = demos - # Some names are defined with LIBRARY inside the Defs.gmk file LIBRARY=$(DEMONAME) OBJDIR=$(TEMPDIR)/$(DEMONAME) diff --git a/make/common/Library.gmk b/make/common/Library.gmk index 5fbed139c..e7a24d477 100644 --- a/make/common/Library.gmk +++ b/make/common/Library.gmk @@ -168,18 +168,9 @@ $(ACTUAL_LIBRARY):: $(OBJDIR)/$(LIBRARY).lcf $(OTHER_LCF) $(JAVALIB) $(LDLIBS) $(CP) $(OBJDIR)/$(@F) $@ @$(call binary_file_verification,$@) - $(install-module-file) $(CP) $(OBJDIR)/$(LIBRARY).map $(@D) $(CP) $(OBJDIR)/$(LIBRARY).pdb $(@D) -$(ACTUAL_LIBRARY):: $(ACTUAL_LIBRARY_DIR)/$(LIBRARY).map $(ACTUAL_LIBRARY_DIR)/$(LIBRARY).pdb - -$(ACTUAL_LIBRARY_DIR)/%.map: FORCE - $(install-module-file) - -$(ACTUAL_LIBRARY_DIR)/%.pdb: FORCE - $(install-module-file) - endif # LIBRARY $(OBJDIR)/$(LIBRARY).lcf: $(OBJDIR)/$(LIBRARY).res $(COMPILE_FILES_o) $(FILES_m) @@ -235,7 +226,6 @@ ifeq ($(LIBRARY), fdlibm) else # LIBRARY $(LINKER) $(SHARED_LIBRARY_FLAG) -o $@ $(FILES_o) $(LDLIBS) @$(call binary_file_verification,$@) - $(install-module-file) ifeq ($(WRITE_LIBVERSION),true) $(MCS) -d -a "$(FULL_VERSION)" $@ endif # WRITE_LIBVERSION diff --git a/make/common/Program.gmk b/make/common/Program.gmk index 5700e32c8..040bcc507 100644 --- a/make/common/Program.gmk +++ b/make/common/Program.gmk @@ -186,7 +186,6 @@ $(ACTUAL_PROGRAM):: $(FILES_o) $(LINK_PRE_CMD) $(CC) $(CC_OBJECT_OUTPUT_FLAG)$@ $(LDFLAGS) \ $(FILES_o) $(THREADLIBS) $(LDLIBS) @$(call binary_file_verification,$@) - $(install-module-file) endif # PLATFORM diff --git a/make/common/Release.gmk b/make/common/Release.gmk index d9872bcc7..275664d4e 100644 --- a/make/common/Release.gmk +++ b/make/common/Release.gmk @@ -60,7 +60,7 @@ EXCLUDE_PROPWARN_PKGS += sun.dyn # # Include the exported private packages in ct.sym. # This is an interim solution until the ct.sym is replaced -# with a new module system (being discussed for JDK 7). +# with a new module system (being discussed for JDK 8). # EXPORTED_PRIVATE_PKGS = com.sun.servicetag diff --git a/make/common/Sanity.gmk b/make/common/Sanity.gmk index 7a01efbd5..5060b8c12 100644 --- a/make/common/Sanity.gmk +++ b/make/common/Sanity.gmk @@ -71,8 +71,7 @@ sanity-base: pre-sanity \ sane-cacerts \ sane-ant_version \ sane-zip_version \ - sane-msvcrt_path \ - sane-build_modules + sane-msvcrt_path # The rules sanity-* have a one-to-one correspondence with the major targets # Each sanity-* rule should have no body to ensure that the post-sanity-* is the diff --git a/make/common/Subdirs.gmk b/make/common/Subdirs.gmk index 51d0c7f8e..4da8acfca 100644 --- a/make/common/Subdirs.gmk +++ b/make/common/Subdirs.gmk @@ -40,9 +40,6 @@ # # By default, subdirs specified in the SUBDIRS and all SUBDIRS_* # variables will be built. -# -# BUILD_MODULES variable can be used to specify one or more groups -# to be built (BUILD_MODULES=all will build all groups). # # Variables of the currently supported groups are: # SUBDIRS_desktop @@ -53,15 +50,12 @@ # # Change to the above list also need to update # make/common/shared/Sanity.gmk. NOTE: this list is subject -# to change till the JDK 7 SE profiles/modules are finalized. +# to change. # # Eventually we want to restructure the make directory # according to these grouping (e.g. make/desktop/...) and # the SUBDIRS_ variables would not be needed. # -# To build the desktop and tools groups only, you can do: -# gnumake BUILD_MODULES="desktop tools" ... -# # Iterate the subdirectories specified in $1. # - cd into each subdir and make them @@ -96,77 +90,51 @@ endef # # Iterate the list specified in SUBDIRS_ only if -# SUBDIRS_ is set and or "all" is specified -# in the BUILD_MODULES variable +# SUBDIRS_ is set. # ifdef SUBDIRS_desktop - ifneq (,$(findstring desktop, $(BUILD_MODULES))) - define subdirs-desktop-loop - @$(call subdirs-group-loop,SUBDIRS_desktop) - endef - else - define subdirs-desktop-loop - endef - endif + define subdirs-desktop-loop + @$(call subdirs-group-loop,SUBDIRS_desktop) + endef else define subdirs-desktop-loop endef endif # SUBDIRS_desktop ifdef SUBDIRS_enterprise - ifneq (,$(findstring enterprise, $(BUILD_MODULES))) - define subdirs-enterprise-loop - @$(call subdirs-group-loop,SUBDIRS_enterprise) - endef - else - define subdirs-enterprise-loop - endef - endif + define subdirs-enterprise-loop + @$(call subdirs-group-loop,SUBDIRS_enterprise) + endef else define subdirs-enterprise-loop endef endif # SUBDIRS_enterprise ifdef SUBDIRS_management - ifneq (,$(findstring management, $(BUILD_MODULES))) - define subdirs-management-loop - @$(call subdirs-group-loop,SUBDIRS_management) - endef - else - define subdirs-management-loop - endef - endif + define subdirs-management-loop + @$(call subdirs-group-loop,SUBDIRS_management) + endef else -define subdirs-management-loop -endef + define subdirs-management-loop + endef endif # SUBDIRS_management ifdef SUBDIRS_misc - ifneq (,$(findstring misc, $(BUILD_MODULES))) - define subdirs-misc-loop - @$(call subdirs-group-loop,SUBDIRS_misc) - endef - else - define subdirs-misc-loop - endef - endif + define subdirs-misc-loop + @$(call subdirs-group-loop,SUBDIRS_misc) + endef else -define subdirs-misc-loop -endef + define subdirs-misc-loop + endef endif # SUBDIRS_misc ifdef SUBDIRS_tools - ifneq (,$(findstring tools, $(BUILD_MODULES))) - define subdirs-tools-loop - @$(call subdirs-group-loop,SUBDIRS_tools) - endef - else - define subdirs-tools-loop - endef - endif + define subdirs-tools-loop + @$(call subdirs-group-loop,SUBDIRS_tools) + endef else -define subdirs-tools-loop -endef + define subdirs-tools-loop + endef endif # SUBDIRS_tools # @@ -175,30 +143,6 @@ endif # SUBDIRS_tools SUBDIRS_all = $(SUBDIRS) $(SUBDIRS_desktop) $(SUBDIRS_enterprise) \ $(SUBDIRS_management) $(SUBDIRS_misc) $(SUBDIRS_tools) -ifndef BUILD_MODULES -define SUBDIRS-loop - @$(call subdirs-group-loop,SUBDIRS_all) -endef - -else - -ifneq (,$(findstring all, $(BUILD_MODULES))) define SUBDIRS-loop @$(call subdirs-group-loop,SUBDIRS_all) endef - -else # BUILD_MODULES set -# -# Iterate SUBDIRS and the groups specified in BUILD_MODULES -# -define SUBDIRS-loop - @$(call subdirs-group-loop,SUBDIRS) - @$(subdirs-desktop-loop) - @$(subdirs-enterprise-loop) - @$(subdirs-management-loop) - @$(subdirs-misc-loop) - @$(subdirs-tools-loop) -endef - -endif -endif # BUILD_MODULES diff --git a/make/common/shared/Sanity.gmk b/make/common/shared/Sanity.gmk index b2aaaec7d..873f63cae 100644 --- a/make/common/shared/Sanity.gmk +++ b/make/common/shared/Sanity.gmk @@ -221,8 +221,7 @@ include $(JDK_MAKE_SHARED_DIR)/Sanity-Settings.gmk sane-zip_version \ sane-unzip_version \ sane-msvcrt_path \ - sane-freetype \ - sane-build_modules + sane-freetype ###################################################### # check for COPYRIGHT_YEAR variable @@ -831,21 +830,6 @@ else sane-freetype: endif -###################################################### -# if specified, BUILD_MODULES must contain valid values. -###################################################### -MODULES_REGEX="all|base|desktop|management|enterprise|misc|tools" -sane-build_modules: -ifdef BUILD_MODULES - @for m in $(BUILD_MODULES) ; do \ - valid=`$(ECHO) $$m | $(EGREP) $(MODULES_REGEX)`; \ - if [ "x$$valid" = "x" ] ; then \ - $(ECHO) "ERROR: $$m set in the BUILD_MODULES variable is invalid.\n" \ - "" >> $(ERROR_FILE); \ - fi \ - done -endif - ###################################################### # CUPS_HEADERS_PATH must be valid ###################################################### @@ -1126,7 +1110,7 @@ TMP_SDK_INCLUDE_GET_FULL_VERSION= $(TMP_SDK_INCLUDE_FIND_VERSION) | \ # be checked when this represents a full control build (i.e. the # HOTSPOT_IMPORT_PATH includes these files in it's 'include' directory). $(TEMPDIR)/%.h: $(SHARE_SRC)/javavm/export/%.h - @$(install-non-module-file) + @$(install-file) @$(RM) $@.IMPORT @if [ -r $(HOTSPOT_IMPORT_PATH)/include/$(@F) ]; then \ $(CP) $(HOTSPOT_IMPORT_PATH)/include/$(@F) $@.IMPORT ; \ @@ -1140,7 +1124,7 @@ $(TEMPDIR)/%.h: $(SHARE_SRC)/javavm/export/%.h fi $(TEMPDIR)/%.h: $(PLATFORM_SRC)/javavm/export/%.h - @$(install-non-module-file) + @$(install-file) @$(RM) $@.IMPORT @if [ -r $(HOTSPOT_IMPORT_PATH)/include/$(PLATFORM_INCLUDE_NAME)/$(@F) ]; then \ $(CP) $(HOTSPOT_IMPORT_PATH)/include/$(PLATFORM_INCLUDE_NAME)/$(@F) $@.IMPORT ; \ diff --git a/make/java/awt/Makefile b/make/java/awt/Makefile index b53d05773..1da8f498c 100644 --- a/make/java/awt/Makefile +++ b/make/java/awt/Makefile @@ -24,7 +24,6 @@ # BUILDDIR = ../.. -MODULE = awt PACKAGE = java.awt PRODUCT = sun include $(BUILDDIR)/common/Defs.gmk diff --git a/make/java/fdlibm/Makefile b/make/java/fdlibm/Makefile index c4778af3e..38e4bfd9f 100644 --- a/make/java/fdlibm/Makefile +++ b/make/java/fdlibm/Makefile @@ -31,7 +31,6 @@ # BUILDDIR = ../.. -MODULE = base LIBRARY = fdlibm PRODUCT = java diff --git a/make/java/instrument/Makefile b/make/java/instrument/Makefile index f63c7ae78..a2944e73e 100644 --- a/make/java/instrument/Makefile +++ b/make/java/instrument/Makefile @@ -27,7 +27,6 @@ # agent, supporting java.lang.instrument BUILDDIR = ../.. -MODULE = instrument PACKAGE = sun.instrument LIBRARY = instrument PRODUCT = sun diff --git a/make/java/java/Makefile b/make/java/java/Makefile index c8cbb30ec..9a2627096 100644 --- a/make/java/java/Makefile +++ b/make/java/java/Makefile @@ -29,7 +29,6 @@ # BUILDDIR = ../.. -MODULE = base PACKAGE = java.lang LIBRARY = java PRODUCT = java @@ -244,7 +243,7 @@ ifneq ($(PLATFORM),windows) $(GENSRCDIR)/java/lang/UNIXProcess.java: \ $(PLATFORM_SRC)/classes/java/lang/UNIXProcess.java.$(PLATFORM) - $(install-non-module-file) + $(install-file) clean:: $(RM) $(GENSRCDIR)/java/lang/UNIXProcess.java @@ -318,7 +317,6 @@ $(CURDATA): \ $(BOOT_JAVA_CMD) -jar $(GENERATECURRENCYDATA_JARFILE) -o $@.temp \ < $(SHARE_SRC)/classes/java/util/CurrencyData.properties $(MV) $@.temp $@ - $(install-module-file) $(call chmod-file, 444) clean:: @@ -373,7 +371,7 @@ $(GENSRCDIR)/java/lang/CharacterDataLatin1.java \ -usecharforbyte 11 4 1 $(GENSRCDIR)/java/lang/%.java : $(CHARACTERDATA)/%.java.template - $(install-non-module-file) + $(install-file) clean:: $(RM) $(GENSRCDIR)/java/lang/CharacterDataLatin1.java diff --git a/make/java/java_crw_demo/Makefile b/make/java/java_crw_demo/Makefile index c1393b97b..6b3732079 100644 --- a/make/java/java_crw_demo/Makefile +++ b/make/java/java_crw_demo/Makefile @@ -25,7 +25,6 @@ BUILDDIR = ../.. -MODULE = demos LIBRARY = java_crw_demo PRODUCT = sun LIBRARY_OUTPUT = java_crw_demo diff --git a/make/java/java_hprof_demo/Makefile b/make/java/java_hprof_demo/Makefile index 99421b205..8ad85dc0c 100644 --- a/make/java/java_hprof_demo/Makefile +++ b/make/java/java_hprof_demo/Makefile @@ -24,7 +24,6 @@ # BUILDDIR = ../.. -MODULE = instrument LIBRARY = hprof PRODUCT = sun LIBRARY_OUTPUT = hprof_jvmti diff --git a/make/java/jli/Makefile b/make/java/jli/Makefile index 928df6405..3a0e9100a 100644 --- a/make/java/jli/Makefile +++ b/make/java/jli/Makefile @@ -30,7 +30,6 @@ # its manifestations (java, javaw, javac, ...). # BUILDDIR = ../.. -MODULE = base LIBRARY = jli PRODUCT = java diff --git a/make/java/jvm/Makefile b/make/java/jvm/Makefile index 9da1ef1e3..59a520353 100644 --- a/make/java/jvm/Makefile +++ b/make/java/jvm/Makefile @@ -24,7 +24,6 @@ # BUILDDIR = ../.. -MODULE = base include $(BUILDDIR)/common/Defs.gmk @@ -39,10 +38,10 @@ FILES_h = $(INCLUDEDIR)/jni.h \ $(INCLUDEDIR)/classfile_constants.h $(INCLUDEDIR)/%.h: $(SHARE_SRC)/javavm/export/%.h - $(install-non-module-file) + $(install-file) $(PLATFORM_INCLUDE)/%.h: $(PLATFORM_SRC)/javavm/export/%.h - $(install-non-module-file) + $(install-file) JVMCFG = $(LIBDIR)/$(LIBARCH)/jvm.cfg diff --git a/make/java/logging/Makefile b/make/java/logging/Makefile index aa5e05c10..5f9153fb7 100644 --- a/make/java/logging/Makefile +++ b/make/java/logging/Makefile @@ -24,7 +24,6 @@ # BUILDDIR = ../.. -MODULE = logging PACKAGE = java.util.logging PRODUCT = java include $(BUILDDIR)/common/Defs.gmk diff --git a/make/java/main/java/Makefile b/make/java/main/java/Makefile index 7f9e8992a..452099f7a 100644 --- a/make/java/main/java/Makefile +++ b/make/java/main/java/Makefile @@ -24,7 +24,6 @@ # BUILDDIR = ../../.. -MODULE = base PROGRAM = java PRODUCT = java diff --git a/make/java/main/javaw/Makefile b/make/java/main/javaw/Makefile index 920cbbc7c..e2fc6161a 100644 --- a/make/java/main/javaw/Makefile +++ b/make/java/main/javaw/Makefile @@ -28,7 +28,6 @@ # BUILDDIR = ../../.. -MODULE = base PROGRAM = javaw PRODUCT = java diff --git a/make/java/management/Makefile b/make/java/management/Makefile index 733030748..ebf3640b8 100644 --- a/make/java/management/Makefile +++ b/make/java/management/Makefile @@ -24,7 +24,6 @@ # BUILDDIR = ../.. -MODULE = management PACKAGE = java.lang.management LIBRARY = management PRODUCT = java diff --git a/make/java/net/Makefile b/make/java/net/Makefile index bd8801e5a..6e865fa24 100644 --- a/make/java/net/Makefile +++ b/make/java/net/Makefile @@ -24,7 +24,6 @@ # BUILDDIR = ../.. -MODULE = base PACKAGE = java.net LIBRARY = net PRODUCT = sun diff --git a/make/java/nio/Makefile b/make/java/nio/Makefile index af84a82b8..ab5a0bdf1 100644 --- a/make/java/nio/Makefile +++ b/make/java/nio/Makefile @@ -28,7 +28,6 @@ # BUILDDIR = ../.. -MODULE = nio PACKAGE = java.nio LIBRARY = nio PRODUCT = java @@ -304,11 +303,7 @@ endif # PLATFORM # Rules # -SUBDIRS_management = mxbean -include $(BUILDDIR)/common/Subdirs.gmk - build: sources - $(SUBDIRS-loop) clean clobber:: $(RM) -r $(NIO_GEN) $(SNIO_GEN) @@ -821,7 +816,7 @@ SOR_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSOR_SRC) | \ $(NAWK) '/^.*Copyright.*Oracle/ { printf "%s %s",$$4,$$5 }') $(TEMPDIR)/$(GENSOR_SRC) : $(GENSOR_SRC) - $(install-non-module-file) + $(install-file) $(GENSOR_EXE) : $(TEMPDIR)/$(GENSOR_SRC) $(prep-target) diff --git a/make/java/npt/Makefile b/make/java/npt/Makefile index a7a8264b2..53f14aa51 100644 --- a/make/java/npt/Makefile +++ b/make/java/npt/Makefile @@ -26,7 +26,6 @@ BUILDDIR = ../.. # It's currently used by jpda and hprof. Put it in base module for now. -MODULE = base LIBRARY = npt PRODUCT = sun LIBRARY_OUTPUT = npt diff --git a/make/java/redist/Makefile b/make/java/redist/Makefile index ad37a7b34..13fe4e191 100644 --- a/make/java/redist/Makefile +++ b/make/java/redist/Makefile @@ -35,7 +35,6 @@ # BUILDDIR = ../.. -MODULE = base PRODUCT = java include $(BUILDDIR)/common/Defs.gmk @@ -122,32 +121,26 @@ $(LIBDIR)/$(JVMLIB_NAME): $(HOTSPOT_LIB_PATH)/$(JVMLIB_NAME) $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMMAP_NAME): @$(prep-target) -$(CP) $(HOTSPOT_CLIENT_PATH)/$(JVMMAP_NAME) $@ - @$(install-module-file) $(LIB_LOCATION)/$(KERNEL_LOCATION)/$(JVMMAP_NAME): @$(prep-target) -$(CP) $(HOTSPOT_KERNEL_PATH)/$(JVMMAP_NAME) $@ - @$(install-module-file) $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMMAP_NAME): @$(prep-target) -$(CP) $(HOTSPOT_SERVER_PATH)/$(JVMMAP_NAME) $@ - @$(install-module-file) $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMPDB_NAME): @$(prep-target) -$(CP) $(HOTSPOT_CLIENT_PATH)/$(JVMPDB_NAME) $@ - @$(install-module-file) $(LIB_LOCATION)/$(KERNEL_LOCATION)/$(JVMPDB_NAME): @$(prep-target) -$(CP) $(HOTSPOT_KERNEL_PATH)/$(JVMPDB_NAME) $@ - @$(install-module-file) $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMPDB_NAME): @$(prep-target) -$(CP) $(HOTSPOT_SERVER_PATH)/$(JVMPDB_NAME) $@ - @$(install-module-file) # Windows ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Windows else # PLATFORM @@ -291,7 +284,7 @@ INTERNAL_IMPORT_LIST += \ $(LIBDIR)/jce.jar: \ $(BUILDDIR)/closed/tools/crypto/jce/jce.jar - $(install-non-module-file) + $(install-file) $(LIBDIR)/security/US_export_policy.jar: \ $(BUILDDIR)/closed/tools/crypto/jce/US_export_policy.jar $(install-file) diff --git a/make/java/redist/fonts/Makefile b/make/java/redist/fonts/Makefile index 475e5a7d2..6c4c2f987 100644 --- a/make/java/redist/fonts/Makefile +++ b/make/java/redist/fonts/Makefile @@ -24,7 +24,6 @@ # BUILDDIR = ../../.. -MODULE = font PRODUCT = java include $(BUILDDIR)/common/Defs.gmk diff --git a/make/java/redist/sajdi/Makefile b/make/java/redist/sajdi/Makefile index 5044fd015..177c757cd 100644 --- a/make/java/redist/sajdi/Makefile +++ b/make/java/redist/sajdi/Makefile @@ -24,7 +24,6 @@ # BUILDDIR = ../../.. -MODULE = sajdi PRODUCT = java include $(BUILDDIR)/common/Defs.gmk diff --git a/make/java/security/Makefile b/make/java/security/Makefile index 1d28b60f2..fa87a5864 100644 --- a/make/java/security/Makefile +++ b/make/java/security/Makefile @@ -24,7 +24,6 @@ # BUILDDIR = ../.. -MODULE = base PACKAGE = java.security PRODUCT = sun include $(BUILDDIR)/common/Defs.gmk diff --git a/make/java/sql/Makefile b/make/java/sql/Makefile index 5a4bd4f5a..6b71ac164 100644 --- a/make/java/sql/Makefile +++ b/make/java/sql/Makefile @@ -28,7 +28,6 @@ # BUILDDIR = ../.. -MODULE = jdbc-base PACKAGE = java.sql PRODUCT = sun include $(BUILDDIR)/common/Defs.gmk diff --git a/make/java/text/base/Makefile b/make/java/text/base/Makefile index 2b7549325..d53d21b82 100644 --- a/make/java/text/base/Makefile +++ b/make/java/text/base/Makefile @@ -24,7 +24,6 @@ # BUILDDIR = ../../.. -MODULE = base PACKAGE = java.text PRODUCT = sun diff --git a/make/java/verify/Makefile b/make/java/verify/Makefile index 00f610a64..d0399120d 100644 --- a/make/java/verify/Makefile +++ b/make/java/verify/Makefile @@ -28,7 +28,6 @@ # BUILDDIR = ../.. -MODULE = base PRODUCT = java LIBRARY = verify include $(BUILDDIR)/common/Defs.gmk diff --git a/make/java/zip/Makefile b/make/java/zip/Makefile index 914609cf7..fd83ea3f2 100644 --- a/make/java/zip/Makefile +++ b/make/java/zip/Makefile @@ -25,7 +25,6 @@ BUILDDIR = ../.. -MODULE = base PACKAGE = java.util.zip LIBRARY = zip PRODUCT = sun diff --git a/make/javax/crypto/Makefile b/make/javax/crypto/Makefile index b5ceae0ed..f2f8baed5 100644 --- a/make/javax/crypto/Makefile +++ b/make/javax/crypto/Makefile @@ -108,7 +108,6 @@ # BUILDDIR = ../.. -MODULE = base PACKAGE = javax.crypto PRODUCT = sun @@ -294,7 +293,7 @@ limited: \ $(UNSIGNED_POLICY_BUILDDIR)/limited/US_export_policy.jar: \ $(UNSIGNED_POLICY_BUILDDIR)/unlimited/US_export_policy.jar - $(install-non-module-file) + $(install-file) $(UNSIGNED_POLICY_BUILDDIR)/limited/local_policy.jar: \ policy/limited/default_local.policy \ @@ -415,7 +414,7 @@ $(JAR_DESTFILE): $(UNSIGNED_DIR)/jce.jar else $(JAR_DESTFILE): $(SIGNED_DIR)/jce.jar endif - $(install-non-module-file) + $(install-file) # # Install the appropriate policy file, depending on the type of build. @@ -435,7 +434,7 @@ install-limited-jars: \ $(POLICY_DESTDIR)/local_policy.jar $(CP) $^ $(POLICY_DESTDIR) -install-limited: install-limited-jars install-module-files +install-limited: install-limited-jars ifndef OPENJDK $(release-warning) endif @@ -449,7 +448,7 @@ install-unlimited-jars: \ $(POLICY_DESTDIR)/local_policy.jar $(CP) $^ $(POLICY_DESTDIR) -install-unlimited: install-unlimited-jars install-module-files +install-unlimited: install-unlimited-jars ifndef OPENJDK $(release-warning) endif @@ -466,16 +465,9 @@ install-prebuilt-jars: $(PREBUILT_DIR)/jce/local_policy.jar \ $(POLICY_DESTDIR) -install-prebuilt: install-prebuilt-jars install-module-files +install-prebuilt: install-prebuilt-jars endif -install-module-files: \ - $(POLICY_DESTDIR)/US_export_policy.jar \ - $(POLICY_DESTDIR)/local_policy.jar - -$(POLICY_DESTDIR)/%.jar : - $(install-module-file) - # ===================================================== # Support routines. # diff --git a/make/javax/imageio/Makefile b/make/javax/imageio/Makefile index 1768964b0..1a64c1038 100644 --- a/make/javax/imageio/Makefile +++ b/make/javax/imageio/Makefile @@ -28,7 +28,6 @@ # BUILDDIR = ../.. -MODULE = imageio PACKAGE = javax.imageio PRODUCT = jiio include $(BUILDDIR)/common/Defs.gmk diff --git a/make/javax/print/Makefile b/make/javax/print/Makefile index 863dd6611..290de0f41 100644 --- a/make/javax/print/Makefile +++ b/make/javax/print/Makefile @@ -28,7 +28,6 @@ # BUILDDIR = ../.. -MODULE = print PACKAGE = javax.print PRODUCT = sun include $(BUILDDIR)/common/Defs.gmk diff --git a/make/javax/sound/Makefile b/make/javax/sound/Makefile index 645b9b3a0..9a6659c41 100644 --- a/make/javax/sound/Makefile +++ b/make/javax/sound/Makefile @@ -24,7 +24,6 @@ # BUILDDIR = ../.. -MODULE = sound PACKAGE = javax.sound LIBRARY = jsound PRODUCT = sun diff --git a/make/javax/sound/jsoundalsa/Makefile b/make/javax/sound/jsoundalsa/Makefile index 3fc6232c8..95161cd6b 100644 --- a/make/javax/sound/jsoundalsa/Makefile +++ b/make/javax/sound/jsoundalsa/Makefile @@ -24,7 +24,6 @@ # BUILDDIR = ../../.. -MODULE = sound PACKAGE = javax.sound LIBRARY = jsoundalsa PRODUCT = sun diff --git a/make/javax/sound/jsoundds/Makefile b/make/javax/sound/jsoundds/Makefile index e731732a6..26c59f1ab 100644 --- a/make/javax/sound/jsoundds/Makefile +++ b/make/javax/sound/jsoundds/Makefile @@ -24,7 +24,6 @@ # BUILDDIR = ../../.. -MODULE = sound PACKAGE = javax.sound LIBRARY = jsoundds PRODUCT = sun diff --git a/make/javax/sql/Makefile b/make/javax/sql/Makefile index a678c2107..91a8db6ca 100644 --- a/make/javax/sql/Makefile +++ b/make/javax/sql/Makefile @@ -28,7 +28,6 @@ # BUILDDIR = ../.. -MODULE = jdbc-enterprise PACKAGE = javax.sql PRODUCT = sun include $(BUILDDIR)/common/Defs.gmk diff --git a/make/javax/swing/Makefile b/make/javax/swing/Makefile index 200c8f9b9..97c5060f7 100644 --- a/make/javax/swing/Makefile +++ b/make/javax/swing/Makefile @@ -24,7 +24,6 @@ # BUILDDIR = ../.. -MODULE = swing PACKAGE = javax.swing PRODUCT = com SWING_SRC = $(SHARE_SRC)/classes/javax/swing diff --git a/make/javax/swing/plaf/Makefile b/make/javax/swing/plaf/Makefile index 0355f5ed3..ceb5304a8 100644 --- a/make/javax/swing/plaf/Makefile +++ b/make/javax/swing/plaf/Makefile @@ -24,7 +24,6 @@ # BUILDDIR = ../../.. -MODULE = swing PACKAGE = javax.swing.plaf PRODUCT = com SWING_SRC = $(SHARE_SRC)/classes/javax/swing diff --git a/make/jpda/back/Makefile b/make/jpda/back/Makefile index cf94227f3..65d47e922 100644 --- a/make/jpda/back/Makefile +++ b/make/jpda/back/Makefile @@ -28,7 +28,6 @@ # BUILDDIR = ../.. -MODULE = debugging LIBRARY = jdwp PRODUCT = jpda diff --git a/make/jpda/transport/Makefile b/make/jpda/transport/Makefile index 9f5dbf143..a6f18ec29 100644 --- a/make/jpda/transport/Makefile +++ b/make/jpda/transport/Makefile @@ -28,7 +28,6 @@ # BUILDDIR = ../.. -MODULE = debugging PRODUCT = jpda include $(BUILDDIR)/common/Defs.gmk diff --git a/make/jpda/transport/shmem/Makefile b/make/jpda/transport/shmem/Makefile index caa9eced9..60e0276a4 100644 --- a/make/jpda/transport/shmem/Makefile +++ b/make/jpda/transport/shmem/Makefile @@ -28,7 +28,6 @@ # BUILDDIR = ../../.. -MODULE = debugging LIBRARY = dt_shmem PRODUCT = jbug diff --git a/make/jpda/transport/socket/Makefile b/make/jpda/transport/socket/Makefile index 3c654f57e..3a742d337 100644 --- a/make/jpda/transport/socket/Makefile +++ b/make/jpda/transport/socket/Makefile @@ -28,7 +28,6 @@ # BUILDDIR = ../../.. -MODULE = debugging LIBRARY = dt_socket PRODUCT = jbug diff --git a/make/jpda/tty/Makefile b/make/jpda/tty/Makefile index 3e53414ea..07a63fe87 100644 --- a/make/jpda/tty/Makefile +++ b/make/jpda/tty/Makefile @@ -28,7 +28,6 @@ # BUILDDIR = ../.. -MODULE = jdb PACKAGE = com.sun.tools.example.debug.tty PRODUCT = jpda PROGRAM = jdb diff --git a/make/launchers/Makefile b/make/launchers/Makefile index c6564126b..8d7036be1 100644 --- a/make/launchers/Makefile +++ b/make/launchers/Makefile @@ -28,7 +28,6 @@ # BUILDDIR = .. -MODULE = tools PACKAGE = launchers PRODUCT = sun include $(BUILDDIR)/common/Defs.gmk @@ -38,7 +37,6 @@ include $(BUILDDIR)/common/Defs.gmk define make-corba-launcher $(CD) $(BUILDDIR)/launchers && \ $(MAKE) -f Makefile.launcher \ - MODULE=corba \ PROGRAM=$(strip $1) \ MAIN_CLASS=$(strip $2) \ MAIN_JAVA_ARGS="$(strip $3)" \ diff --git a/make/mkdemo/jvmti/Makefile b/make/mkdemo/jvmti/Makefile index ccc3731c4..33bdf6fa1 100644 --- a/make/mkdemo/jvmti/Makefile +++ b/make/mkdemo/jvmti/Makefile @@ -28,7 +28,6 @@ # BUILDDIR = ../.. -MODULE = demos PRODUCT = demos include $(BUILDDIR)/common/Defs.gmk diff --git a/make/mkdemo/management/Makefile b/make/mkdemo/management/Makefile index 80b1eee90..4ddccb7ec 100644 --- a/make/mkdemo/management/Makefile +++ b/make/mkdemo/management/Makefile @@ -28,7 +28,6 @@ # BUILDDIR = ../.. -MODULE = demos PRODUCT = demos include $(BUILDDIR)/common/Defs.gmk diff --git a/make/mksample/dtrace/Makefile b/make/mksample/dtrace/Makefile index 86914546e..033d4d3ba 100644 --- a/make/mksample/dtrace/Makefile +++ b/make/mksample/dtrace/Makefile @@ -29,7 +29,6 @@ BUILDDIR = ../.. -MODULE = samples PRODUCT = java include $(BUILDDIR)/common/Defs.gmk diff --git a/make/mksample/jmx/jmx-scandir/Makefile b/make/mksample/jmx/jmx-scandir/Makefile index 2dab96070..3ee0e99ac 100644 --- a/make/mksample/jmx/jmx-scandir/Makefile +++ b/make/mksample/jmx/jmx-scandir/Makefile @@ -29,7 +29,6 @@ BUILDDIR = ../../.. -MODULE = samples PRODUCT = java include $(BUILDDIR)/common/Defs.gmk diff --git a/make/mksample/nbproject/Makefile b/make/mksample/nbproject/Makefile index a77771a8f..92ef67147 100644 --- a/make/mksample/nbproject/Makefile +++ b/make/mksample/nbproject/Makefile @@ -29,7 +29,6 @@ BUILDDIR = ../.. -MODULE = samples PRODUCT = java include $(BUILDDIR)/common/Defs.gmk diff --git a/make/mksample/nio/file/Makefile b/make/mksample/nio/file/Makefile index 6632aa0f3..9462d5063 100644 --- a/make/mksample/nio/file/Makefile +++ b/make/mksample/nio/file/Makefile @@ -29,7 +29,6 @@ BUILDDIR = ../../.. -MODULE = samples PRODUCT = java include $(BUILDDIR)/common/Defs.gmk diff --git a/make/mksample/nio/multicast/Makefile b/make/mksample/nio/multicast/Makefile index 380b51ef5..ae3b4e1d8 100644 --- a/make/mksample/nio/multicast/Makefile +++ b/make/mksample/nio/multicast/Makefile @@ -29,7 +29,6 @@ BUILDDIR = ../../.. -MODULE = samples PRODUCT = java include $(BUILDDIR)/common/Defs.gmk diff --git a/make/mksample/nio/server/Makefile b/make/mksample/nio/server/Makefile index e7e246e5d..bf97c7270 100644 --- a/make/mksample/nio/server/Makefile +++ b/make/mksample/nio/server/Makefile @@ -29,7 +29,6 @@ BUILDDIR = ../../.. -MODULE = samples PRODUCT = java include $(BUILDDIR)/common/Defs.gmk diff --git a/make/mksample/scripting/scriptpad/Makefile b/make/mksample/scripting/scriptpad/Makefile index 917b3da81..b60b01deb 100644 --- a/make/mksample/scripting/scriptpad/Makefile +++ b/make/mksample/scripting/scriptpad/Makefile @@ -29,7 +29,6 @@ BUILDDIR = ../../.. -MODULE = samples PRODUCT = java include $(BUILDDIR)/common/Defs.gmk diff --git a/make/mksample/webservices/EbayClient/Makefile b/make/mksample/webservices/EbayClient/Makefile index 04adedc24..d007ff366 100644 --- a/make/mksample/webservices/EbayClient/Makefile +++ b/make/mksample/webservices/EbayClient/Makefile @@ -29,7 +29,6 @@ BUILDDIR = ../../.. -MODULE = samples PRODUCT = java include $(BUILDDIR)/common/Defs.gmk diff --git a/make/mksample/webservices/EbayServer/Makefile b/make/mksample/webservices/EbayServer/Makefile index 13c01e897..e51d34622 100644 --- a/make/mksample/webservices/EbayServer/Makefile +++ b/make/mksample/webservices/EbayServer/Makefile @@ -29,7 +29,6 @@ BUILDDIR = ../../.. -MODULE = samples PRODUCT = java include $(BUILDDIR)/common/Defs.gmk diff --git a/make/sun/applet/Makefile b/make/sun/applet/Makefile index 79ff5fcb4..f73763f39 100644 --- a/make/sun/applet/Makefile +++ b/make/sun/applet/Makefile @@ -28,7 +28,6 @@ # BUILDDIR = ../.. -MODULE = applet PACKAGE = sun.applet PRODUCT = sun include $(BUILDDIR)/common/Defs.gmk diff --git a/make/sun/awt/Makefile b/make/sun/awt/Makefile index 7d8b4b6a6..0b752e244 100644 --- a/make/sun/awt/Makefile +++ b/make/sun/awt/Makefile @@ -24,7 +24,6 @@ # BUILDDIR = ../.. -MODULE = awt PACKAGE = sun.awt LIBRARY = awt PRODUCT = sun @@ -405,7 +404,6 @@ $(LIBDIR)/%.bfc: $(FONTCONFIGS_SRC)/$(FONTCONFIGS_SRC_PREFIX)%.properties \ $(COMPILEFONTCONFIG_JARFILE) $(prep-target) $(BOOT_JAVA_CMD) -jar $(COMPILEFONTCONFIG_JARFILE) $(COMPILEFONTCONFIG_FLAGS) $< $@ - $(install-module-file) $(call chmod-file, 444) @$(java-vm-cleanup) diff --git a/make/sun/cmm/Makefile b/make/sun/cmm/Makefile index 505921422..76d6904a5 100644 --- a/make/sun/cmm/Makefile +++ b/make/sun/cmm/Makefile @@ -24,7 +24,6 @@ # BUILDDIR = ../.. -MODULE = java2d PRODUCT = sun include $(BUILDDIR)/common/Defs.gmk diff --git a/make/sun/cmm/kcms/Makefile b/make/sun/cmm/kcms/Makefile index ac3254461..b0dd8434e 100644 --- a/make/sun/cmm/kcms/Makefile +++ b/make/sun/cmm/kcms/Makefile @@ -24,7 +24,6 @@ # BUILDDIR = ../../.. -MODULE = java2d PACKAGE = sun.java2d.cmm.kcms LIBRARY = kcms PRODUCT = sun diff --git a/make/sun/cmm/lcms/Makefile b/make/sun/cmm/lcms/Makefile index 04a4c3c98..52b550dda 100644 --- a/make/sun/cmm/lcms/Makefile +++ b/make/sun/cmm/lcms/Makefile @@ -24,7 +24,6 @@ # BUILDDIR = ../../.. -MODULE = java2d PACKAGE = sun.java2d.cmm.lcms LIBRARY = lcms PRODUCT = sun diff --git a/make/sun/dcpr/Makefile b/make/sun/dcpr/Makefile index c401cbde4..bfeb4636a 100644 --- a/make/sun/dcpr/Makefile +++ b/make/sun/dcpr/Makefile @@ -24,7 +24,6 @@ # BUILDDIR = ../.. -MODULE = java2d PACKAGE = sun.dc LIBRARY = dcpr PRODUCT = sun diff --git a/make/sun/font/Makefile b/make/sun/font/Makefile index b22d0e7b7..dc735cb2c 100644 --- a/make/sun/font/Makefile +++ b/make/sun/font/Makefile @@ -28,7 +28,6 @@ # BUILDDIR = ../.. -MODULE = font PACKAGE = sun.font LIBRARY = fontmanager PRODUCT = sun @@ -136,7 +135,6 @@ library:: $(FREETYPE_LIB) $(FREETYPE_LIB): $(CP) $(FREETYPE_LIB_PATH)/$(LIB_PREFIX)freetype.$(LIBRARY_SUFFIX) $@ - $(install-module-file) endif #ifeq ($(PLATFORM), solaris) diff --git a/make/sun/font/t2k/Makefile b/make/sun/font/t2k/Makefile index a390b96b7..1a4c65682 100644 --- a/make/sun/font/t2k/Makefile +++ b/make/sun/font/t2k/Makefile @@ -28,7 +28,6 @@ # BUILDDIR = ../../.. -MODULE = font PACKAGE = sun.font LIBRARY = t2k PRODUCT = sun diff --git a/make/sun/headless/Makefile b/make/sun/headless/Makefile index 243c5bdf5..e78761b0a 100644 --- a/make/sun/headless/Makefile +++ b/make/sun/headless/Makefile @@ -30,7 +30,6 @@ MOTIF_VERSION = none MOTIF_VERSION_STRING=none LIB_LOCATION = $(LIBDIR)/$(LIBARCH)/headless -MODULE = awt PACKAGE = sun.awt LIBRARY = mawt LIBRARY_OUTPUT = headless diff --git a/make/sun/image/generic/Makefile b/make/sun/image/generic/Makefile index 80d1454ee..6a55f0e98 100644 --- a/make/sun/image/generic/Makefile +++ b/make/sun/image/generic/Makefile @@ -28,7 +28,6 @@ # BUILDDIR = ../../.. -MODULE = media PACKAGE = sun.awt.medialib LIBRARY = mlib_image PRODUCT = sun diff --git a/make/sun/image/vis/Makefile b/make/sun/image/vis/Makefile index 9e1732f29..fdf9c1f99 100644 --- a/make/sun/image/vis/Makefile +++ b/make/sun/image/vis/Makefile @@ -27,7 +27,6 @@ # Makefile for building the VIS (solaris-only) version of medialib # BUILDDIR = ../../.. -MODULE = media PACKAGE = sun.awt.medialib LIBRARY = mlib_image_v PRODUCT = sun diff --git a/make/sun/jar/Makefile b/make/sun/jar/Makefile index d544a3fe4..7b4ed870e 100644 --- a/make/sun/jar/Makefile +++ b/make/sun/jar/Makefile @@ -28,7 +28,6 @@ # BUILDDIR = ../.. -MODULE = jar-tool PACKAGE = sun.tools PRODUCT = sun include $(BUILDDIR)/common/Defs.gmk diff --git a/make/sun/javazic/Makefile b/make/sun/javazic/Makefile index 8e5f723f7..64ccf8464 100644 --- a/make/sun/javazic/Makefile +++ b/make/sun/javazic/Makefile @@ -27,7 +27,6 @@ BUILDDIR = ../.. -MODULE = base PACKAGE = sun.javazic PRODUCT = sun include $(BUILDDIR)/common/Defs.gmk @@ -70,7 +69,6 @@ $(INSTALLDIR)/$(MAPFILE): $(WORKDIR)/$(MAPFILE) $(RM) -r $(@D) $(prep-target) $(CP) -r $(WORKDIR)/* $(@D) - $(install-module-dir) clean clobber:: $(RM) -r $(TEMPDIR) $(INSTALLDIR) diff --git a/make/sun/jawt/Makefile b/make/sun/jawt/Makefile index be63ff89f..7741e1b5a 100644 --- a/make/sun/jawt/Makefile +++ b/make/sun/jawt/Makefile @@ -24,7 +24,6 @@ # BUILDDIR = ../.. -MODULE = awt PACKAGE = sun.awt LIBRARY = jawt PRODUCT = sun diff --git a/make/sun/jconsole/Makefile b/make/sun/jconsole/Makefile index 997bd2b6d..7ce349bc8 100644 --- a/make/sun/jconsole/Makefile +++ b/make/sun/jconsole/Makefile @@ -28,7 +28,6 @@ # BUILDDIR = ../.. -MODULE = jconsole PACKAGE = sun.tools.jconsole PRODUCT = sun include $(BUILDDIR)/common/Defs.gmk diff --git a/make/sun/jdbc/Makefile b/make/sun/jdbc/Makefile index 5425aaec1..f3d9fea8e 100644 --- a/make/sun/jdbc/Makefile +++ b/make/sun/jdbc/Makefile @@ -33,7 +33,6 @@ # BUILDDIR = ../.. -MODULE = jdbc-odbc PACKAGE = sun.jdbc.odbc LIBRARY = JdbcOdbc PRODUCT = sun diff --git a/make/sun/jdga/Makefile b/make/sun/jdga/Makefile index f916be787..98b5c0dd9 100644 --- a/make/sun/jdga/Makefile +++ b/make/sun/jdga/Makefile @@ -25,7 +25,6 @@ BUILDDIR = ../.. -MODULE = java2d PACKAGE = sun.jdga LIBRARY = sunwjdga PRODUCT = sun diff --git a/make/sun/jpeg/Makefile b/make/sun/jpeg/Makefile index b16ebea9f..78c53c461 100644 --- a/make/sun/jpeg/Makefile +++ b/make/sun/jpeg/Makefile @@ -24,7 +24,6 @@ # BUILDDIR = ../.. -MODULE = java2d PACKAGE = sun.awt LIBRARY = jpeg PRODUCT = sun diff --git a/make/sun/launcher/Makefile b/make/sun/launcher/Makefile index 706d01577..0d0109197 100644 --- a/make/sun/launcher/Makefile +++ b/make/sun/launcher/Makefile @@ -24,7 +24,6 @@ # BUILDDIR = ../.. -MODULE = base PACKAGE = sun.launcher PRODUCT = sun include $(BUILDDIR)/common/Defs.gmk diff --git a/make/sun/management/Makefile b/make/sun/management/Makefile index fad697922..e9d9ae53e 100644 --- a/make/sun/management/Makefile +++ b/make/sun/management/Makefile @@ -28,7 +28,6 @@ # BUILDDIR = ../.. -MODULE = management include $(BUILDDIR)/common/Defs.gmk diff --git a/make/sun/native2ascii/Makefile b/make/sun/native2ascii/Makefile index 6e03ddf6c..8504c4080 100644 --- a/make/sun/native2ascii/Makefile +++ b/make/sun/native2ascii/Makefile @@ -28,7 +28,6 @@ # BUILDDIR = ../.. -MODULE = tools PACKAGE = sun.tools.native2ascii PRODUCT = sun OTHER_JAVACFLAGS += -Xlint:serial -Werror diff --git a/make/sun/net/others/Makefile b/make/sun/net/others/Makefile index 3b69440c4..9e26bd700 100644 --- a/make/sun/net/others/Makefile +++ b/make/sun/net/others/Makefile @@ -24,7 +24,6 @@ # BUILDDIR = ../../.. -MODULE = base PACKAGE = sun.net PRODUCT = sun include $(BUILDDIR)/common/Defs.gmk diff --git a/make/sun/net/spi/nameservice/dns/Makefile b/make/sun/net/spi/nameservice/dns/Makefile index 06f2f8b76..dddb18571 100644 --- a/make/sun/net/spi/nameservice/dns/Makefile +++ b/make/sun/net/spi/nameservice/dns/Makefile @@ -30,7 +30,6 @@ BUILDDIR = ../../../../.. # dns should probably be its own module -MODULE = net-dns PACKAGE = sun.net.spi.nameservice.dns PRODUCT = sun include $(BUILDDIR)/common/Defs.gmk diff --git a/make/sun/nio/cs/Makefile b/make/sun/nio/cs/Makefile index f1eee0e34..eeddbb031 100644 --- a/make/sun/nio/cs/Makefile +++ b/make/sun/nio/cs/Makefile @@ -30,7 +30,6 @@ BUILDDIR = ../../.. # charsets should be separated from nio module -MODULE = charsets PACKAGE = sun.nio PRODUCT = sun diff --git a/make/sun/org/mozilla/javascript/Makefile b/make/sun/org/mozilla/javascript/Makefile index 99880d089..5ea19a7a4 100644 --- a/make/sun/org/mozilla/javascript/Makefile +++ b/make/sun/org/mozilla/javascript/Makefile @@ -28,7 +28,6 @@ # BUILDDIR = ../../../.. -MODULE = scripting-rhino PACKAGE = sun.org.mozilla.javascript.internal PRODUCT = sun include $(BUILDDIR)/common/Defs.gmk diff --git a/make/sun/pisces/Makefile b/make/sun/pisces/Makefile index f6c298c0a..61b50d2d4 100644 --- a/make/sun/pisces/Makefile +++ b/make/sun/pisces/Makefile @@ -24,7 +24,6 @@ # BUILDDIR = ../.. -MODULE = java2d PACKAGE = sun.pisces PRODUCT = sun include $(BUILDDIR)/common/Defs.gmk diff --git a/make/sun/rmi/cgi/Makefile b/make/sun/rmi/cgi/Makefile index 04a68473e..588c72a87 100644 --- a/make/sun/rmi/cgi/Makefile +++ b/make/sun/rmi/cgi/Makefile @@ -29,7 +29,6 @@ BUILDDIR = ../../.. # java-rmi.cgi is a JDK tool -MODULE = tools PACKAGE = sun.rmi PRODUCT = sun PROGRAM = java-rmi diff --git a/make/sun/rmi/oldtools/Makefile b/make/sun/rmi/oldtools/Makefile index 9e7f051fb..e0afea2dd 100644 --- a/make/sun/rmi/oldtools/Makefile +++ b/make/sun/rmi/oldtools/Makefile @@ -28,7 +28,6 @@ # BUILDDIR = ../../.. -MODULE = oldjavac PRODUCT = oldjavac include $(BUILDDIR)/common/Defs.gmk diff --git a/make/sun/rmi/registry/Makefile b/make/sun/rmi/registry/Makefile index 3f3e0c18a..69f37a04d 100644 --- a/make/sun/rmi/registry/Makefile +++ b/make/sun/rmi/registry/Makefile @@ -28,7 +28,6 @@ # BUILDDIR = ../../.. -MODULE = rmi PACKAGE = sun.rmi.registry PRODUCT = sun include $(BUILDDIR)/common/Defs.gmk diff --git a/make/sun/rmi/rmi/Makefile b/make/sun/rmi/rmi/Makefile index 67be5f1fe..a0ace2be4 100644 --- a/make/sun/rmi/rmi/Makefile +++ b/make/sun/rmi/rmi/Makefile @@ -28,7 +28,6 @@ # BUILDDIR = ../../.. -MODULE = rmi PACKAGE = sun.rmi PRODUCT = sun LIBRARY = rmi diff --git a/make/sun/rmi/rmic/Makefile b/make/sun/rmi/rmic/Makefile index bca860ee8..b6ec52b68 100644 --- a/make/sun/rmi/rmic/Makefile +++ b/make/sun/rmi/rmic/Makefile @@ -28,7 +28,6 @@ # BUILDDIR = ../../.. -MODULE = rmic PACKAGE = sun.rmi.rmic PRODUCT = sun include $(BUILDDIR)/common/Defs.gmk diff --git a/make/sun/rmi/rmid/Makefile b/make/sun/rmi/rmid/Makefile index 1ab9d8c50..118b7af9b 100644 --- a/make/sun/rmi/rmid/Makefile +++ b/make/sun/rmi/rmid/Makefile @@ -29,7 +29,6 @@ # BUILDDIR = ../../.. -MODULE = rmi-activation PACKAGE = sun.rmi.activation PRODUCT = sun include $(BUILDDIR)/common/Defs.gmk diff --git a/make/sun/security/ec/Makefile b/make/sun/security/ec/Makefile index 8f3f75dc3..26190f10a 100644 --- a/make/sun/security/ec/Makefile +++ b/make/sun/security/ec/Makefile @@ -89,7 +89,6 @@ # BUILDDIR = ../../.. -MODULE = security-sunec PACKAGE = sun.security.ec PRODUCT = sun @@ -309,7 +308,7 @@ $(JAR_DESTFILE): $(UNSIGNED_DIR)/sunec.jar else $(JAR_DESTFILE): $(SIGNED_DIR)/sunec.jar endif - $(install-non-module-file) + $(install-file) ifndef OPENJDK install-prebuilt: diff --git a/make/sun/security/jgss/wrapper/Makefile b/make/sun/security/jgss/wrapper/Makefile index 052cbf354..89df5e98e 100644 --- a/make/sun/security/jgss/wrapper/Makefile +++ b/make/sun/security/jgss/wrapper/Makefile @@ -24,7 +24,6 @@ # BUILDDIR = ../../../.. -MODULE = security-kerberos PACKAGE = sun.security.jgss.wrapper PRODUCT = sun diff --git a/make/sun/security/krb5/Makefile b/make/sun/security/krb5/Makefile index 8c8e5a88b..16561e5bc 100644 --- a/make/sun/security/krb5/Makefile +++ b/make/sun/security/krb5/Makefile @@ -24,7 +24,6 @@ # BUILDDIR = ../../.. -MODULE = security-kerberos PACKAGE = sun.security.krb5 PRODUCT = sun include $(BUILDDIR)/common/Defs.gmk diff --git a/make/sun/security/mscapi/Makefile b/make/sun/security/mscapi/Makefile index d4b940980..930ef7b07 100644 --- a/make/sun/security/mscapi/Makefile +++ b/make/sun/security/mscapi/Makefile @@ -89,7 +89,6 @@ # BUILDDIR = ../../.. -MODULE = security-sunmscapi PACKAGE = sun.security.mscapi LIBRARY = sunmscapi PRODUCT = sun @@ -273,7 +272,7 @@ $(JAR_DESTFILE): $(UNSIGNED_DIR)/sunmscapi.jar else $(JAR_DESTFILE): $(SIGNED_DIR)/sunmscapi.jar endif - $(install-non-module-file) + $(install-file) ifndef OPENJDK install-prebuilt: diff --git a/make/sun/security/pkcs11/Makefile b/make/sun/security/pkcs11/Makefile index 9e8102651..5e01ffead 100644 --- a/make/sun/security/pkcs11/Makefile +++ b/make/sun/security/pkcs11/Makefile @@ -89,7 +89,6 @@ # BUILDDIR = ../../.. -MODULE = security-sunpkcs11 PACKAGE = sun.security.pkcs11 LIBRARY = j2pkcs11 PRODUCT = sun @@ -288,7 +287,7 @@ $(JAR_DESTFILE): $(UNSIGNED_DIR)/sunpkcs11.jar else $(JAR_DESTFILE): $(SIGNED_DIR)/sunpkcs11.jar endif - $(install-non-module-file) + $(install-file) ifndef OPENJDK install-prebuilt: diff --git a/make/sun/security/smartcardio/Makefile b/make/sun/security/smartcardio/Makefile index 73cbe72dd..e6a6f2cc7 100644 --- a/make/sun/security/smartcardio/Makefile +++ b/make/sun/security/smartcardio/Makefile @@ -24,7 +24,6 @@ # BUILDDIR = ../../.. -MODULE = security-smartcardio PACKAGE = sun.security.smartcardio LIBRARY = j2pcsc PRODUCT = sun diff --git a/make/sun/security/tools/Makefile b/make/sun/security/tools/Makefile index 6b44e8178..bfdb261f6 100644 --- a/make/sun/security/tools/Makefile +++ b/make/sun/security/tools/Makefile @@ -24,7 +24,6 @@ # BUILDDIR = ../../.. -MODULE = security-tools PACKAGE = sun.security.tools PRODUCT = sun include $(BUILDDIR)/common/Defs.gmk diff --git a/make/sun/serialver/Makefile b/make/sun/serialver/Makefile index d2e8211f1..d7e2a1930 100644 --- a/make/sun/serialver/Makefile +++ b/make/sun/serialver/Makefile @@ -28,7 +28,6 @@ # BUILDDIR = ../.. -MODULE = serialver PACKAGE = sun.tools.serialver PRODUCT = sun include $(BUILDDIR)/common/Defs.gmk diff --git a/make/sun/splashscreen/Makefile b/make/sun/splashscreen/Makefile index 322ebf0ca..74487d8c2 100644 --- a/make/sun/splashscreen/Makefile +++ b/make/sun/splashscreen/Makefile @@ -24,7 +24,6 @@ # BUILDDIR = ../.. -MODULE = awt PACKAGE = sun.awt LIBRARY = splashscreen PRODUCT = sun diff --git a/make/sun/text/Makefile b/make/sun/text/Makefile index e8ac3047d..ac4dd9d45 100644 --- a/make/sun/text/Makefile +++ b/make/sun/text/Makefile @@ -29,7 +29,6 @@ BUILDDIR = ../.. -MODULE = localedata PACKAGE = sun.text PRODUCT = sun diff --git a/make/sun/tools/Makefile b/make/sun/tools/Makefile index c5d71cb4e..f5cd405f6 100644 --- a/make/sun/tools/Makefile +++ b/make/sun/tools/Makefile @@ -28,7 +28,6 @@ # BUILDDIR = ../.. -MODULE = tools PACKAGE = sun.tools PRODUCT = sun include $(BUILDDIR)/common/Defs.gmk diff --git a/make/sun/tracing/dtrace/Makefile b/make/sun/tracing/dtrace/Makefile index 55c896b0a..83d475d53 100644 --- a/make/sun/tracing/dtrace/Makefile +++ b/make/sun/tracing/dtrace/Makefile @@ -27,7 +27,6 @@ # Makefile for building dtrace extension # BUILDDIR = ../../.. -MODULE = tracing PACKAGE = sun.tracing.dtrace LIBRARY = jsdt PRODUCT = sun diff --git a/make/sun/xawt/Makefile b/make/sun/xawt/Makefile index f1297ef19..afe16f573 100644 --- a/make/sun/xawt/Makefile +++ b/make/sun/xawt/Makefile @@ -24,7 +24,6 @@ # BUILDDIR = ../.. -MODULE = awt PACKAGE = sun.awt.X11 LIBRARY = mawt LIBRARY_OUTPUT = xawt -- GitLab