diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | GNUmakefile (renamed from GNUMakefile) | 10 | ||||
| -rw-r--r-- | bin/GNUmakefile (renamed from bin/GNUMakefile) | 2 | ||||
| -rwxr-xr-x | bin/ace-install | 2 | ||||
| -rwxr-xr-x | bin/ace_components | 2 | ||||
| -rwxr-xr-x | bin/count_lines | 2 | ||||
| -rwxr-xr-x | bin/create_ace_build.pl | 2 | ||||
| -rwxr-xr-x | bin/fuzz.pl | 10 | ||||
| -rwxr-xr-x | bin/g++dep | 2 | ||||
| -rwxr-xr-x | bin/make_release | 14 | ||||
| -rwxr-xr-x | bin/perltest2cpp.pl | 2 | ||||
| -rwxr-xr-x | bin/update-ace+tao.sh | 2 |
12 files changed, 29 insertions, 29 deletions
diff --git a/ChangeLog b/ChangeLog index 8d591df46d3..9da3648307b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,10 +8,10 @@ Sat May 1 22:23:35 2004 Ossama Othman <ossama@dre.vanderbilt.edu> * Makefile: * bin/Makefile: - * GNUMakefile: - * bin/GNUMakefile: + * GNUmakefile: + * bin/GNUmakefile: - Renamed "Makefile"s to "GNUMakefile"s to make it obvious to + Renamed "Makefile"s to "GNUmakefile"s to make it obvious to users that GNU Make is required to parse the files. * bin/ace-install: @@ -25,7 +25,7 @@ Sat May 1 22:23:35 2004 Ossama Othman <ossama@dre.vanderbilt.edu> * bin/update-ace+tao.sh: Updated to references to "Makefile" to use the new name - "GNUMakefile". + "GNUmakefile". Sat May 01 17:12:21 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl> diff --git a/GNUMakefile b/GNUmakefile index 4a20420e87c..f2f02707683 100644 --- a/GNUMakefile +++ b/GNUmakefile @@ -1,7 +1,7 @@ #---------------------------------------------------------------------------- # $Id$ # -# Top-level GNUMakefile for the ACE toolkit libraries, tests, and +# Top-level GNUmakefile for the ACE toolkit libraries, tests, and # applications #---------------------------------------------------------------------------- @@ -25,7 +25,7 @@ DIRS = ace \ websvcs \ Kokyu -CLONE = GNUMakefile \ +CLONE = GNUmakefile \ ace \ apps \ bin \ @@ -133,7 +133,7 @@ CONTROLLED_FILES = \ COPYING \ ChangeLog* \ FAQ \ - GNUMakefile \ + GNUmakefile \ Makefile.am \ PROBLEM-REPORT-FORM \ README \ @@ -223,14 +223,14 @@ release: $(APPLY_NEW_TAG) tag: @$(ACE_ROOT)/bin/make_release $(CHECK) -k ace -v $(REL) -u -#### The following target is for use by the TAO GNUMakefile. It should not +#### The following target is for use by the TAO GNUmakefile. It should not #### be called directly from the command line. The releasetao target #### creates the combined ACE-TAO kit. releasetao: @$(ACE_ROOT)/bin/make_release -k ace+tao $(ACE_TAG) $(TAO_TAG) \ $(INSTALL_KIT) $(ZIP_FILES) $(CHECK) -#### The following target is for use by the CIAO GNUMakefile. It should not +#### The following target is for use by the CIAO GNUmakefile. It should not #### be called directly from the command line. The releaseciao target #### creates the combined ACE+TAO+CIAO kit. releaseciao: diff --git a/bin/GNUMakefile b/bin/GNUmakefile index 8b24afe6a79..2aa81c9f906 100644 --- a/bin/GNUMakefile +++ b/bin/GNUmakefile @@ -2,7 +2,7 @@ # # $Id$ # -# GNUMakefile for all the ACE binaries +# GNUmakefile for all the ACE binaries # # This Makefile can build clone and envinfo, but not both at the same # time. clone must not use any ACE pieces, since it's building a diff --git a/bin/ace-install b/bin/ace-install index 5416c5dc20a..8a26fd802e5 100755 --- a/bin/ace-install +++ b/bin/ace-install @@ -451,7 +451,7 @@ if [ $install -ne 0 ]; then ALL_PROGS=`find orbsvcs -type f -perm +a+x -print | grep -v ".*lib.*" | grep -v ".\.pl" | grep -v test | grep -v example` ALL_PROGS="`find utils -type f -perm +a+x -print` $ALL_PROGS" - PROGS=`echo $ALL_PROGS | tr " " "\n" | grep -v test | grep -v default.bld | grep -v README | grep -v GNUMakefile` + PROGS=`echo $ALL_PROGS | tr " " "\n" | grep -v test | grep -v default.bld | grep -v README | grep -v GNUmakefile` for f in TAO_IDL/tao_idl $PROGS; do echo $f diff --git a/bin/ace_components b/bin/ace_components index ad3aae61ad1..23bfeb29149 100755 --- a/bin/ace_components +++ b/bin/ace_components @@ -3,7 +3,7 @@ # # Encapsulates set/access of a components file, which records set of # components that were built in a library. Intended to be used by -# GNUMakefiles and scripts. See ACE_wrappers/ace/GNUMakefile for an +# GNUmakefiles and scripts. See ACE_wrappers/ace/GNUmakefile for an # example. # usage="usage: $0 --ace | --orbsvcs | --tao | --pace \ diff --git a/bin/count_lines b/bin/count_lines index d3c38156ec6..f440e19c765 100755 --- a/bin/count_lines +++ b/bin/count_lines @@ -141,7 +141,7 @@ sub initfiletypes { # twice, but it could be unproperly classified. local %filenames = - ('GNUMakefile' => 'Makefile', + ('GNUmakefile' => 'Makefile', 'Makefile.*' => 'Makefile', 'README' => 'README files', 'COPYING' => 'Licenses', diff --git a/bin/create_ace_build.pl b/bin/create_ace_build.pl index de565055365..16bd9d375cf 100755 --- a/bin/create_ace_build.pl +++ b/bin/create_ace_build.pl @@ -321,7 +321,7 @@ sub wanted { ! /^.*\.pdb\z/s && ! /^\.cvsignore\z/s && ! /^\.disable\z/s && - ! /^GNUMakefile.*\z/s + ! /^GNUmakefile.*\z/s ); } diff --git a/bin/fuzz.pl b/bin/fuzz.pl index b60430e34d2..d6b14da140d 100755 --- a/bin/fuzz.pl +++ b/bin/fuzz.pl @@ -116,7 +116,7 @@ sub store_file ($) elsif ($name =~ /ChangeLog/i && -f $name) { push @files_changelog, ($name); } - elsif ($name =~ /\/GNUMakefile.*.[^~]$/) { + elsif ($name =~ /\/GNUmakefile.*.[^~]$/) { push @files_makefile, ($name); } elsif ($name =~ /\.(mpc|mwc|mpb|mpt)/i) { @@ -530,7 +530,7 @@ sub check_for_dependency_file () if (/^DEPENDENCY_FILE\s* =\s*(.*)/) { my $depend = $1; my $path = $file; - $path =~ s/\/GNUMakefile.*/\//; + $path =~ s/\/GNUmakefile.*/\//; $depend = $path . $depend; unless (open (DFILE, $depend)) { print_error ("DEPENDENCY_FILE \"$depend\" not found"); @@ -549,8 +549,8 @@ sub check_for_dependency_file () } } -# This checks to see if GNUMakefiles define a MAKEFILE, and if it matches the -# name of the GNUMakefile +# This checks to see if GNUmakefiles define a MAKEFILE, and if it matches the +# name of the GNUmakefile sub check_for_makefile_variable () { print "Running MAKEFILE variable test\n"; @@ -573,7 +573,7 @@ sub check_for_makefile_variable () } } } - if ($makevarfound == 0 and !($filename eq "GNUMakefile")) { + if ($makevarfound == 0 and !($filename eq "GNUmakefile")) { print_error ("MAKEFILE variable missing in $file"); print " Add MAKEFILE = $filename to the top of $file.\n\n"; } diff --git a/bin/g++dep b/bin/g++dep index 8596a74f9b4..2c4cefa7992 100755 --- a/bin/g++dep +++ b/bin/g++dep @@ -14,7 +14,7 @@ if [ $# = 0 ] ; then fi DO_ACE_MAKE_DEPEND=0 -MAKE=GNUMakefile +MAKE=GNUmakefile STOPNOW=0 while [ $STOPNOW -eq 0 ] do diff --git a/bin/make_release b/bin/make_release index 517885a9d61..be191cd8c3b 100755 --- a/bin/make_release +++ b/bin/make_release @@ -5,7 +5,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' # $Id$ # # Creates an ACE or TAO kit. Intended to be called from the -# ACE or TAO top-level GNUMakefiles. +# ACE or TAO top-level GNUmakefiles. # # The first three lines above let this script run without specifying the # full path to perl, as long as it is in the user's PATH. @@ -284,7 +284,7 @@ if ($update_versions && "$kit" ne 'ace+tao+ciao') { $status = &generate_makefiles (); if ($status != 0) { - die "$0: failed to generate GNUMakefiles\n"; + die "$0: failed to generate GNUmakefiles\n"; } $status = &create_kit (); @@ -743,7 +743,7 @@ sub diff () { ######## -######## Generate GNUMakefiles and workspace/project files. +######## Generate GNUmakefiles and workspace/project files. ######## sub generate_makefiles () { @@ -824,12 +824,12 @@ sub create_kit () { # Create a list of files that needs to be packed with CIAO # including ACE+TAO. my $tmp_rel_file = ''; - chomp ($tmp_rel_file = `$make -f ACE_wrappers/TAO/GNUMakefile show_release_files`); + chomp ($tmp_rel_file = `$make -f ACE_wrappers/TAO/GNUmakefile show_release_files`); $release_files .= ' '; $release_files .= $tmp_rel_file; $tmp_rel_file = ''; $release_files .= ' '; - chomp ($tmp_rel_file = `$make -f ACE_wrappers/TAO/CIAO/GNUMakefile show_release_files`); + chomp ($tmp_rel_file = `$make -f ACE_wrappers/TAO/CIAO/GNUmakefile show_release_files`); $release_files .= $tmp_rel_file; print "RELEASE FILES from CIAO are $release_files \n"; @@ -867,7 +867,7 @@ sub create_kit () { if ($kit eq 'ace+tao' || $kit eq 'ace+tao+ciao') { # Set the relese files once again my $tmp_rel_file = ''; - chomp ($tmp_rel_file = `$make -f ACE_wrappers/TAO/GNUMakefile show_release_files`); + chomp ($tmp_rel_file = `$make -f ACE_wrappers/TAO/GNUmakefile show_release_files`); $release_files = $base_release_files; $release_files .= ' '; $release_files .= $tmp_rel_file; @@ -918,7 +918,7 @@ sub create_kit () { } # Reset it again with autoconf files - chomp ($release_files = `$make -f ACE_wrappers/GNUMakefile show_autoconf_release_files`); + chomp ($release_files = `$make -f ACE_wrappers/GNUmakefile show_autoconf_release_files`); $build_command = "$rm ACE.zip ACE-lib.zip; " . diff --git a/bin/perltest2cpp.pl b/bin/perltest2cpp.pl index 69f0479c9bb..1533f945618 100755 --- a/bin/perltest2cpp.pl +++ b/bin/perltest2cpp.pl @@ -218,7 +218,7 @@ my(@mainList) = (); sub getMainList { if (!defined $mainList[0]) { my($fh) = new FileHandle(); - if (open($fh, "GNUMakefile")) { + if (open($fh, "GNUmakefile")) { my($line) = ""; while(<$fh>) { $line .= $_; diff --git a/bin/update-ace+tao.sh b/bin/update-ace+tao.sh index c56a98393b7..9956eb8bb0e 100755 --- a/bin/update-ace+tao.sh +++ b/bin/update-ace+tao.sh @@ -17,7 +17,7 @@ old_tao_version=`version <TAO/VERSION TAO` if [ -z $old_ace_version ]; then echo No existing ACE version; exit 1; fi if [ -z $old_tao_version ]; then echo No existing TAO version; exit 1; fi -cvs update -A VERSION TAO/VERSION GNUMakefile +cvs update -A VERSION TAO/VERSION GNUmakefile ace_version=`version <VERSION ACE` tao_version=`version <TAO/VERSION TAO` |