Mercurial > hg > openjdk > lambda > jdk
changeset 7497:a23b0df73324
8008295: build-infra: Cleanup in Import.gmk
Reviewed-by: ohrstrom, tbell
| author | erikj |
|---|---|
| date | Mon, 18 Feb 2013 11:27:43 +0100 |
| parents | fb7e3edf22b2 |
| children | c24bc91caa67 |
| files | makefiles/Import.gmk |
| diffstat | 1 files changed, 1 insertions(+), 43 deletions(-) [+] |
line wrap: on
line diff
--- a/makefiles/Import.gmk Mon Feb 18 11:26:23 2013 +0100 +++ b/makefiles/Import.gmk Mon Feb 18 11:27:43 2013 +0100 @@ -100,33 +100,13 @@ ####### -ifeq ($(OPENJDK_TARGET_OS),solaris) -define do-install-file - $(MKDIR) -p '$$(@D)' - $(RM) '$$@' - $(CP) -r -P '$$<' '$$(@D)' -endef -else ifeq ($(OPENJDK_TARGET_OS),macosx) -define do-install-file - $(MKDIR) -p '$$(@D)' - $(RM) '$$@' - $(CP) -pRP '$$<' '$$@' -endef -else -define do-install-file - $(MKDIR) -p '$$(@D)' - $(RM) '$$@' - $(CP) -P '$$<' '$$@' -endef -endif - define CopyDir $1_SRC_FILES := $(shell $(FIND) $2 -type f -a \( -name DUMMY $(addprefix -o$(SPACE)-name$(SPACE),$4) \)) $1_DST_FILES := $$(patsubst $2/%,$3/%,$$($1_SRC_FILES)) IMPORT_TARGET_FILES += $$($1_DST_FILES) $3/% : $2/% $(ECHO) $(LOG_INFO) Copying $$(@F) - $(do-install-file) + $$(install-file) endef ####### @@ -197,26 +177,4 @@ ####### -ifeq ($(OPENJDK_TARGET_OS),solaris) -define install-file - $(MKDIR) -p '$(@D)' - $(RM) '$@' - $(CP) -r -P '$<' '$(@D)' -endef -else ifeq ($(OPENJDK_TARGET_OS),macosx) -define install-file - $(MKDIR) -p '$(@D)' - $(RM) '$@' - $(CP) -pRP '$<' '$@' -endef -else -define install-file - $(MKDIR) -p '$(@D)' - $(RM) '$@' - $(CP) -P '$<' '$@' -endef -endif - -####### - all: $(IMPORT_TARGET_FILES)