diff --git a/src/Makefile.in b/src/Makefile.in
index f0e5f6b0f62423eb91780a6f44b4ef80764e53c8..4c4a743ef750edc1ce943678f6e2daa2d450094b 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -55,6 +55,9 @@
 #
 #
 # $Log$
+# Revision 1.13  2000/02/04 23:48:15  abagchi
+# Made sure all targets are appended with :: not single :
+#
 # Revision 1.12  2000/02/01 23:42:45  abagchi
 # AS/400 related change
 #
@@ -152,11 +155,11 @@ PRODUCTNAME=xerces
 PRODUCTVERSION=${VER}
 BINTARGETDIR=${HOME}/${PRODUCTNAME}-c-${PLATFORM}-${CXX}-${PRODUCTVERSION}
 
-all: Prepare Util Sax Internal Framework Parsers Dom Validators ${THISLIB}${VER}${SHLIBSUFFIX}
+all:: Prepare Util Sax Internal Framework Parsers Dom Validators ${THISLIB}${VER}${SHLIBSUFFIX}
 
-compile: Prepare Util Sax Internal Framework Parsers Dom Validators
+compile:: Prepare Util Sax Internal Framework Parsers Dom Validators
 
-lib: compile ${THISLIB}${VER}${SHLIBSUFFIX}
+lib:: compile ${THISLIB}${VER}${SHLIBSUFFIX}
 
 Prepare::
 	@echo Preparing the directory structure for a build ...
diff --git a/src/dom/Makefile.in b/src/dom/Makefile.in
index 860638046c9f4dfd834c79f47f91bda5fed3cb78..93fdde19acb83f13bb494fae62f08164fdaacdc3 100644
--- a/src/dom/Makefile.in
+++ b/src/dom/Makefile.in
@@ -55,6 +55,9 @@
 #
 #
 # $Log$
+# Revision 1.6  2000/02/04 23:48:21  abagchi
+# Made sure all targets are appended with :: not single :
+#
 # Revision 1.5  2000/02/04 17:44:56  aruna1
 # TreeWalker and NodeIterator changes
 #
@@ -204,27 +207,27 @@ DOM_CPP_OBJECTS = \
 	TreeWalkerImpl.$(TO)
 
 
-all:	includes $(DOM_CPP_OBJECTS) publish
+all::	includes $(DOM_CPP_OBJECTS) publish
 
-includes:	pubheaders $(DOM_C_FILES)
+includes::	pubheaders $(DOM_C_FILES)
 
-pubheaders:
+pubheaders::
 	-mkdir -p $(XML_INC_DIR)/$(MODULE)
 	$(CP) $(DOM_CPP_PUBHEADERS) $(DOM_C_FILES) $(XML_INC_DIR)/$(MODULE)
 
-publish:
+publish::
 	-mkdir -p ${ALL_OBJECTS_DIR}
 	$(CP) $(DOM_CPP_OBJECTS) $(ALL_OBJECTS_DIR)
 
 # this may generate unnecessary dependencies, but it makes life easier
-depend: includes
+depend:: includes
 	$(MAKE_DEPEND) $(XML_INCL)  *.cpp > $(DEPFILE)
 
-clean:
+clean::
 	@echo "Making clean in $(MODULE) ..."
 	$(RM2) $(DOM_CPP_OBJECTS)
 
-distclean:	clean
+distclean::	clean
 	$(RM) Makefile $(DEPFILE)
 	@echo "Removing all $(MODULE) header files ..."
 	@for file in $(DOM_CPP_PUBHEADERS); do \
@@ -235,6 +238,6 @@ distclean:	clean
 	$(RM2) $(ALL_OBJECTS_DIR)/$$file; \
 	done
 
-install:
+install::
 	-mkdir -p $(PREFIX)/$(MODULE)
 	$(CP) $(DOM_CPP_PUBHEADERS) $(DOM_C_FILES) $(PREFIX)/$(MODULE)
diff --git a/src/framework/Makefile.in b/src/framework/Makefile.in
index 49edff6d0b0e8a9c191350b091d36ec87bb3c655..3cdbdb74b63abc1bf0997284c32f11483a647002 100644
--- a/src/framework/Makefile.in
+++ b/src/framework/Makefile.in
@@ -55,6 +55,9 @@
 #
 #
 # $Log$
+# Revision 1.6  2000/02/04 23:48:26  abagchi
+# Made sure all targets are appended with :: not single :
+#
 # Revision 1.5  2000/02/01 23:43:11  abagchi
 # AS/400 related change
 #
