< prev index next >

make/ExplodedImageOptimize.gmk

Print this page

        

@@ -1,7 +1,7 @@
 #
-# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2018, 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

@@ -27,25 +27,23 @@
 
 default: all
 
 include $(SPEC)
 include MakeBase.gmk
-include Execute.gmk
 include $(TOPDIR)/make/ModuleTools.gmk
 
 ################################################################################
 
-ALL_MODULEINFO_CLASSES := $(wildcard $(JDK_OUTPUTDIR)/modules/*/module-info.class)
+PACKAGES_ATTRIBUTE_TARGET := $(JDK_OUTPUTDIR)/_packages_attribute.done
+ALL_MODULEINFO_CLASSES := $(wildcard $(JDK_OUTPUTDIR)/modules/*/module_info.class)
 
-$(eval $(call SetupExecute, optimize_image, \
-    WARN := Optimizing the exploded image, \
-    DEPS := $(ALL_MODULEINFO_CLASSES) $(BUILD_JIGSAW_CLASSES), \
-    OUTPUT_DIR := $(JDK_OUTPUTDIR), \
-    COMMAND := $(TOOL_ADD_PACKAGES_ATTRIBUTE) $(JDK_OUTPUTDIR), \
-))
+$(PACKAGES_ATTRIBUTE_TARGET): $(ALL_MODULEINFO_CLASSES) $(BUILD_JIGSAW_CLASSES)
+        $(call LogInfo, Optimizing the exploded image)
+        $(call ExecuteWithLog, $@, $(TOOL_ADD_PACKAGES_ATTRIBUTE) $(JDK_OUTPUTDIR))
+        $(TOUCH) $@
 
-TARGETS := $(optimize_image_TARGET)
+TARGETS := $(PACKAGES_ATTRIBUTE_TARGET)
 
 ################################################################################
 
 all: $(TARGETS)
 
< prev index next >