Merge pull request #368 from jwillemsen/master

Various cleanup

7 files changed, 12 insertions, 17 deletions

diff --git a/ACE/bin/add_rel_link.sh b/ACE/bin/add_rel_link.sh
index 293058677f8..e206268eede 100755
--- a/ACE/bin/add_rel_link.sh
+++ b/ACE/bin/add_rel_link.sh
@@ -89,7 +89,7 @@ if expr "$1" : '\/' >/dev/null; then
   else
     spath=`relpath $1 $ldir`
   fi
-  # use the completed relative path and the given destignation path
+  # use the completed relative path and the given designation path
   echo ln -s $spath $2
   ln -s $spath $2
 else
diff --git a/ACE/bin/auto_compile b/ACE/bin/auto_compile
index 914bcabaa18..db6f2158703 100755
--- a/ACE/bin/auto_compile
+++ b/ACE/bin/auto_compile
@@ -17,7 +17,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 # This script requires Perl5.
 #
 # TODO: Modify the script or split it in such a way that the main copy
-# can be obtained either using cvs or downloading the lastest beta
+# can be obtained either using cvs or downloading the latest beta
 # from the WWW.
 #
 
@@ -208,7 +208,7 @@ if ($debug) {
 
 } else {
   $config_list->load ($CHECKOUT . '/' . $MODULE . '/' . 'build/' . $BUILD . '/bin/auto_run_tests.lst');
-  
+
   @RUN_LIST = $config_list->valid_entries ();
 }
 
@@ -247,7 +247,7 @@ sub copy_logs {
 }
 
 sub report_errors {
-  
+
   # First clear the lock, so the next execution works...
   unlink $disable_file; # Ignore errors!
 
@@ -273,7 +273,7 @@ sub report_errors {
 	  close (MAIL); # Ignore errors....
 	}
   }
-  
+
   # Now send the complete log to bugzilla...
   if ($copy_logs) {
     copy_logs ();
diff --git a/ACE/bin/auto_compile_wrapper b/ACE/bin/auto_compile_wrapper
index f99c8df01a7..ffdc9b803fd 100755
--- a/ACE/bin/auto_compile_wrapper
+++ b/ACE/bin/auto_compile_wrapper
@@ -2,9 +2,9 @@
 #
 # $Id$
 #
-# Usually cron setups a really miserable enviroment, this script
+# Usually cron setups a really miserable environment, this script
 # serves two purposes:
-# 1. Setup a good enviroment for auto_compile.
+# 1. Setup a good environment for auto_compile.
 # 2. Invoke auto_compile with the proper arguments for each site.
 #
 # The idea is to modify this script on a per-site basis and leave
diff --git a/ACE/bin/g++dep b/ACE/bin/g++dep
index a4cd4873301..73767c627e9 100755
--- a/ACE/bin/g++dep
+++ b/ACE/bin/g++dep
@@ -1,7 +1,7 @@
 #! /bin/sh
 # $Id$
 
-# This utility is a lightly editted version of the freed Berkeley
+# This utility is a lightly edited version of the freed Berkeley
 # script `mkdep'.  The current script is intended to work for GNU G++.
 
 # Here is the original BSD header:
@@ -33,7 +33,7 @@ case $1 in
   -p) SED='s;\.o;;'
       shift ;;
 
-  # -A implies -r and fixes the .obj line, hate 
+  # -A implies -r and fixes the .obj line, hate
   -A) REL="ACE_ROOT TAO_ROOT "$REL
       DO_ACE_MAKE_DEPEND=1
       shift ;;
@@ -108,7 +108,7 @@ if [ $DO_ACE_MAKE_DEPEND -eq 1 ]; then
   #    foo.o:
   # into
   #    .obj/foo.o .shobj/foo.o .obj/foo.so .shobj/foo.so:
-  # 
+  #
   # will be foo.o foo.
   LONG_TARGET="$""(sort "
   for i in VDIR VSHDIR; do
diff --git a/ACE/bin/libsize.pl b/ACE/bin/libsize.pl
index ca532210c24..0e80cf07994 100755
--- a/ACE/bin/libsize.pl
+++ b/ACE/bin/libsize.pl
@@ -152,7 +152,7 @@ if ($html) {
 
 
 ####
-#### Build library with componnents specified in argument.
+#### Build library with components specified in argument.
 ####
 sub build_lib ()
 {
diff --git a/ACE/bin/pippen.pl b/ACE/bin/pippen.pl
index 524ffccf962..c408a89ec05 100755
--- a/ACE/bin/pippen.pl
+++ b/ACE/bin/pippen.pl
@@ -76,7 +76,7 @@ while ( $#ARGV >= 0)
     elsif ($ARGV[0] =~ m/^-(\?|h)/i) {     # Help information
         print "Options\n";
         print "-list          - Prints out the list of project files\n";
-        print "-config <c>    - Use <c> as a configuratoin\n";
+        print "-config <c>    - Use <c> as a configuration\n";
         print "-evc3          - Looks for eMbedded Visual C++ 3.0 projects\n";
         print "-msvc6         - Looks for Visual C++ 5.0/6.0 projects\n";
         print "-msvc7         - Looks for Visual C++ 7.0 projects\n";
diff --git a/ACE/include/makeinclude/platform_android.GNU b/ACE/include/makeinclude/platform_android.GNU
index 84d1a85a2b5..42779ddf49d 100644
--- a/ACE/include/makeinclude/platform_android.GNU
+++ b/ACE/include/makeinclude/platform_android.GNU
@@ -123,11 +123,6 @@ AR      ?= ar
 ARFLAGS ?= rsuv
 RANLIB   = @true
 
-PIC      = -fPIC
-AR      ?= ar
-ARFLAGS ?= rsuv
-RANLIB   = @true
-
 # end of: include most of platform_linux_common.GNU
 
 #No rwho on Android