make/Makefile-classic

*** 1,7 ****
  #
! # Copyright (c) 2007, 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) 2007, 2012 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
*** 113,123 ****
  
  JAVAC_JAR = $(LIB_DIR)/javac.jar
  JAVADOC_JAR = $(LIB_DIR)/javadoc.jar
  JAVAH_JAR = $(LIB_DIR)/javah.jar
  JAVAP_JAR = $(LIB_DIR)/javap.jar
- APT_JAR = $(LIB_DIR)/apt.jar
  
  CLASSES_JAR = $(DIST_DIR)/classes.jar
  SRC_ZIP = $(DIST_DIR)/src.zip
  
  BUILDTOOLSRC_DIR = tools
--- 113,122 ----
*** 161,171 ****
    FULL_VERSION = $(RELEASE)-$(USER_RELEASE_SUFFIX)-$(BUILD_NUMBER)
  endif
  
  #----- useful macros
  
! TOOLS =  javac javadoc javah javap apt
  
  SOURCE_LEVEL = 5
  BOOTSTRAP_TARGET_LEVEL = 5
  TARGET_LEVEL = 6
  
--- 160,170 ----
    FULL_VERSION = $(RELEASE)-$(USER_RELEASE_SUFFIX)-$(BUILD_NUMBER)
  endif
  
  #----- useful macros
  
! TOOLS =  javac javadoc javah javap
  
  SOURCE_LEVEL = 5
  BOOTSTRAP_TARGET_LEVEL = 5
  TARGET_LEVEL = 6
  
*** 317,348 ****
          $(MKDIR) -p $(CLASSES_DIR)
          $(BOOT_JAVAC) -sourcepath "" -classpath $(CLASSES_DIR) -d $(CLASSES_DIR) -target $(TARGET_LEVEL) $(JAVAP_JAVA_FILES)
          ( $(ECHO) Main-Class: sun.tools.javap.Main ) > $(BUILD_DIR)/javap.mf
          $(BOOTJAR) -cfm $@ $(BUILD_DIR)/javap.mf $(patsubst %,-C $(CLASSES_DIR) %, $(JAVAP_DIRS))
  
- #----- apt
- 
- APT_DIRS = \
-         com/sun/mirror \
-         com/sun/tools/apt
- 
- APT_RESOURCE_FILES = \
-         $(shell find $(patsubst %,$(SRC_CLASSES_DIR)/%,$(APT_DIRS)) -name SCCS -prune -o -name \*.properties -print )
- 
- APT_JAVA_FILES = \
-         $(shell find $(patsubst %,$(SRC_CLASSES_DIR)/%,$(APT_DIRS)) -name SCCS -prune -o -name \*.java -print ) \
-         $(patsubst $(SRC_CLASSES_DIR)/%.properties,$(GENSRC_DIR)/%.java,$(APT_RESOURCE_FILES))
-  
- $(APT_JAR): $(APT_JAVA_FILES) $(JAVAC_JAR) \
-                 $(patsubst $(SRC_CLASSES_DIR)/%.properties,$(GENSRC_DIR)/%.java,$(APT_RESOURCE_FILES))
-         $(MKDIR) -p $(CLASSES_DIR) $(@D)
-         $(BOOT_JAVAC) -sourcepath "" -classpath $(CLASSES_DIR) -d $(CLASSES_DIR) -target $(TARGET_LEVEL) $(NO_PROPRIETARY_API_WARNINGS) \
-                 $(APT_JAVA_FILES) \
-                 $(patsubst $(SRC_CLASSES_DIR)/%.properties,$(GENSRC_DIR)/%.java,$(APT_RESOURCE_FILES))
-         ( $(ECHO) Main-Class: com.sun.tools.apt.Main ; $(ECHO) Class-Path: javac.jar ) > $(BUILD_DIR)/apt.mf
-         $(BOOTJAR) -cfm $@ $(BUILD_DIR)/apt.mf $(patsubst %,-C $(CLASSES_DIR) %, $(APT_DIRS))
- 
  #-----
  
  build-tools: $(BUILDTOOLCLASSES_DIR)/CompileProperties/CompileProperties.class
  
  $(GENSRC_DIR)/%.java: $(SRC_CLASSES_DIR)/%.properties $(BUILDTOOLCLASSES_DIR)/CompileProperties/CompileProperties.class
--- 316,325 ----
*** 364,374 ****
          $(MKDIR) -p $(@D)
          $(BOOT_JAVAC) -d $(@D) $<
  
  #----- all classes
  
! $(DIST_DIR)/%/classes.jar: $(JAVAC_JAR) $(JAVADOC_JAR) $(JAVAH_JAR) $(JAVAP_JAR) $(APT_JAR)
          $(MKDIR) -p $(@D)
          $(BOOTJAR) -cf $@ -C $(CLASSES_DIR) .
  
  #----- src.zip
  
--- 341,351 ----
          $(MKDIR) -p $(@D)
          $(BOOT_JAVAC) -d $(@D) $<
  
  #----- all classes
  
! $(DIST_DIR)/%/classes.jar: $(JAVAC_JAR) $(JAVADOC_JAR) $(JAVAH_JAR) $(JAVAP_JAR)
          $(MKDIR) -p $(@D)
          $(BOOTJAR) -cf $@ -C $(CLASSES_DIR) .
  
  #----- src.zip
  
*** 399,409 ****
  quick-check: $(patsubst %, $(DIST_LIB_DIR)/%.jar, $(TOOLS))
          $(TESTJAVA) -jar $(JAVAC_JAR) -version
          - $(TESTJAVA) -jar $(JAVADOC_JAR) -version
          $(TESTJAVA) -jar $(JAVAH_JAR) -version
          - $(TESTJAVA) -jar $(JAVAP_JAR) -version
-         $(TESTJAVA) -jar $(APT_JAR) -version
  
  #-----
  
  .PHONY: \
          all \
--- 376,385 ----