added CONTROLLED_FILES macro, and removed INSTALL from CVS control

2 files changed, 23 insertions, 111 deletions

diff --git a/TAO/INSTALL b/TAO/INSTALL
deleted file mode 100644
index 2bb19c60287..00000000000
--- a/TAO/INSTALL
+++ /dev/null
@@ -1,90 +0,0 @@
-
-     _________________________________________________________________
-   
-  Building and Installing TAO
-  
-   TAO has been ported and tested Windows NT, Solaris, VxWorks, and
-   Linux. I expect that major portions of the release will port easily to
-   other platforms that ACE has been ported to. If you can help port TAO
-   to other platforms we'd appreciate it.
-   
-   TAO can be obtained [1]electronically via the WWW and ftp. Bundled
-   with the TAO release is
-   HREF="http://www.cs.wustl.edu/~schmidt/ACE.html">ACE. You will need
-   the most recent version of ACE because TAO tends to track changes to
-   ACE rather closely.
-   
-   A quick build note for users who have used ACE with other ORBs:
-   linking TAO with a version of ACE that is also linked against another
-   ORB vendor's library, e.g., liborbix.so, will produce undefined and
-   most likely unpredictable and erroneous results.
-     _________________________________________________________________
-   
-  On UNIX platforms
-  
-    1. Set ACE_ROOT environment variable as outlined in the [2]ACE
-       installation notes.
-    2. Build and install ACE under $ACE_ROOT.
-          + Change directory to $ACE_ROOT/ace and execute [3]make.
-    3. Set TAO_ROOT environment variable to $ACE_ROOT/TAO.
-    4. Build and install the TAO release under $TAO_ROOT.
-          + Change directory to $TAO_ROOT/tao and execute [4]make.
-    5. Change directory to $TAO_ROOT/tests and execute [5]make.
-    6. Follow instructions on executing the various examples under
-       $TAO_ROOT/tests.
-       
-    A Note On Make
-    
-   Since TAO is built atop ACE, TAO re-uses ACE's Makefile structure as
-   well. Thus, just like ACE requires GNU Make, so too does TAO. More
-   exactly, versions of make which are known to not work include those
-   from Solaris 4.x and 5.x, HP-UX, the latest BSD, etc.
-   
-   GNU Make can be obtained from various places in source form.
-     _________________________________________________________________
-   
-  On Windows NT
-  
-   Before compiling TAO_IDL on NT, you may need to set the environment
-   variable CPP_PATH to where CL.exe is installed on your machine. By
-   default, we set this variable to "C:/Program Files/DevStudio/VC/bin".
-   Your location may vary, however. Notice that if you forget to set this
-   variable before compiling TAO_IDL, you can use CPP_LOCATION to specify
-   the absolute pathname to CL.exe. We set if to "C:/Program
-   Files/DevStudio/VC/bin/CL.exe" when we do use it.
-   
-    Visual C++ 5.0
-    
-   It works best if TAO is placed in ACE_wrappers so TAO ends up in
-   ACE_wrappers\TAO because the Visual C++ 5.0 Project files are set up
-   to work in this configuration. If you move it, then make sure you
-   change the project file to look for the include and library files in
-   the correct place.
-   
-    1. Make sure ACE is built (For Visual C++ 5.0, use ace.dsw or
-       ace-vc50.dsw, whichever is in your copy of ACE).
-    2. Load the workspace tao\TAO.dsw and build the TAO library.
-    3. To build the Cubit test, load the workspace
-       tests\Cubit\TAO\test.dsw and build both client and server.
-       
-    Visual C++ 4.x
-    
-    1. In Tools|Options, go to the Directories page and make sure that
-       include files paths includes ACE_wrappers\ and the root directory
-       of TAO (which can be ACE_wrappers\TAO if installed there). The
-       library files paths should include ACE_wrappers\ace.
-    2. Load the project file tao\TAO.mdp and build the TAO library.
-    3. To build the Cubit test, load the project file
-       tests\Cubit\TAO\test.mdp and build both client and server.
-     _________________________________________________________________
-   
-   Back to the [6]TAO home page.
-
-References
-
-   1. http://www.cs.wustl.edu/~schmidt/TAO-obtain.html
-   2. http://www.cs.wustl.edu/~schmidt/ACE_wrappers/ACE-INSTALL.html
-   3. file://localhost/project/adaptive/ACE_wrappers/TAO/TAO-INSTALL.html#makenotes
-   4. file://localhost/project/adaptive/ACE_wrappers/TAO/TAO-INSTALL.html#makenotes
-   5. file://localhost/project/adaptive/ACE_wrappers/TAO/TAO-INSTALL.html#makenotes
-   6. http://www.cs.wustl.edu/~schmidt/TAO.html
diff --git a/TAO/Makefile b/TAO/Makefile
index 129c0bf17eb..b47ce4e2973 100644
--- a/TAO/Makefile
+++ b/TAO/Makefile
@@ -50,26 +50,28 @@ clone:
 		(clone -s $(ACE_ROOT)/$$dir $$dir) \
 	done
 
-RELEASE_FILES = TAO/ChangeLog \
-		TAO/INSTALL \
-		TAO/TAO-INSTALL.html \
-		TAO/COPYING \
-		TAO/COPYING.sun \
-		TAO/release.chk \
-		TAO/rules.tao.GNU \
-		TAO/taoconfig.mk \
-		TAO/docs \
-		TAO/LICENSE.sun \
-		TAO/Makefile \
-		TAO/README \
-		TAO/README.sun \
-		TAO/tao \
-		TAO/TAO_IDL \
-		TAO/orbsvcs \
-		TAO/tests \
-		TAO/VERSION
-
-INSTALL:	TAO-INSTALL.html
+CONTROLLED_FILES = ChangeLog \
+		   TAO-INSTALL.html \
+		   COPYING \
+		   COPYING.sun \
+		   release.chk \
+		   rules.tao.GNU \
+		   taoconfig.mk \
+		   docs \
+		   LICENSE.sun \
+		   Makefile \
+		   README \
+		   README.sun \
+		   tao \
+		   TAO_IDL \
+		   orbsvcs \
+		   tests \
+		   VERSION
+
+RELEASE_FILES = $(addprefix TAO/,$(CONTROLLED_FILES)) \
+                TAO/INSTALL
+
+INSTALL: TAO-INSTALL.html
 	lynx -dump $^ > $@
 
 #### If creating the "official" TAO release:
@@ -122,5 +124,5 @@ CHECK =
 #### Then, make releasetao is invoked to actually create the kit.
 release: INSTALL
 	@$(ACE_ROOT)/bin/make_release $(CHECK) -k tao -t $(REL) \
-	   -c "$(RELEASE_FILES)" -r "$(RELEASE_FILES)"  &&  \
+	   -c "$(CONTROLLED_FILES)" -r "$(RELEASE_FILES)"  &&  \
 	 cd ..  &&  make releasetao