ChangeLogTag:Wed Dec 24 17:10:45 UTC 2003 Don Hinton <dhinton@dresystems.com>

44 files changed, 183 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 8ff3224d651..6bdac18a990 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,40 @@
+Wed Dec 24 17:10:45 UTC 2003  Don Hinton  <dhinton@dresystems.com>
+
+        * bin/fuzz.pl:
+          Modified the regular expression for matching Makefiles to better
+          filter out unwanted files.
+
+        * examples/C++NPv1/Makefile.Iterative_Logging_Server:
+        * examples/C++NPv1/Makefile.Logging_Client:
+        * examples/C++NPv1/Makefile.Process_Per_Connection_Logging_Server:
+        * examples/C++NPv1/Makefile.RT_Thread_Per_Connection_Logging_Server:
+        * examples/C++NPv1/Makefile.Reactive_Logging_Server:
+        * examples/C++NPv1/Makefile.Reactive_Logging_Server_Ex:
+        * examples/C++NPv1/Makefile.Thread_Per_Connection_Logging_Server:
+        * examples/C++NPv2/Makefile.AC_CLD:
+        * examples/C++NPv2/Makefile.AIO_CLD:
+        * examples/C++NPv2/Makefile.CLD:
+        * examples/C++NPv2/Makefile.Configurable_Logging_Server:
+        * examples/C++NPv2/Makefile.Reactor_Logging_Server:
+        * examples/C++NPv2/Makefile.SLD:
+        * examples/C++NPv2/Makefile.SLDex:
+        * examples/C++NPv2/Makefile.SR_Configurable_Logging_Server:
+        * examples/C++NPv2/Makefile.Select_Reactor_Logging_Server:
+        * examples/C++NPv2/Makefile.TPCLS:
+        * examples/C++NPv2/Makefile.TPLS:
+        * examples/C++NPv2/Makefile.TP_Reactor_Logging_Server:
+        * examples/C++NPv2/Makefile.display_logfile:
+        * examples/DLL/Makefile.Newsweek:
+        * examples/DLL/Makefile.Today:
+        * examples/Service_Configurator/Misc/Makefile.Timer:
+        * examples/Service_Configurator/Misc/Makefile.main:
+        * examples/Timer_Queue/Makefile.TQTD:
+        * examples/Timer_Queue/Makefile.main:
+        * include/makeinclude/Makefile.rtems:
+        * performance-tests/Synch-Benchmarks/Makefile.driver:
+        * performance-tests/Synch-Benchmarks/Makefile.synch_tests:
+          Fixed Fuzz errors.
+
 Wed Dec 24 12:51:23 UTC 2003  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * apps/Gateway/Gateway/Config_Files.cpp:
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 9d630d9cbff..b46478abcf5 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,19 @@
+Wed Dec 24 17:10:45 UTC 2003  Don Hinton  <dhinton@dresystems.com>
+
+        * TAO/orbsvcs/IFR_Service/Makefile.dependencies:
+        * TAO/orbsvcs/LoadBalancer/Makefile.LoadManager:
+        * TAO/orbsvcs/LoadBalancer/Makefile.LoadMonitor:
+        * TAO/orbsvcs/tests/Bug_1334_Regression/Makefile.Bug_1334_client:
+        * TAO/orbsvcs/tests/Bug_1630_Regression/Makefile.Bug_1630_testclient:
+        * TAO/tests/Bug_1330_Regression/Makefile.Bug_1330_Client:
+        * TAO/tests/Bug_1330_Regression/Makefile.Bug_1330_Server:
+        * TAO/tests/Bug_1627_Regression/Makefile.Bug_1627_Client:
+        * TAO/tests/Bug_1627_Regression/Makefile.Bug_1627_Server:
+        * TAO/tests/Bug_1635_Regression/Makefile.Bug_1635_Client:
+        * TAO/tests/Bug_1636_Regression/Makefile.bug_1636_testclient:
+        * TAO/tests/Bug_1639_Regression/Makefile.Bug_1639_testclient:
+          Fixed Fuzz errors.
+
 Wed Dec 24 08:29:56 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
 	* tao/Valuetype/AbstractBase_T.cpp:
diff --git a/TAO/orbsvcs/IFR_Service/Makefile.dependencies b/TAO/orbsvcs/IFR_Service/Makefile.dependencies
index 4493fc06f93..ed8921719b2 100644
--- a/TAO/orbsvcs/IFR_Service/Makefile.dependencies
+++ b/TAO/orbsvcs/IFR_Service/Makefile.dependencies
@@ -1,9 +1,13 @@
+# -*- Makefile -*-
+
 #----------------------------------------------------------------------------
 #       $Id$
 #
 #       Touches the executable if any of the libraries have changed
 #----------------------------------------------------------------------------
 