@@ -143,27 +146,27 @@ FRAMEWORK_CPP_OBJECTS = \
 	XMLRecognizer.$(TO) \
 	XMLValidator.$(TO)
 
-all:	includes $(FRAMEWORK_CPP_OBJECTS) publish
+all::	includes $(FRAMEWORK_CPP_OBJECTS) publish
 
-includes:	pubheaders $(FRAMEWORK_C_FILES)
+includes::	pubheaders $(FRAMEWORK_C_FILES)
 
-pubheaders:
+pubheaders::
 	-mkdir -p $(XML_INC_DIR)/$(MODULE)
 	$(CP) $(FRAMEWORK_CPP_PUBHEADERS) $(FRAMEWORK_C_FILES) $(XML_INC_DIR)/$(MODULE)
 
-publish:
+publish::
 	-mkdir -p ${ALL_OBJECTS_DIR}
 	$(CP) $(FRAMEWORK_CPP_OBJECTS) $(ALL_OBJECTS_DIR)
 
 # this may generate unnecessary dependencies, but it makes life easier
-depend: includes
+depend:: includes
 	$(MAKE_DEPEND) $(XML_INCL)  *.cpp > $(DEPFILE)
 
-clean:
+clean::
 	@echo "Making clean in $(MODULE) ..."
 	$(RM2) $(FRAMEWORK_CPP_OBJECTS)
 
-distclean:	clean
+distclean::	clean
 	$(RM) Makefile $(DEPFILE)
 	@echo "Removing all $(MODULE) header files ..."
 	@for file in $(FRAMEWORK_CPP_PUBHEADERS); do \
@@ -174,6 +177,6 @@ distclean:	clean
 	$(RM2) $(ALL_OBJECTS_DIR)/$$file; \
 	done
 
-install:
+install::
 	-mkdir -p $(PREFIX)/$(MODULE)
 	$(CP) $(FRAMEWORK_CPP_PUBHEADERS) $(FRAMEWORK_C_FILES) $(PREFIX)/$(MODULE)
diff --git a/src/internal/Makefile.in b/src/internal/Makefile.in
index da35748318c3e794fd81cb98327b91d230faf329..a7480ed0e857f1b82b457604b2346e6b13229f7a 100644
--- a/src/internal/Makefile.in
+++ b/src/internal/Makefile.in
@@ -55,6 +55,9 @@
 #
 #
 # $Log$
+# Revision 1.6  2000/02/04 23:48:30  abagchi
+# Made sure all targets are appended with :: not single :
+#
 # Revision 1.5  2000/02/01 23:43:14  abagchi
 # AS/400 related change
 #
@@ -120,27 +123,27 @@ INTERNAL_CPP_OBJECTS = \
 	XMLScanner.$(TO) \
 	XMLScanner2.$(TO)
 
-all:	includes $(INTERNAL_CPP_OBJECTS) publish
+all::	includes $(INTERNAL_CPP_OBJECTS) publish
 
-includes:	pubheaders $(INTERNAL_C_FILES)
+includes::	pubheaders $(INTERNAL_C_FILES)
 
-pubheaders:
+pubheaders::
 	-mkdir -p $(XML_INC_DIR)/$(MODULE)
 	$(CP) $(INTERNAL_CPP_PUBHEADERS) $(INTERNAL_C_FILES) $(XML_INC_DIR)/$(MODULE)
 
-publish:
+publish::
 	-mkdir -p ${ALL_OBJECTS_DIR}
 	$(CP) $(INTERNAL_CPP_OBJECTS) $(ALL_OBJECTS_DIR)
 
 # this may generate unnecessary dependencies, but it makes life easier
-depend: includes
+depend:: includes
 	$(MAKE_DEPEND) $(XML_INCL) *.cpp > $(DEPFILE)
 
-clean:
+clean::
 	@echo "Making clean in $(MODULE) ..."
 	$(RM2) $(INTERNAL_CPP_OBJECTS)
 
-distclean:	clean
+distclean::	clean
 	$(RM) Makefile $(DEPFILE)
 	@echo "Removing all $(MODULE) header files ..."
 	@for file in $(INTERNAL_CPP_PUBHEADERS); do \
@@ -151,6 +154,6 @@ distclean:	clean
 	$(RM2) $(ALL_OBJECTS_DIR)/$$file; \
 	done
 
