Mercurial > hg > release > icedtea-1.10
changeset 801:fafdbc8e2794 cacao
2008-02-11 Lillian Angel <langel@redhat.com>
* Makefile.am: Changed cp -a arg to -dpPR.
* Makefile.in: Regenerate.
author | Lillian Angel <langel@redhat.com> |
---|---|
date | Mon, 11 Feb 2008 09:49:39 -0500 |
parents | be4fb2d0fe2c |
children | 93c7943f1787 |
files | ChangeLog Makefile.am Makefile.in |
diffstat | 3 files changed, 27 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Feb 07 13:19:13 2008 -0500 +++ b/ChangeLog Mon Feb 11 09:49:39 2008 -0500 @@ -1,3 +1,8 @@ +2008-02-11 Lillian Angel <langel@redhat.com> + + * Makefile.am: Changed cp -a arg to -dpPR. + * Makefile.in: Regenerate. + 2008-02-07 Lillian Angel <langel@redhat.com> * Makefile.in: Regenerate.
--- a/Makefile.am Thu Feb 07 13:19:13 2008 -0500 +++ b/Makefile.am Mon Feb 11 09:49:39 2008 -0500 @@ -278,7 +278,7 @@ # Copy over OpenJDK sources for ecj. stamps/clone-ecj.stamp: stamps/patch.stamp if ! test -d openjdk-ecj ; then \ - cp -al openjdk openjdk-ecj ; \ + cp -dpPRl openjdk openjdk-ecj ; \ fi mkdir -p stamps touch stamps/clone-ecj.stamp @@ -453,9 +453,9 @@ -C openjdk/ j2se_only if test "$(ENABLE_PLUGIN)" == "yes" ; \ then \ - cp -af gcjwebplugin.so \ + cp -dpPRf gcjwebplugin.so \ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) ; \ - cp -af gcjwebplugin.so \ + cp -dpPRf gcjwebplugin.so \ $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) ; \ fi $(FASTJAR) uf $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/tools.jar \ @@ -472,9 +472,9 @@ j2se_fastdebug_only if test "$(ENABLE_PLUGIN)" == "yes" ; \ then \ - cp -af gcjwebplugin.so \ + cp -dpPRf gcjwebplugin.so \ $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) ; \ - cp -af gcjwebplugin.so \ + cp -dpPRf gcjwebplugin.so \ $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR) ; \ fi $(FASTJAR) uf $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/lib/tools.jar \ @@ -588,7 +588,7 @@ for copy_dir in $(ICEDTEA_COPY_DIRS) ; \ do \ mkdir -p rt/$$copy_dir ; \ - cp -af openjdk/jdk/src/share/classes/$$copy_dir/*.java \ + cp -dpPRf openjdk/jdk/src/share/classes/$$copy_dir/*.java \ rt/$$copy_dir ; \ done mkdir -p stamps @@ -616,28 +616,28 @@ for copy_dir in `cat tools-copy/tools-jdk-copy-files.txt` ; \ do \ mkdir -p hotspot-tools/$$copy_dir ; \ - cp -arf openjdk/jdk/src/share/classes/$$copy_dir/* \ + cp -dpPRf openjdk/jdk/src/share/classes/$$copy_dir/* \ hotspot-tools/$$copy_dir ; \ done for copy_dir in `cat tools-copy/tools-langtools-copy-files.txt` ; \ do \ mkdir -p hotspot-tools/$$copy_dir ; \ - cp -arf openjdk/langtools/src/share/classes/$$copy_dir/* \ + cp -dpPRf openjdk/langtools/src/share/classes/$$copy_dir/* \ hotspot-tools/$$copy_dir ; \ done for copy_dir in `cat tools-copy/tools-corba-copy-files.txt` ; \ do \ mkdir -p hotspot-tools/$$copy_dir ; \ - cp -arf openjdk/corba/src/share/classes/$$copy_dir/* \ + cp -dpPRf openjdk/corba/src/share/classes/$$copy_dir/* \ hotspot-tools/$$copy_dir ; \ done for copy_dir in `cat tools-copy/tools-jaxws-copy-files.txt` ; \ do \ mkdir -p hotspot-tools/$$copy_dir ; \ - cp -arf openjdk/jaxws/src/share/classes/$$copy_dir/* \ + cp -dpPRf openjdk/jaxws/src/share/classes/$$copy_dir/* \ hotspot-tools/$$copy_dir ; \ done @@ -768,7 +768,7 @@ @$< ; \ fi cp tools/default.jnlp lib/tools - cp -r tools/netx/jnlp/resources lib/tools/netx/jnlp + cp -R tools/netx/jnlp/resources lib/tools/netx/jnlp mkdir -p stamps touch stamps/tools-class-files.stamp
--- a/Makefile.in Thu Feb 07 13:19:13 2008 -0500 +++ b/Makefile.in Mon Feb 11 09:49:39 2008 -0500 @@ -763,7 +763,7 @@ # Copy over OpenJDK sources for ecj. stamps/clone-ecj.stamp: stamps/patch.stamp if ! test -d openjdk-ecj ; then \ - cp -al openjdk openjdk-ecj ; \ + cp -dpPRl openjdk openjdk-ecj ; \ fi mkdir -p stamps touch stamps/clone-ecj.stamp @@ -913,9 +913,9 @@ -C openjdk/ j2se_only if test "$(ENABLE_PLUGIN)" == "yes" ; \ then \ - cp -af gcjwebplugin.so \ + cp -dpPRf gcjwebplugin.so \ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) ; \ - cp -af gcjwebplugin.so \ + cp -dpPRf gcjwebplugin.so \ $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) ; \ fi $(FASTJAR) uf $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/tools.jar \ @@ -932,9 +932,9 @@ j2se_fastdebug_only if test "$(ENABLE_PLUGIN)" == "yes" ; \ then \ - cp -af gcjwebplugin.so \ + cp -dpPRf gcjwebplugin.so \ $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) ; \ - cp -af gcjwebplugin.so \ + cp -dpPRf gcjwebplugin.so \ $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR) ; \ fi $(FASTJAR) uf $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/lib/tools.jar \ @@ -1030,7 +1030,7 @@ for copy_dir in $(ICEDTEA_COPY_DIRS) ; \ do \ mkdir -p rt/$$copy_dir ; \ - cp -af openjdk/jdk/src/share/classes/$$copy_dir/*.java \ + cp -dpPRf openjdk/jdk/src/share/classes/$$copy_dir/*.java \ rt/$$copy_dir ; \ done mkdir -p stamps @@ -1048,28 +1048,28 @@ for copy_dir in `cat tools-copy/tools-jdk-copy-files.txt` ; \ do \ mkdir -p hotspot-tools/$$copy_dir ; \ - cp -arf openjdk/jdk/src/share/classes/$$copy_dir/* \ + cp -dpPRf openjdk/jdk/src/share/classes/$$copy_dir/* \ hotspot-tools/$$copy_dir ; \ done for copy_dir in `cat tools-copy/tools-langtools-copy-files.txt` ; \ do \ mkdir -p hotspot-tools/$$copy_dir ; \ - cp -arf openjdk/langtools/src/share/classes/$$copy_dir/* \ + cp -dpPRf openjdk/langtools/src/share/classes/$$copy_dir/* \ hotspot-tools/$$copy_dir ; \ done for copy_dir in `cat tools-copy/tools-corba-copy-files.txt` ; \ do \ mkdir -p hotspot-tools/$$copy_dir ; \ - cp -arf openjdk/corba/src/share/classes/$$copy_dir/* \ + cp -dpPRf openjdk/corba/src/share/classes/$$copy_dir/* \ hotspot-tools/$$copy_dir ; \ done for copy_dir in `cat tools-copy/tools-jaxws-copy-files.txt` ; \ do \ mkdir -p hotspot-tools/$$copy_dir ; \ - cp -arf openjdk/jaxws/src/share/classes/$$copy_dir/* \ + cp -dpPRf openjdk/jaxws/src/share/classes/$$copy_dir/* \ hotspot-tools/$$copy_dir ; \ done @@ -1200,7 +1200,7 @@ @$< ; \ fi cp tools/default.jnlp lib/tools - cp -r tools/netx/jnlp/resources lib/tools/netx/jnlp + cp -R tools/netx/jnlp/resources lib/tools/netx/jnlp mkdir -p stamps touch stamps/tools-class-files.stamp