+MAKEFILE = Makefile.dependencies
+
 ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif # ! TAO_ROOT
diff --git a/TAO/orbsvcs/LoadBalancer/Makefile.LoadManager b/TAO/orbsvcs/LoadBalancer/Makefile.LoadManager
index 9b4e38c5a81..141101b6007 100644
--- a/TAO/orbsvcs/LoadBalancer/Makefile.LoadManager
+++ b/TAO/orbsvcs/LoadBalancer/Makefile.LoadManager
@@ -1,9 +1,13 @@
+# -*- Makefile -*-
+
 #----------------------------------------------------------------------------
 #
 # $Id$
 #
 #----------------------------------------------------------------------------
 
+MAKEFILE = Makefile.LoadManager
+
 #----------------------------------------------------------------------------
 #       Local macros
 #----------------------------------------------------------------------------
diff --git a/TAO/orbsvcs/LoadBalancer/Makefile.LoadMonitor b/TAO/orbsvcs/LoadBalancer/Makefile.LoadMonitor
index 24944333e4c..8f787277f3c 100644
--- a/TAO/orbsvcs/LoadBalancer/Makefile.LoadMonitor
+++ b/TAO/orbsvcs/LoadBalancer/Makefile.LoadMonitor
@@ -1,9 +1,13 @@
+# -*- Makefile -*-
+
 #----------------------------------------------------------------------------
 #
 # $Id$
 #
 #----------------------------------------------------------------------------
 
+MAKEFILE = Makefile.LoadMonitor
+
 #----------------------------------------------------------------------------
 #       Local macros
 #----------------------------------------------------------------------------
diff --git a/TAO/orbsvcs/tests/Bug_1334_Regression/Makefile.Bug_1334_client b/TAO/orbsvcs/tests/Bug_1334_Regression/Makefile.Bug_1334_client
index 849cb65606d..da3fdf99466 100644
--- a/TAO/orbsvcs/tests/Bug_1334_Regression/Makefile.Bug_1334_client
+++ b/TAO/orbsvcs/tests/Bug_1334_Regression/Makefile.Bug_1334_client
@@ -10,7 +10,6 @@
 #
 #----------------------------------------------------------------------------
 MAKEFILE        = Makefile.Bug_1334_client
-DEPENDENCY_FILE = .depend.Makefile.Bug_1334_client
 BIN_UNCHECKED   = client
 
 ifndef TAO_ROOT
diff --git a/TAO/orbsvcs/tests/Bug_1630_Regression/Makefile.Bug_1630_testclient b/TAO/orbsvcs/tests/Bug_1630_Regression/Makefile.Bug_1630_testclient
index 6dc2e7748c7..423dea9ea15 100644
--- a/TAO/orbsvcs/tests/Bug_1630_Regression/Makefile.Bug_1630_testclient
+++ b/TAO/orbsvcs/tests/Bug_1630_Regression/Makefile.Bug_1630_testclient
@@ -10,7 +10,6 @@
 #
 #----------------------------------------------------------------------------
 MAKEFILE        = Makefile.Bug_1630_testclient
-DEPENDENCY_FILE = .depend.Makefile.Bug_1630_testclient
 BIN_UNCHECKED   = testclient
 
 ifndef TAO_ROOT
diff --git a/TAO/tests/Bug_1330_Regression/Makefile.Bug_1330_Client b/TAO/tests/Bug_1330_Regression/Makefile.Bug_1330_Client
index a51e772c6b2..c2758dcd1b5 100644
--- a/TAO/tests/Bug_1330_Regression/Makefile.Bug_1330_Client
+++ b/TAO/tests/Bug_1330_Regression/Makefile.Bug_1330_Client
@@ -2,7 +2,6 @@
 #       GNU Makefile
 #----------------------------------------------------------------------------
 MAKEFILE        = Makefile.Bug_1330_Client
-DEPENDENCY_FILE = .depend.Makefile.Bug_1330_Client
 BIN_UNCHECKED   = client
 
 ifndef TAO_ROOT
diff --git a/TAO/tests/Bug_1330_Regression/Makefile.Bug_1330_Server b/TAO/tests/Bug_1330_Regression/Makefile.Bug_1330_Server
index 9456da46958..a204ce93222 100644
--- a/TAO/tests/Bug_1330_Regression/Makefile.Bug_1330_Server
+++ b/TAO/tests/Bug_1330_Regression/Makefile.Bug_1330_Server
@@ -2,7 +2,6 @@
 #       GNU Makefile
 #----------------------------------------------------------------------------
 MAKEFILE        = Makefile.Bug_1330_Server