-install:
+install::
 	-mkdir -p $(PREFIX)/$(MODULE)
 	$(CP) $(INTERNAL_CPP_PUBHEADERS) $(INTERNAL_C_FILES) $(PREFIX)/$(MODULE)
diff --git a/src/parsers/Makefile.in b/src/parsers/Makefile.in
index d57239a74207d5210aa06732e7d87ccd228cc8a3..f83664f1e7703a8aad5f0c4b9802d38131430609 100644
--- a/src/parsers/Makefile.in
+++ b/src/parsers/Makefile.in
@@ -55,6 +55,9 @@
 #
 #
 # $Log$
+# Revision 1.5  2000/02/04 23:48:34  abagchi
+# Made sure all targets are appended with :: not single :
+#
 # Revision 1.4  2000/02/01 23:43:18  abagchi
 # AS/400 related change
 #
@@ -108,27 +111,27 @@ PARSERS_CPP_OBJECTS = \
 	DOMParser.$(TO) \
 	SAXParser.$(TO)
 
-all:	includes $(PARSERS_CPP_OBJECTS) publish
+all::	includes $(PARSERS_CPP_OBJECTS) publish
 
-includes:	pubheaders $(PARSERS_C_FILES)
+includes::	pubheaders $(PARSERS_C_FILES)
 
-pubheaders:
+pubheaders::
 	-mkdir -p $(XML_INC_DIR)/$(MODULE)
 	$(CP) $(PARSERS_CPP_PUBHEADERS) $(PARSERS_C_FILES) $(XML_INC_DIR)/$(MODULE)
 
-publish:
+publish::
 	-mkdir -p ${ALL_OBJECTS_DIR}
 	$(CP) $(PARSERS_CPP_OBJECTS) $(ALL_OBJECTS_DIR)
 
 # this may generate unnecessary dependencies, but it makes life easier
-depend: includes
+depend:: includes
 	$(MAKE_DEPEND) $(XML_INCL) *.cpp > $(DEPFILE)
 
-clean:
+clean::
 	@echo "Making clean in $(MODULE) ..."
 	$(RM2) $(PARSERS_CPP_OBJECTS)
 
-distclean:	clean
+distclean::	clean
 	$(RM) Makefile $(DEPFILE)
 	@echo "Removing all $(MODULE) header files ..."
 	@for file in $(PARSERS_CPP_PUBHEADERS); do \
@@ -139,6 +142,6 @@ distclean:	clean
 	$(RM2) $(ALL_OBJECTS_DIR)/$$file; \
 	done
 
-install:
+install::
 	-mkdir -p $(PREFIX)/$(MODULE)
 	$(CP) $(PARSERS_CPP_PUBHEADERS) $(PARSERS_C_FILES) $(PREFIX)/$(MODULE)
diff --git a/src/sax/Makefile.in b/src/sax/Makefile.in
index 85de6cbcf792b2f2c77fb60a61e93dfdf3c245ab..d362b179564b40473c1db84b89c12ca9211a73b5 100644
--- a/src/sax/Makefile.in
+++ b/src/sax/Makefile.in
@@ -55,6 +55,9 @@
 # 
 #
 # $Log$
+# Revision 1.4  2000/02/04 23:48:39  abagchi
+# Made sure all targets are appended with :: not single :
+#
 # Revision 1.3  1999/12/14 23:53:23  rahulj
 # Removed the offending Ctrl-M's from the commit message
 # logs which was giving packaging problems.
@@ -115,27 +118,27 @@ SAX_CPP_OBJECTS = \
 	InputSource.o \
 	SAXParseException.o
 
-all:	includes $(SAX_CPP_OBJECTS) publish
+all::	includes $(SAX_CPP_OBJECTS) publish
 
-includes:	pubheaders $(SAX_C_FILES)
+includes::	pubheaders $(SAX_C_FILES)
 
-pubheaders:
+pubheaders::
 	-mkdir -p $(XML_INC_DIR)/$(MODULE)
 	$(CP) $(SAX_CPP_PUBHEADERS) $(SAX_C_FILES) $(XML_INC_DIR)/$(MODULE)
 
-publish:
+publish::
 	-mkdir -p ${ALL_OBJECTS_DIR}
 	$(CP) $(SAX_CPP_OBJECTS) $(ALL_OBJECTS_DIR)
 
 # this may generate unnecessary dependencies, but it makes life easier
