src/utils/reorder/Makefile

rev 59383 : [mq]: final

*** 1,7 ****
  #
! # Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  #
! # Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
*** 56,70 ****
  BOOTPATH = -Xbootclasspath:$(JRE_LIB)/rt.jar:$(JRE_LIB)/charsets.jar
  JRE_JAVA = $(JRE_IMAGE_DIR)/bin/java
  
  JAVA_BIN = $(BINDIR)/java
  
! all : jars.reorder libs.reorder
  
  tools : $(OBJDIR) $(OBJDIR)/libmcount.so $(OBJDIR)/remove_mcount
  
! copy : jars.copy libs.copy
  
  clean : 
          $(RM) $(REORDER_JAR)
  
  clobber : clean
--- 56,70 ----
  BOOTPATH = -Xbootclasspath:$(JRE_LIB)/rt.jar:$(JRE_LIB)/charsets.jar
  JRE_JAVA = $(JRE_IMAGE_DIR)/bin/java
  
  JAVA_BIN = $(BINDIR)/java
  
! all : jars.reorder
  
  tools : $(OBJDIR) $(OBJDIR)/libmcount.so $(OBJDIR)/remove_mcount
  
! copy : jars.copy
  
  clean : 
          $(RM) $(REORDER_JAR)
  
  clobber : clean
*** 80,108 ****
          $(CP) $(OUTDIR)/reorder_charsets_jar-$(PLATFORM)  reorder_charsets_jar-$(PLATFORM)
  
  REORDER_JAR = $(OUTDIR)/reorder_$(subst .,_,$(JARFILE))-$(PLATFORM)
  reorder.jar : $(REORDER_JAR)
  
- libs.reorder :
- ifeq ($(PLATFORM), solaris)
-         $(MAKE) LIBBLDDIR=java/zip        LIBTMPDIR=sun/java.util.zip/zip   reorder.lib
-         $(MAKE) LIBBLDDIR=java/java       LIBTMPDIR=java/java.lang/java     reorder.lib
-         $(MAKE) LIBBLDDIR=java/nio        LIBTMPDIR=java/java.nio/nio       reorder.lib
-         $(MAKE) LIBBLDDIR=sun/font        LIBTMPDIR=sun/sun.awt.font/fontmanager reorder.lib
-         $(MAKE) LIBBLDDIR=sun/jpeg        LIBTMPDIR=sun/sun.awt/jpeg        reorder.lib
-         $(MAKE) LIBBLDDIR=java/verify     LIBTMPDIR=java/verify             reorder.lib
- endif
- 
- libs.copy:
- ifeq ($(PLATFORM), solaris)
-         $(CP) $(OUTDIR)/reorder_java_zip-$(ARCH) ../../java/zip/reorder-$(ARCH)
-         $(CP) $(OUTDIR)/reorder_java_java-$(ARCH) ../../java/java/reorder-$(ARCH)
-         $(CP) $(OUTDIR)/reorder_sun_font-$(ARCH) ../../sun/font/reorder-$(ARCH)
-         $(CP) $(OUTDIR)/reorder_sun_jpeg-$(ARCH) ../../sun/jpeg/reorder-$(ARCH)
-         $(CP) $(OUTDIR)/reorder_java_verify-$(ARCH) ../../java/verify/reorder-$(ARCH)
- endif
- 
  REORDER_LIB = $(OUTDIR)/reorder_$(subst /,_,$(LIBBLDDIR))-$(ARCH)
  reorder.lib : $(OBJDIR) $(REORDER_LIB)
  
  
  # This target 'test_classes' also used by hotspot reordering.
--- 80,89 ----