-DEPENDENCY_FILE = .depend.Makefile.Bug_1330_Server
 BIN_UNCHECKED   = server
 
 ifndef TAO_ROOT
diff --git a/TAO/tests/Bug_1627_Regression/Makefile.Bug_1627_Client b/TAO/tests/Bug_1627_Regression/Makefile.Bug_1627_Client
index 548bc46653c..b6b19d24885 100644
--- a/TAO/tests/Bug_1627_Regression/Makefile.Bug_1627_Client
+++ b/TAO/tests/Bug_1627_Regression/Makefile.Bug_1627_Client
@@ -10,7 +10,6 @@
 #
 #----------------------------------------------------------------------------
 MAKEFILE        = Makefile.Bug_1627_Client
-DEPENDENCY_FILE = .depend.Makefile.Bug_1627_Client
 BIN_UNCHECKED   = client
 
 ifndef TAO_ROOT
diff --git a/TAO/tests/Bug_1627_Regression/Makefile.Bug_1627_Server b/TAO/tests/Bug_1627_Regression/Makefile.Bug_1627_Server
index 418c79c299b..e47313f2919 100644
--- a/TAO/tests/Bug_1627_Regression/Makefile.Bug_1627_Server
+++ b/TAO/tests/Bug_1627_Regression/Makefile.Bug_1627_Server
@@ -10,7 +10,6 @@
 #
 #----------------------------------------------------------------------------
 MAKEFILE        = Makefile.Bug_1627_Server
-DEPENDENCY_FILE = .depend.Makefile.Bug_1627_Server
 BIN_UNCHECKED   = server
 
 ifndef TAO_ROOT
diff --git a/TAO/tests/Bug_1635_Regression/Makefile.Bug_1635_Client b/TAO/tests/Bug_1635_Regression/Makefile.Bug_1635_Client
index cf509a529a5..8713cf1c27d 100644
--- a/TAO/tests/Bug_1635_Regression/Makefile.Bug_1635_Client
+++ b/TAO/tests/Bug_1635_Regression/Makefile.Bug_1635_Client
@@ -10,7 +10,6 @@
 #
 #----------------------------------------------------------------------------
 MAKEFILE        = Makefile.Bug_1635_Client
-DEPENDENCY_FILE = .depend.Makefile.Bug_1635_Client
 BIN_UNCHECKED   = client
 
 ifndef TAO_ROOT
diff --git a/TAO/tests/Bug_1636_Regression/Makefile.bug_1636_testclient b/TAO/tests/Bug_1636_Regression/Makefile.bug_1636_testclient
index eb33625d195..419ad68980e 100644
--- a/TAO/tests/Bug_1636_Regression/Makefile.bug_1636_testclient
+++ b/TAO/tests/Bug_1636_Regression/Makefile.bug_1636_testclient
@@ -10,7 +10,6 @@
 #
 #----------------------------------------------------------------------------
 MAKEFILE        = Makefile.bug_1636_testclient
-DEPENDENCY_FILE = .depend.Makefile.bug_1636_testclient
 BIN_UNCHECKED   = client
 
 ifndef TAO_ROOT
diff --git a/TAO/tests/Bug_1639_Regression/Makefile.Bug_1639_testclient b/TAO/tests/Bug_1639_Regression/Makefile.Bug_1639_testclient
index 8c8c189a5c7..f34b58b912f 100644
--- a/TAO/tests/Bug_1639_Regression/Makefile.Bug_1639_testclient
+++ b/TAO/tests/Bug_1639_Regression/Makefile.Bug_1639_testclient
@@ -10,7 +10,6 @@
 #
 #----------------------------------------------------------------------------
 MAKEFILE         = Makefile.Bug_1639_testclient
-DEPENDENCY_FILE  = .depend.Makefile.Bug_1639_testclient
 BIN_UNCHECKED    = client
 
 ifndef TAO_ROOT
diff --git a/bin/fuzz.pl b/bin/fuzz.pl
index e2c22539d8e..14ef83739d2 100755
--- a/bin/fuzz.pl
+++ b/bin/fuzz.pl
@@ -113,7 +113,7 @@ sub store_file ($)
     elsif ($name =~ /ChangeLog/i && -f $name) {
         push @files_changelog, ($name);
     }