-depend: includes
+depend:: includes
 	$(MAKE_DEPEND) $(XML_INCL) *.cpp > $(DEPFILE)
 
-clean:
+clean::
 	@echo "Making clean in $(MODULE) ..."
 	$(RM) $(SAX_CPP_OBJECTS)
 
-distclean:	clean
+distclean::	clean
 	$(RM) Makefile $(DEPFILE)
 	@echo "Removing all $(MODULE) header files ..."
 	@for file in $(SAX_CPP_PUBHEADERS); do \
@@ -146,6 +149,6 @@ distclean:	clean
 	rm -f $(ALL_OBJECTS_DIR)/$$file; \
 	done
 
-install:
+install::
 	-mkdir -p $(PREFIX)/$(MODULE)
 	$(CP) $(SAX_CPP_PUBHEADERS) $(SAX_C_FILES) $(PREFIX)/$(MODULE)
diff --git a/src/util/Makefile.in b/src/util/Makefile.in
index f8fd7f1afd14637ea21e2a56ce1277819f25302e..063547a51d373cc636bef5f3cbc7a215251d2aa1 100644
--- a/src/util/Makefile.in
+++ b/src/util/Makefile.in
@@ -55,6 +55,9 @@
 #
 #
 # $Log$
+# Revision 1.12  2000/02/04 23:48:45  abagchi
+# Made sure all targets are appended with :: not single :
+#
 # Revision 1.11  2000/02/01 23:43:25  abagchi
 # AS/400 related change
 #
@@ -237,9 +240,9 @@ UTIL_CPP_OBJECTS = \
 	XMLUTF8Transcoder.$(TO) \
 	XMLUni.$(TO)
 
-all:	includes $(UTIL_CPP_OBJECTS) platforms transcoders messageloaders compilers publish
+all::	includes $(UTIL_CPP_OBJECTS) platforms transcoders messageloaders compilers publish
 
-includes:	pubheaders $(C_FILES)
+includes::	pubheaders $(C_FILES)
 	cd Platforms ; $(MAKE) $@ ; cd ..
 	cd Transcoders/$(TRANSCODERMODULE) ; $(MAKE) $@ ; cd ../..
 	cd MsgLoaders/$(MESSAGELOADERMODULE) ; $(MAKE) $@ ; cd ../..
@@ -276,7 +279,7 @@ publish::
 	$(CP) $(UTIL_CPP_OBJECTS) $(ALL_OBJECTS_DIR)
 
 # this may generate unnecessary dependencies, but it makes life easier
-depend: includes
+depend:: includes
 	$(MAKE_DEPEND) $(XML_INCL)  *.cpp > $(DEPFILE)
 
 clean::
@@ -289,7 +292,7 @@ clean::
 
 
 
-distclean:	clean
+distclean::	clean
 	$(RM) Makefile $(DEPFILE)
 	@echo "Removing all $(MODULE) header files ..."
 	@for file in $(UTIL_CPP_PUBHEADERS); do \
@@ -308,7 +311,7 @@ distclean:	clean
 	cd Compilers ; $(MAKE) $@ ; cd ..
 
 
-install:
+install::
 	-mkdir -p $(PREFIX)/$(MODULE)
 	$(CP) $(UTIL_CPP_PUBHEADERS) $(C_FILES) $(PREFIX)/$(MODULE)
 	cd Platforms ; $(MAKE) $@ ; cd ..
diff --git a/src/util/MsgLoaders/MsgFile/Makefile.in b/src/util/MsgLoaders/MsgFile/Makefile.in
index bfd70085b7d60e3af5b4f3bf872a6792fa3ad423..a92725f89de7e57d671a0d1e56542dced04121f8 100644
--- a/src/util/MsgLoaders/MsgFile/Makefile.in
+++ b/src/util/MsgLoaders/MsgFile/Makefile.in
@@ -1,19 +1,58 @@
 #
-# (C) Copyright IBM Corp. 1997-1999  All rights reserved.
+# The Apache Software License, Version 1.1
 #
-# US Government Users Restricted Rights Use, duplication or
-# disclosure restricted by GSA ADP Schedule Contract with IBM Corp.
+# Copyright (c) 1999 The Apache Software Foundation.  All rights
+# reserved.
 #
-# The program is provided "as is" without any warranty express or
-# implied, including the warranty of non-infringement and the implied
-# warranties of merchantibility and fitness for a particular purpose.
-# IBM will not be liable for any damages suffered by you as a result
-# of using the Program. In no event will IBM be liable for any
-# special, indirect or consequential damages or lost profits even if
-# IBM has been advised of the possibility of their occurrence. IBM
-# will not be liable for any third party claims against you.
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
 #