-    elsif ($name =~ /Makefile/i) {
+    elsif ($name =~ /\/Makefile.*.[^~]$/) {
         push @files_makefile, ($name);
     }
     elsif ($name =~ /\.(mpc|mwc|mpb|mpt)/i) {
diff --git a/examples/C++NPv1/Makefile.Iterative_Logging_Server b/examples/C++NPv1/Makefile.Iterative_Logging_Server
index 357b92a31dd..7edb222378f 100644
--- a/examples/C++NPv1/Makefile.Iterative_Logging_Server
+++ b/examples/C++NPv1/Makefile.Iterative_Logging_Server
@@ -1,3 +1,5 @@
+# -*- Makefile -*-
+
 #----------------------------------------------------------------------------
 #	$Id$
 #
@@ -6,6 +8,8 @@
 #       Using Patterns and ACE"
 #----------------------------------------------------------------------------
 
+MAKEFILE = Makefile.Iterative_Logging_Server
+
 #----------------------------------------------------------------------------
 #	Local macros
 #----------------------------------------------------------------------------
diff --git a/examples/C++NPv1/Makefile.Logging_Client b/examples/C++NPv1/Makefile.Logging_Client
index 2f635114283..3d69aabf66b 100644
--- a/examples/C++NPv1/Makefile.Logging_Client
+++ b/examples/C++NPv1/Makefile.Logging_Client
@@ -1,3 +1,5 @@
+# -*- Makefile -*-
+
 #----------------------------------------------------------------------------
 #	$Id$
 #
@@ -6,6 +8,8 @@
 #       Using Patterns and ACE"
 #----------------------------------------------------------------------------
 
+MAKEFILE = Makefile.Logging_Client
+
 #----------------------------------------------------------------------------
 #	Local macros
 #----------------------------------------------------------------------------
diff --git a/examples/C++NPv1/Makefile.Process_Per_Connection_Logging_Server b/examples/C++NPv1/Makefile.Process_Per_Connection_Logging_Server
index 9bacc6d5a09..8dd02c3589e 100644
--- a/examples/C++NPv1/Makefile.Process_Per_Connection_Logging_Server
+++ b/examples/C++NPv1/Makefile.Process_Per_Connection_Logging_Server
@@ -1,3 +1,5 @@
+# -*- Makefile -*-
+
 #----------------------------------------------------------------------------
 #	$Id$
 #
@@ -6,6 +8,8 @@
 #       Using Patterns and ACE"
 #----------------------------------------------------------------------------
 
+MAKEFILE = Makefile.Process_Per_Connection_Logging_Server
+
 #----------------------------------------------------------------------------
 #	Local macros
 #----------------------------------------------------------------------------
diff --git a/examples/C++NPv1/Makefile.RT_Thread_Per_Connection_Logging_Server b/examples/C++NPv1/Makefile.RT_Thread_Per_Connection_Logging_Server
index 86e064dcdc3..029b5a8bca4 100644
--- a/examples/C++NPv1/Makefile.RT_Thread_Per_Connection_Logging_Server
+++ b/examples/C++NPv1/Makefile.RT_Thread_Per_Connection_Logging_Server
@@ -1,3 +1,5 @@
+# -*- Makefile -*-
+
 #----------------------------------------------------------------------------
 #	$Id$
 #
@@ -6,6 +8,8 @@
 #       Complexity Using Patterns and ACE"
 #----------------------------------------------------------------------------
 
+MAKEFILE = Makefile.RT_Thread_Per_Connection_Logging_Server
+
 #----------------------------------------------------------------------------
 #	Local macros
 #----------------------------------------------------------------------------
diff --git a/examples/C++NPv1/Makefile.Reactive_Logging_Server b/examples/C++NPv1/Makefile.Reactive_Logging_Server
index 0a2f801e2d7..3d8811d2456 100644
--- a/examples/C++NPv1/Makefile.Reactive_Logging_Server
+++ b/examples/C++NPv1/Makefile.Reactive_Logging_Server
@@ -1,3 +1,5 @@
+# -*- Makefile -*-
+
 #----------------------------------------------------------------------------
 #	$Id$
 #
@@ -6,6 +8,8 @@
 #       Using Patterns and ACE"
 #----------------------------------------------------------------------------
 
+MAKEFILE = Makefile.Reactive_Logging_Server
+
 #----------------------------------------------------------------------------
 #	Local macros
 #----------------------------------------------------------------------------
diff --git a/examples/C++NPv1/Makefile.Reactive_Logging_Server_Ex b/examples/C++NPv1/Makefile.Reactive_Logging_Server_Ex
index 3d4a845f13d..fe0f571e25e 100644
--- a/examples/C++NPv1/Makefile.Reactive_Logging_Server_Ex
+++ b/examples/C++NPv1/Makefile.Reactive_Logging_Server_Ex
@@ -1,3 +1,5 @@
+# -*- Makefile -*-
+
 #----------------------------------------------------------------------------
 #	$Id$
 #
@@ -6,6 +8,8 @@
 #       Using Patterns and ACE"
 #----------------------------------------------------------------------------
 
+MAKEFILE = Makefile.Reactive_Logging_Server_Ex
+
 #----------------------------------------------------------------------------
 #	Local macros
 #----------------------------------------------------------------------------
diff --git a/examples/C++NPv1/Makefile.Thread_Per_Connection_Logging_Server b/examples/C++NPv1/Makefile.Thread_Per_Connection_Logging_Server
index 919baa4c5bd..074172be576 100644
--- a/examples/C++NPv1/Makefile.Thread_Per_Connection_Logging_Server
+++ b/examples/C++NPv1/Makefile.Thread_Per_Connection_Logging_Server
@@ -1,3 +1,5 @@
+# -*- Makefile -*-
+
 #----------------------------------------------------------------------------
 #	$Id$
 #
@@ -6,6 +8,8 @@
 #       Using Patterns and ACE"
 #----------------------------------------------------------------------------
 
+MAKEFILE = Makefile.Thread_Per_Connection_Logging_Server
+
 #----------------------------------------------------------------------------
 #	Local macros
 #----------------------------------------------------------------------------
diff --git a/examples/C++NPv2/Makefile.AC_CLD b/examples/C++NPv2/Makefile.AC_CLD
index fc5972e00a1..2f1f2d9be05 100644
--- a/examples/C++NPv2/Makefile.AC_CLD
+++ b/examples/C++NPv2/Makefile.AC_CLD
@@ -1,9 +1,13 @@
+# -*- Makefile -*-
+
 #----------------------------------------------------------------------------
 # $Id$
 #
 # Makefile for the AC_CLD library in the C++NPv2, Chapter 7 example.
 #----------------------------------------------------------------------------
 
+MAKEFILE = Makefile.AC_CLD
+
 #----------------------------------------------------------------------------
 #       Local macros
 #----------------------------------------------------------------------------
diff --git a/examples/C++NPv2/Makefile.AIO_CLD b/examples/C++NPv2/Makefile.AIO_CLD
index fe7c522a6ec..ec5aea32de3 100644
--- a/examples/C++NPv2/Makefile.AIO_CLD
+++ b/examples/C++NPv2/Makefile.AIO_CLD
@@ -1,9 +1,13 @@
+# -*- Makefile -*-
+
 #----------------------------------------------------------------------------
 # $Id$
 #
 # Makefile for the AIO_CLD library in the C++NPv2, Chapter 8 example.
 #----------------------------------------------------------------------------
 
+MAKEFILE = Makefile.AIO_CLD
+
 #----------------------------------------------------------------------------
 #       Local macros
 #----------------------------------------------------------------------------
diff --git a/examples/C++NPv2/Makefile.CLD b/examples/C++NPv2/Makefile.CLD
index 35dfdbf3de5..5b57488a13b 100644
--- a/examples/C++NPv2/Makefile.CLD
+++ b/examples/C++NPv2/Makefile.CLD
@@ -1,9 +1,13 @@
+# -*- Makefile -*-
+
 #----------------------------------------------------------------------------
 # $Id$
 #
 # Makefile for the CLD library in the C++NPv2, Chapter 6 example.
 #----------------------------------------------------------------------------
 
+MAKEFILE = Makefile.CLD
+
 #----------------------------------------------------------------------------
 #       Local macros
 #----------------------------------------------------------------------------
diff --git a/examples/C++NPv2/Makefile.Configurable_Logging_Server b/examples/C++NPv2/Makefile.Configurable_Logging_Server
index ccb83bd0b70..97a9792fcdc 100644
--- a/examples/C++NPv2/Makefile.Configurable_Logging_Server
+++ b/examples/C++NPv2/Makefile.Configurable_Logging_Server
@@ -1,3 +1,5 @@
+# -*- Makefile -*- 
+
 #----------------------------------------------------------------------------
 #
 # $Id$
@@ -5,6 +7,8 @@
 # Makefile for C++NPv2 Configurable_Logging_Server example program, chapter 5.
 #----------------------------------------------------------------------------
 
+MAKEFILE = Makefile.Configurable_Logging_Server
+
 #----------------------------------------------------------------------------
 #	Local macros
 #----------------------------------------------------------------------------
diff --git a/examples/C++NPv2/Makefile.Reactor_Logging_Server b/examples/C++NPv2/Makefile.Reactor_Logging_Server
index e8983880c76..5b51dce8cba 100644
--- a/examples/C++NPv2/Makefile.Reactor_Logging_Server
+++ b/examples/C++NPv2/Makefile.Reactor_Logging_Server
@@ -1,3 +1,5 @@
+# -*- Makefile -*-
+
 #----------------------------------------------------------------------------
 #
 # $Id$
@@ -5,6 +7,8 @@
 # Makefile for C++NPv2 Reactor_Logging_Server example program, chapter 3.
 #----------------------------------------------------------------------------
 
+MAKEFILE = Makefile.Reactor_Logging_Server
+
 #----------------------------------------------------------------------------
 #	Local macros
 #----------------------------------------------------------------------------
diff --git a/examples/C++NPv2/Makefile.SLD b/examples/C++NPv2/Makefile.SLD
index 7f610f1bb55..f98ecb272e0 100644
--- a/examples/C++NPv2/Makefile.SLD
+++ b/examples/C++NPv2/Makefile.SLD
@@ -1,9 +1,13 @@
+# -*- Makefile -*-
+
 #----------------------------------------------------------------------------
 # $Id$
 #
 # Makefile for the SLD library in the C++NPv2, Chapter 5 example.
 #----------------------------------------------------------------------------
 
+MAKEFILE = Makefile.SLD
+
 #----------------------------------------------------------------------------
 #       Local macros
 #----------------------------------------------------------------------------
diff --git a/examples/C++NPv2/Makefile.SLDex b/examples/C++NPv2/Makefile.SLDex
index d7786849091..165c41936e4 100644
--- a/examples/C++NPv2/Makefile.SLDex
+++ b/examples/C++NPv2/Makefile.SLDex
@@ -1,9 +1,13 @@
+# -*- Makefile -*-
+
 #----------------------------------------------------------------------------
 # $Id$
 #
 # Makefile for the SLDex library in the C++NPv2, Chapter 5 example.
 #----------------------------------------------------------------------------
 
+MAKEFILE = Makefile.SLDex
+
 #----------------------------------------------------------------------------
 #       Local macros
 #----------------------------------------------------------------------------
diff --git a/examples/C++NPv2/Makefile.SR_Configurable_Logging_Server b/examples/C++NPv2/Makefile.SR_Configurable_Logging_Server
index dbef57cc25b..b5fa98937dc 100644
--- a/examples/C++NPv2/Makefile.SR_Configurable_Logging_Server
+++ b/examples/C++NPv2/Makefile.SR_Configurable_Logging_Server
@@ -1,3 +1,5 @@
+# -*- Makefile -*-
+
 #----------------------------------------------------------------------------
 #
 # $Id$
@@ -6,6 +8,8 @@
 # chapter 7.
 #----------------------------------------------------------------------------
 
+MAKEFILE = Makefile.SR_Configurable_Logging_Server
+
 #----------------------------------------------------------------------------
 #	Local macros
 #----------------------------------------------------------------------------
diff --git a/examples/C++NPv2/Makefile.Select_Reactor_Logging_Server b/examples/C++NPv2/Makefile.Select_Reactor_Logging_Server
index 892e0869dac..62cc8b48811 100644
--- a/examples/C++NPv2/Makefile.Select_Reactor_Logging_Server
+++ b/examples/C++NPv2/Makefile.Select_Reactor_Logging_Server
@@ -1,3 +1,5 @@
+# -*- Makefile -*-
+
 #----------------------------------------------------------------------------
 #
 # $Id$
@@ -6,6 +8,8 @@
 # chapter 4.
 #----------------------------------------------------------------------------
 
+MAKEFILE = Makefile.Select_Reactor_Logging_Server
+
 #----------------------------------------------------------------------------
 #	Local macros
 #----------------------------------------------------------------------------
diff --git a/examples/C++NPv2/Makefile.TPCLS b/examples/C++NPv2/Makefile.TPCLS
index 08465b55e3e..6dfeed17270 100644
--- a/examples/C++NPv2/Makefile.TPCLS
+++ b/examples/C++NPv2/Makefile.TPCLS
@@ -1,9 +1,13 @@
+# -*- Makefile -*-
+
 #----------------------------------------------------------------------------
 # $Id$
 #
 # Makefile for the TPCLS library in the C++NPv2, Chapter 7 example.
 #----------------------------------------------------------------------------
 
+MAKEFILE = Makefile.TPCLS
+
 #----------------------------------------------------------------------------
 #       Local macros
 #----------------------------------------------------------------------------
diff --git a/examples/C++NPv2/Makefile.TPLS b/examples/C++NPv2/Makefile.TPLS
index 1ddc1779d72..70f8df5abe9 100644
--- a/examples/C++NPv2/Makefile.TPLS
+++ b/examples/C++NPv2/Makefile.TPLS
@@ -1,9 +1,13 @@
+# -*- Makefile -*-
+
 #----------------------------------------------------------------------------
 # $Id$
 #
 # Makefile for the TPLS library in the C++NPv2, Chapter 6 example.
 #----------------------------------------------------------------------------
 
+MAKEFILE = Makefile.TPLS
+
 #----------------------------------------------------------------------------
 #       Local macros
 #----------------------------------------------------------------------------
diff --git a/examples/C++NPv2/Makefile.TP_Reactor_Logging_Server b/examples/C++NPv2/Makefile.TP_Reactor_Logging_Server
index ee6912b2d53..78bcf908c3b 100644
--- a/examples/C++NPv2/Makefile.TP_Reactor_Logging_Server
+++ b/examples/C++NPv2/Makefile.TP_Reactor_Logging_Server
@@ -1,3 +1,5 @@
+# -*- Makefile -*-
+
 #----------------------------------------------------------------------------
 #
 # $Id$
@@ -6,6 +8,8 @@
 # chapter 4.
 #----------------------------------------------------------------------------
 
+MAKEFILE = Makefile.TP_Reactor_Logging_Server
+
 #----------------------------------------------------------------------------
 #	Local macros
 #----------------------------------------------------------------------------
diff --git a/examples/C++NPv2/Makefile.display_logfile b/examples/C++NPv2/Makefile.display_logfile
index 78041b910fd..d06a7447c8d 100644
--- a/examples/C++NPv2/Makefile.display_logfile
+++ b/examples/C++NPv2/Makefile.display_logfile
@@ -1,3 +1,5 @@
+# -*- Makefile -*-
+
 #----------------------------------------------------------------------------
 #
 # $Id$
@@ -5,6 +7,8 @@
 #	Makefile for C++NPv2 example programs.
 #----------------------------------------------------------------------------
 
+MAKEFILE = Makefile.display_logfile
+
 #----------------------------------------------------------------------------
 #	Local macros
 #----------------------------------------------------------------------------
diff --git a/examples/DLL/Makefile.Newsweek b/examples/DLL/Makefile.Newsweek
index 282152982fd..42c2fbc0466 100644
--- a/examples/DLL/Makefile.Newsweek
+++ b/examples/DLL/Makefile.Newsweek
@@ -1,9 +1,13 @@
+# -*- Makefile -*-
+
 #----------------------------------------------------------------------------
 #	$Id$
 #
 #	Makefile for the Newsweek library in the DLL example
 #----------------------------------------------------------------------------
 
+MAKEFILE = Makefile.Newsweek
+
 #----------------------------------------------------------------------------
 #	Local macros
 #----------------------------------------------------------------------------
diff --git a/examples/DLL/Makefile.Today b/examples/DLL/Makefile.Today
index b39ed57a37f..ed946bd7673 100644
--- a/examples/DLL/Makefile.Today
+++ b/examples/DLL/Makefile.Today
@@ -1,9 +1,13 @@
+# -*- Makefile -*-
+
 #----------------------------------------------------------------------------
 #	$Id$
 #
 #	Makefile for the Today library in the DLL example
 #----------------------------------------------------------------------------
 
+MAKEFILE = Makefile.Today
+
 #----------------------------------------------------------------------------
 #	Local macros
 #----------------------------------------------------------------------------
diff --git a/examples/Service_Configurator/Misc/Makefile.Timer b/examples/Service_Configurator/Misc/Makefile.Timer
index 3b6fe958731..b922ae3faef 100644
--- a/examples/Service_Configurator/Misc/Makefile.Timer
+++ b/examples/Service_Configurator/Misc/Makefile.Timer
@@ -1,9 +1,13 @@
+# -*- Makefile -*-
+
 #----------------------------------------------------------------------------
 # $Id$
 #
 # Makefile for the Timer library. Part of misc Service_Configurator examples
 #----------------------------------------------------------------------------
 
+MAKEFILE = Makefile.Timer
+
 #----------------------------------------------------------------------------
 #       Local macros
 #----------------------------------------------------------------------------
diff --git a/examples/Service_Configurator/Misc/Makefile.main b/examples/Service_Configurator/Misc/Makefile.main
index 45b30c3d30c..95431892a5f 100644
--- a/examples/Service_Configurator/Misc/Makefile.main
+++ b/examples/Service_Configurator/Misc/Makefile.main
@@ -1,3 +1,5 @@
+# -*- Makefile -*-
+
 #----------------------------------------------------------------------------
 #
 # $Id$
@@ -5,6 +7,8 @@
 # Makefile for executable main. Part of misc Service_Configurator examples
 #----------------------------------------------------------------------------
 
+MAKEFILE = Makefile.main
+
 #----------------------------------------------------------------------------
 #	Local macros
 #----------------------------------------------------------------------------
diff --git a/examples/Timer_Queue/Makefile.TQTD b/examples/Timer_Queue/Makefile.TQTD
index e99862afeca..21b401164d6 100644
--- a/examples/Timer_Queue/Makefile.TQTD
+++ b/examples/Timer_Queue/Makefile.TQTD
@@ -1,9 +1,13 @@
+# -*- Makefile -*-
+
 #----------------------------------------------------------------------------
 # $Id$
 #
 # Makefile for the Timer library. Part of misc Service_Configurator examples
 #----------------------------------------------------------------------------
 
+MAKEFILE = Makefile.TQTD
+
 #----------------------------------------------------------------------------
 #       Local macros
 #----------------------------------------------------------------------------
diff --git a/examples/Timer_Queue/Makefile.main b/examples/Timer_Queue/Makefile.main
index 529261ad517..d759af3ed7d 100644
--- a/examples/Timer_Queue/Makefile.main
+++ b/examples/Timer_Queue/Makefile.main
@@ -1,3 +1,5 @@
+# -*- Makefile -*-
+
 #----------------------------------------------------------------------------
 #
 # $Id$
@@ -5,6 +7,8 @@
 # Makefile for executable main. Part of misc Timer_Queue example
 #----------------------------------------------------------------------------
 
+MAKEFILE = Makefile.main
+
 #----------------------------------------------------------------------------
 #	Local macros
 #----------------------------------------------------------------------------
diff --git a/include/makeinclude/Makefile.rtems b/include/makeinclude/Makefile.rtems
index 39a44334129..aad09668cea 100644
--- a/include/makeinclude/Makefile.rtems
+++ b/include/makeinclude/Makefile.rtems
@@ -1,4 +1,7 @@
-# $id: Makefile $
+# -*- Makefile -*-
+# $Id$
+
+MAKEFILE = Makefile.rtems
 
 #export RTEMS_MAKEFILE_PATH=/opt/rtems/sparc-rtems/erc32/
 include $(RTEMS_MAKEFILE_PATH)/Makefile.inc
diff --git a/performance-tests/Synch-Benchmarks/Makefile.driver b/performance-tests/Synch-Benchmarks/Makefile.driver
index 4909fba599a..561b823cf69 100644
--- a/performance-tests/Synch-Benchmarks/Makefile.driver
+++ b/performance-tests/Synch-Benchmarks/Makefile.driver
@@ -1,9 +1,13 @@
+# -*- Makefile -*-
+# $Id$
 #----------------------------------------------------------------------------
 #	@(#)Makefile.driver	1.1	10/18/96
 #
 #	Makefile for the Solaris 2.x synchronization benchmark driver
 #----------------------------------------------------------------------------
 
+MAKEFILE = Makefile.driver
+
 #----------------------------------------------------------------------------
 #	Local macros
 #----------------------------------------------------------------------------
diff --git a/performance-tests/Synch-Benchmarks/Makefile.synch_tests b/performance-tests/Synch-Benchmarks/Makefile.synch_tests
index 97a4ff7052c..6258b933770 100644
--- a/performance-tests/Synch-Benchmarks/Makefile.synch_tests
+++ b/performance-tests/Synch-Benchmarks/Makefile.synch_tests
@@ -1,9 +1,14 @@
+# -*- Makefile -*-
+# $Id$
+
 #----------------------------------------------------------------------------
 #	@(#)Makefile.synch_tests	1.1	10/18/96
 #
 #	Makefile for the Solaris 2.x synchronization benchmarks
 #----------------------------------------------------------------------------
 
+MAKEFILE = Makefile.synch_tests
+
 #----------------------------------------------------------------------------
 #	Local macros
 #----------------------------------------------------------------------------