-# Revision: 00 1.1 src/com/ibm/xml/util/MsgLoaders/MsgCatalog/Makefile.in, xml4c3Utils, xml4c3 
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+#
+# 3. The end-user documentation included with the redistribution,
+#    if any, must include the following acknowledgment:
+#       "This product includes software developed by the
+#        Apache Software Foundation (http://www.apache.org/)."
+#    Alternately, this acknowledgment may appear in the software itself,
+#    if and wherever such third-party acknowledgments normally appear.
+#
+# 4. The names "Xerces" and "Apache Software Foundation" must
+#    not be used to endorse or promote products derived from this
+#    software without prior written permission. For written
+#    permission, please contact apache\@apache.org.
+#
+# 5. Products derived from this software may not be called "Apache",
+#    nor may "Apache" appear in their name, without prior written
+#    permission of the Apache Software Foundation.
+#
+# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+# ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+# ====================================================================
+#
+#
+# This software consists of voluntary contributions made by many
+# individuals on behalf of the Apache Software Foundation, and was
+# originally based on software copyright (c) 1999, International
+# Business Machines, Inc., http://www.ibm.com .  For more information
+# on the Apache Software Foundation, please see
+# <http://www.apache.org/>.
 #
 
 PLATFORM = @platform@
diff --git a/src/validators/DTD/Makefile.in b/src/validators/DTD/Makefile.in
index 8c5faa7aeca6e0fe1522b3c51efacc9ad28edb46..d8ff07683543076ba7ddb537dc4e85039aa378e6 100644
--- a/src/validators/DTD/Makefile.in
+++ b/src/validators/DTD/Makefile.in
@@ -55,6 +55,9 @@
 #
 #
 # $Log$
+# Revision 1.5  2000/02/04 23:48:54  abagchi
+# Made sure all targets are appended with :: not single :
+#
 # Revision 1.4  2000/02/01 23:44:01  abagchi
 # AS/400 related change
 #
@@ -131,27 +134,27 @@ VALIDATORS_DTD_CPP_OBJECTS = \
 	MixedContentModel.$(TO) \
 	SimpleContentModel.$(TO)
 
-all:	includes $(VALIDATORS_DTD_CPP_OBJECTS) publish
+all::	includes $(VALIDATORS_DTD_CPP_OBJECTS) publish
 
-includes:	pubheaders $(VALIDATORS_DTD_C_FILES)
+includes::	pubheaders $(VALIDATORS_DTD_C_FILES)
 
-pubheaders:
+pubheaders::
 	-mkdir -p $(XML_INC_DIR)/$(MODULE)/$(SUBMODULE)
 	$(CP) $(VALIDATORS_DTD_CPP_PUBHEADERS) $(VALIDATORS_DTD_C_FILES) $(XML_INC_DIR)/$(MODULE)/$(SUBMODULE)
 
-publish:
+publish::
 	-mkdir -p ${ALL_OBJECTS_DIR}
 	$(CP) $(VALIDATORS_DTD_CPP_OBJECTS) $(ALL_OBJECTS_DIR)
 
 # this may generate unnecessary dependencies, but it makes life easier
-depend: includes
+depend:: includes
 	$(MAKE_DEPEND) $(XML_INCL)  *.cpp > $(DEPFILE)
 
-clean:
+clean::
 	@echo "Making clean in $(MODULE)/$(SUBMODULE) ..."
 	$(RM2) $(VALIDATORS_DTD_CPP_OBJECTS)
 
-distclean:	clean
+distclean::	clean
 	$(RM) Makefile $(DEPFILE)
 	@echo "Removing all $(MODULE)/$(SUBMODULE) header files ..."
 	@for file in $(VALIDATORS_DTD_CPP_PUBHEADERS); do \
@@ -162,6 +165,6 @@ distclean:	clean
 	$(RM2) $(ALL_OBJECTS_DIR)/$$file; \
 	done
 
-install:
+install::
 	-mkdir -p $(PREFIX)/$(MODULE)/$(SUBMODULE)
 	$(CP) $(VALIDATORS_DTD_CPP_PUBHEADERS) $(VALIDATORS_DTD_C_FILES) $(PREFIX)/$(MODULE)/$(SUBMODULE)