tog-pegasus/pegasus-2.5-make_install.patch

--- pegasus-2.5/Makefile.make_install	2005-05-12 11:27:24.000000000 -0400
+++ pegasus-2.5/Makefile	2005-10-03 13:07:31.000000000 -0400
@@ -60,12 +60,44 @@
 world: depend all repository
 	@ $(MAKE) -s tests
 
+install: all repository repository_install sdk_install install_dirs install_scripts
+
+sdk_install:
+ifdef PEGASUS_INSTALL
+	if [ -d $(PEGASUS_SDK_STAGING_DIR) ]; then \
+	   ( cd $(PEGASUS_SDK_STAGING_DIR); tar -cpf - .) | ( cd $(PEGASUS_DESTDIR); tar -xpf -); \
+	fi;
+endif
+
+install_dirs:
+ifdef PEGASUS_INSTALL
+	mkdir -p $(PEGASUS_DESTDIR)/$(PEGASUS_LOG_DIR)
+	mkdir -p $(PEGASUS_DESTDIR)/$(PEGASUS_VARRUN_DIR)
+	mkdir -p $(PEGASUS_DESTDIR)/$(PEGASUS_LOCAL_AUTH_DIR)
+endif
+
+install_scripts:
+ifdef PEGASUS_INSTALL
+	mkdir -p $(PEGASUS_DESTDIR)/$(PEGASUS_SBIN_DIR)
+	echo "#!/bin/bash" > $(PEGASUS_DESTDIR)/$(PEGASUS_SBIN_DIR)/init_repository
+	echo "PEGASUS_MOF_DIR="$(PEGASUS_MOF_DIR) >> $(PEGASUS_DESTDIR)/$(PEGASUS_SBIN_DIR)/init_repository
+	echo "PEGASUS_REPOSITORY_DIR="$(PEGASUS_REPOSITORY_DIR) >> $(PEGASUS_DESTDIR)/$(PEGASUS_SBIN_DIR)/init_repository
+	echo "PEGASUS_BIN_DIR="$(PEGASUS_BIN_DIR) >> $(PEGASUS_DESTDIR)/$(PEGASUS_SBIN_DIR)/init_repository
+	echo "PEGASUS_CIM_SCHEMA=29" >> $(PEGASUS_DESTDIR)/$(PEGASUS_SBIN_DIR)/init_repository
+	cat installs/scripts/init_repository >> $(PEGASUS_DESTDIR)/$(PEGASUS_SBIN_DIR)/init_repository
+	chown root:root $(PEGASUS_DESTDIR)/$(PEGASUS_SBIN_DIR)/init_repository >/dev/null 2>&1 || :;
+	chmod 0755 $(PEGASUS_DESTDIR)/$(PEGASUS_SBIN_DIR)/init_repository
+endif
+
 # The repository Target removes and rebuilds the CIM repository
 
 # Note: Arguments must be quoted to preserve upper case characters in VMS.
 repository: FORCE
 	@ $(MAKE) "-SC" Schemas/Pegasus repository
 
+repository_install: repository
+	@ $(MAKE) "-SC" Schemas/Pegasus install_repository
+
 repositoryclean: FORCE
 	@ $(RMREPOSITORY) $(REPOSITORY_ROOT)
 
--- pegasus-2.5/mak/SDKMakefile.make_install	2005-10-03 12:32:47.000000000 -0400
+++ pegasus-2.5/mak/SDKMakefile	2005-10-03 12:32:47.000000000 -0400
@@ -156,8 +156,7 @@
    Providers/Load \
    mak
 
-DOCSRCPATH1FILES = \
-   SecurityGuidelinesForDevelopers.html
+DOCSRCPATH1FILES =
 
 CLIENTSRCPATH1FILES = \
    Makefile \
@@ -402,3 +401,8 @@
 testSDK:
 	@$(MAKE) --directory=$(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR) -f Makefile  tests \
              PEGASUS_SAMPLES_DIR=$(PEGASUS_STAGING_DIR)$(PEGASUS_SAMPLES_DIR)
+
+install:
+ifdef PEGASUS_INSTALL
+	(cd $(PEGASUS_STAGING_DIR); tar -cpf - .) | ( cd $(PEGASUS_DESTDIR)/; tar -xpf -)
+endif
\ No newline at end of file
--- pegasus-2.5/mak/program-unix.mak.make_install	2005-10-03 12:32:47.000000000 -0400
+++ pegasus-2.5/mak/program-unix.mak	2005-10-03 12:32:47.000000000 -0400
@@ -154,4 +154,4 @@
 
 include $(ROOT)/mak/misc.mak
 
-include $(ROOT)/mak/install-program-unix.mak
+include $(PEGASUS_ROOT)/mak/install-program-unix.mak
--- /dev/null	2005-10-03 10:53:34.123398250 -0400
+++ pegasus-2.5/mak/install-program-unix.mak	2005-10-03 12:32:47.000000000 -0400
@@ -0,0 +1,16 @@
+INSTALL_BIN?=bin
+INSTALL_USER?=root
+INSTALL_GROUP?=root
+INSTALL_MODE?=0755
+install: $(PEGASUS_HOME)/bin/$(PROGRAM)
+ifdef PEGASUS_INSTALL
+   ifndef TEST
+	$(PEGASUS_INSTALL) -D -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m $(INSTALL_MODE) $(PEGASUS_HOME)/bin/$(PROGRAM) $(PEGASUS_DESTDIR)/$(PEGASUS_PROD_DIR)/$(INSTALL_BIN)/$(PROGRAM)
+   else
+      ifeq ( $(TEST), 'INSTALL' )
+	$(PEGASUS_INSTALL) -D -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m $(INSTALL_MODE) $(PEGASUS_TEST_STAGING_DIR)/$(PEGASUS_TEST_BIN_DIR)/$(PROGRAM) $(PEGASUS_DESTDIR)/$(PEGASUS_PROD_DIR)/$(INSTALL_BIN)/$(PROGRAM)
+      endif
+   endif
+endif
+
+
--- /dev/null	2005-10-03 10:53:34.123398250 -0400
+++ pegasus-2.5/mak/install-library-unix.mak	2005-10-03 12:32:47.000000000 -0400
@@ -0,0 +1,16 @@
+INSTALL_LIB?=$(PEGASUS_ARCH_LIB_DIR)
+INSTALL_USER?=root
+INSTALL_GROUP?=root
+INSTALL_MODE?=0755
+install: $(PEGASUS_HOME)/$(PEGASUS_ARCH_LIB_DIR)/lib$(LIBRARY)$(LIB_SUFFIX)
+ifdef PEGASUS_INSTALL	
+   ifndef TEST
+	$(PEGASUS_INSTALL) -D -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m $(INSTALL_MODE) $(PEGASUS_HOME)/$(PEGASUS_ARCH_LIB_DIR)/lib$(LIBRARY)$(LIB_SUFFIX) $(PEGASUS_DESTDIR)/$(PEGASUS_PROD_DIR)/$(INSTALL_LIB)/lib$(LIBRARY)$(LIB_SUFFIX)
+	ln -s lib$(LIBRARY)$(LIB_SUFFIX) $(PEGASUS_DESTDIR)/$(PEGASUS_PROD_DIR)/$(INSTALL_LIB)/lib$(LIBRARY).so
+   else
+      ifeq ( $(TEST), 'INSTALL' )
+	echo 'TEST is '"'"$(TEST)"'"
+	$(PEGASUS_INSTALL) -D -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m $(INSTALL_MODE) $(PEGASUS_HOME)/$(PEGASUS_ARCH_LIB_DIR)/lib$(LIBRARY)$(LIB_SUFFIX) $(PEGASUS_TEST_STAGING_DIR)/$(PEGASUS_TEST_LIB_DIR)/lib$(LIBRARY)$(LIB_SUFFIX)
+      endif
+   endif
+endif
--- pegasus-2.5/mak/library-unix.mak.make_install	2005-10-03 12:32:47.000000000 -0400
+++ pegasus-2.5/mak/library-unix.mak	2005-10-03 12:32:47.000000000 -0400
@@ -165,4 +165,4 @@
 
 FILES_TO_CLEAN = $(OBJECTS) $(FULL_LIB)
 
-include $(ROOT)/mak/install-library-unix.mak
+include $(PEGASUS_ROOT)/mak/install-library-unix.mak
--- pegasus-2.5/mak/recurse.mak.make_install	2005-05-12 11:27:28.000000000 -0400
+++ pegasus-2.5/mak/recurse.mak	2005-10-03 12:32:47.000000000 -0400
@@ -76,3 +76,5 @@
 messages: $(RECURSE_DEPENDS) $(ERROR)
 	@ $(foreach i, $(DIRS), $(MAKESH) $(MAKE) "-SC" $(i) messages $(NL) )
 
+install: $(RECURSE_DEPENDS) $(ERROR)
+	@ $(foreach i, $(DIRS), $(MAKESH) $(MAKE) "-SC" $(i) install $(NL) )
--- pegasus-2.5/rpm/Makefile.make_install	2005-05-12 11:27:29.000000000 -0400
+++ pegasus-2.5/rpm/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -51,3 +51,13 @@
 
 messages:
 
+install: tog-pegasus.rc wbem cimserver_planned.conf
+ifdef PEGASUS_INSTALL
+	$(PEGASUS_INSTALL) -D -o root -g root -m 0550 tog-pegasus.rc $(PEGASUS_DESTDIR)/etc/rc.d/init.d/tog-pegasus
+	$(PEGASUS_INSTALL) -D -o root -g root -m 0660 cimserver_planned.conf $(PEGASUS_DESTDIR)/$(PEGASUS_CONFIG_DIR)/cimserver_planned.conf
+	$(PEGASUS_INSTALL) -D -o root -g root -m 0660 wbem $(PEGASUS_DESTDIR)/etc/pam.d/wbem
+	mkdir -p $(PEGASUS_DESTDIR)/$(PEGASUS_MANUSER_DIR) $(PEGASUS_DESTDIR)/$(PEGASUS_MANADMIN_DIR) 
+	cp -fp manLinux/man1.Z/*.1 $(PEGASUS_DESTDIR)/$(PEGASUS_MANUSER_DIR)/
+	cp -fp manLinux/man8.Z/*.8 $(PEGASUS_DESTDIR)/$(PEGASUS_MANADMIN_DIR)/
+	for f in manLinux/man1m.Z/*.1m; do F=$(PEGASUS_DESTDIR)/$(PEGASUS_MANADMIN_DIR)/`echo $$f | sed 's/1m$$/8/;s/.*\///g'`; if [ ! -f $$F ]; then cp -fp $$f $$F; fi; done
+endif 
\ No newline at end of file
--- pegasus-2.5/test/Makefile.make_install	2005-05-12 11:33:41.000000000 -0400
+++ pegasus-2.5/test/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -27,11 +27,13 @@
 #//
 #//==============================================================================
 ROOT = ..
-
+TEST = true
+TEST=true
 include $(ROOT)/mak/config.mak
 
 DIRS = \
    wetest
 
+TEST=true
 include $(ROOT)/mak/recurse.mak
 
--- pegasus-2.5/test/TestProviders/ExceptionsTest/Makefile.make_install	2005-05-12 11:33:41.000000000 -0400
+++ pegasus-2.5/test/TestProviders/ExceptionsTest/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -59,7 +59,9 @@
 
 
 ROOT = $(PEGASUS_ROOT)
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/mak/configschema.mak
 
 SAMPLEPROVIDERNS= root/SampleProvider
@@ -77,6 +79,7 @@
 
 LOCAL_DEFINES=-DTEST_EXCEPTIONS
 
+TEST=true
 include $(PEGASUS_ROOT)/mak/library.mak
 
 client:
--- pegasus-2.5/test/TestProviders/CIMOMSample/Makefile.make_install	2005-05-12 11:33:41.000000000 -0400
+++ pegasus-2.5/test/TestProviders/CIMOMSample/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -61,7 +61,9 @@
 
 
 ROOT = $(PEGASUS_ROOT)
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/mak/configschema.mak
 
 SAMPLEPROVIDERNS= root/SampleProvider
@@ -77,6 +79,7 @@
    CIMOMSampleProvider.cpp \
    CIMOMSampleProviderMain.cpp
 
+TEST=true
 include $(PEGASUS_ROOT)/mak/library.mak
 
 client:
--- pegasus-2.5/test/TestProviders/LoadMOFs/Makefile.make_install	2005-05-12 11:33:42.000000000 -0400
+++ pegasus-2.5/test/TestProviders/LoadMOFs/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -71,7 +71,9 @@
 
 ROOT = $(PEGASUS_ROOT)
 
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/mak/configschema.mak
 
 # Loads the sample MOF into a separate namespace.
--- pegasus-2.5/test/TestProviders/TimingTests/Makefile.make_install	2005-05-12 11:33:43.000000000 -0400
+++ pegasus-2.5/test/TestProviders/TimingTests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -62,7 +62,9 @@
 
 
 ROOT = $(PEGASUS_ROOT)
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/mak/configschema.mak
 
 SAMPLEPROVIDERNS= root/SampleProvider
@@ -80,4 +82,5 @@
 LOCAL_DEFINES=-DPEGASUS_DEBUG
 #LOCAL_DEFINES=-DNO_OF_INSTANCES=200
 
+TEST=true
 include $(PEGASUS_ROOT)/mak/library.mak
--- pegasus-2.5/test/TestProviders/Makefile.make_install	2005-05-12 11:33:42.000000000 -0400
+++ pegasus-2.5/test/TestProviders/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../..
 
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/test/config.mak
 
 DIRS = 	ExceptionsTest \
@@ -39,4 +41,5 @@
 	XMLParserGen \
 	LoadMOFs
 
+TEST=true
 include $(PEGASUS_ROOT)/mak/recurse.mak
--- pegasus-2.5/test/TestProviders/LargeDataProvider/Makefile.make_install	2005-05-12 11:33:42.000000000 -0400
+++ pegasus-2.5/test/TestProviders/LargeDataProvider/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -61,7 +61,9 @@
 
 
 ROOT = $(PEGASUS_ROOT)
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/mak/configschema.mak
 
 SAMPLEPROVIDERNS= root/SampleProvider
@@ -79,6 +81,7 @@
 
 LOCAL_DEFINES=-DNO_OF_INSTANCES=200
 
+TEST=true
 include $(PEGASUS_ROOT)/mak/library.mak
 
 client:
--- pegasus-2.5/test/TestProviders/XMLParserGen/Makefile.make_install	2005-05-12 11:33:43.000000000 -0400
+++ pegasus-2.5/test/TestProviders/XMLParserGen/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -62,7 +62,9 @@
 
 
 ROOT = $(PEGASUS_ROOT)
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/mak/configschema.mak
 
 SAMPLEPROVIDERNS= root/SampleProvider
@@ -78,4 +80,5 @@
    ParserTestProvider.cpp \
    ParserTestProviderMain.cpp
 
+TEST=true
 include $(PEGASUS_ROOT)/mak/library.mak
--- pegasus-2.5/test/TestProviders/MultithreadingTests/Makefile.make_install	2005-05-12 11:33:43.000000000 -0400
+++ pegasus-2.5/test/TestProviders/MultithreadingTests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -62,7 +62,9 @@
 
 
 ROOT = $(PEGASUS_ROOT)
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/mak/configschema.mak
 
 SAMPLEPROVIDERNS= root/SampleProvider
@@ -80,4 +82,5 @@
 
 #LOCAL_DEFINES=-DNO_OF_INSTANCES=200
 
+TEST=true
 include $(PEGASUS_ROOT)/mak/library.mak
--- pegasus-2.5/test/wetest/Makefile.make_install	2005-05-12 11:33:44.000000000 -0400
+++ pegasus-2.5/test/wetest/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../..
 
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/test/config.mak
 
 #Defines subdirectories to go to recursively
@@ -42,6 +44,7 @@
 
 # This is a recurse make file
 
+TEST=true
 include $(ROOT)/mak/recurse.mak
 
 repository: $(RECURSE_DEPENDS) $(ERROR)
@@ -54,3 +57,6 @@
 	@ $(foreach i, $(LOADDIRS), $(MAKESH) $(MAKE) "-SC" $(i) removerepository $(NL) )
 
 #DO NOT DELETE THIS LINE
+
+install:
+
--- pegasus-2.5/test/wetest/cimv2/References/Makefile.make_install	2005-05-12 11:33:49.000000000 -0400
+++ pegasus-2.5/test/wetest/cimv2/References/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -29,9 +29,15 @@
 
 ROOT = ../../../..
 
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/test/config.mak
 
 XMLSCRIPTS = References45000 References45001 References45002 References45003 References45004 References45005
 
+TEST=true
 include $(ROOT)/test/configend.mak
+
+install:
+
--- pegasus-2.5/test/wetest/cimv2/EnumerateClasses/Makefile.make_install	2005-05-18 21:58:51.000000000 -0400
+++ pegasus-2.5/test/wetest/cimv2/EnumerateClasses/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -29,7 +29,9 @@
 
 ROOT = ../../../..
 
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/test/config.mak
 
 
@@ -62,4 +64,8 @@
 
 endif
 
+TEST=true
 include $(ROOT)/test/configend.mak
+
+install:
+
--- pegasus-2.5/test/wetest/cimv2/ModifyClass/Makefile.make_install	2005-05-12 11:33:49.000000000 -0400
+++ pegasus-2.5/test/wetest/cimv2/ModifyClass/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 
 ROOT = ../../../..
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/test/config.mak
 
 XMLSCRIPTS = ModifyClass43000 ModifyClass43001 ModifyClass43003 ModifyClass43004 ModifyClass43005
@@ -38,4 +40,8 @@
               ModifyClass43002
 endif
 
+TEST=true
 include $(ROOT)/test/configend.mak
+
+install:
+
--- pegasus-2.5/test/wetest/cimv2/GetQualifier/Makefile.make_install	2005-05-12 11:33:48.000000000 -0400
+++ pegasus-2.5/test/wetest/cimv2/GetQualifier/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,7 +30,9 @@
 #
 
 ROOT = ../../../..
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/test/config.mak
 
 XMLSCRIPTS = GetQualifier37000 GetQualifier37002
@@ -40,4 +42,8 @@
           GetQualifier37001
 endif
 
+TEST=true
 include $(ROOT)/test/configend.mak
+
+install:
+
--- pegasus-2.5/test/wetest/cimv2/EnumerateClassNames/Makefile.make_install	2005-05-18 21:58:51.000000000 -0400
+++ pegasus-2.5/test/wetest/cimv2/EnumerateClassNames/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,7 +30,9 @@
 #
 
 ROOT = ../../../..
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/test/config.mak
 
 
@@ -61,4 +63,8 @@
 endif
 
 endif
+TEST=true
 include $(ROOT)/test/configend.mak
+
+install:
+
--- pegasus-2.5/test/wetest/cimv2/GetClass/Makefile.make_install	2005-05-12 11:33:47.000000000 -0400
+++ pegasus-2.5/test/wetest/cimv2/GetClass/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,7 +30,9 @@
 #
 
 ROOT = $(PEGASUS_ROOT)
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/test/config.mak
 
 XMLSCRIPTS = \
@@ -55,4 +57,7 @@
            GetClass00016 
 endif
 
+TEST=true
 include $(ROOT)/test/configend.mak
+
+install:
--- pegasus-2.5/test/wetest/cimv2/EnumerateInstances/Makefile.make_install	2005-05-12 11:33:47.000000000 -0400
+++ pegasus-2.5/test/wetest/cimv2/EnumerateInstances/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -29,9 +29,15 @@
 
 ROOT = ../../../..
 
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/test/config.mak
 
 XMLSCRIPTS = EnumerateInstances60000 
 
+TEST=true
 include $(ROOT)/test/configend.mak
+
+install:
+
--- pegasus-2.5/test/wetest/cimv2/Makefile.make_install	2005-05-12 11:33:48.000000000 -0400
+++ pegasus-2.5/test/wetest/cimv2/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -31,7 +31,9 @@
 #
 ROOT=../../..
 
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/test/config.mak
 
 DIRS = \
@@ -54,5 +56,9 @@
 	EnumerateClassNames
 
 
+TEST=true
 include $(ROOT)/mak/recurse.mak
 
+
+install:
+
--- pegasus-2.5/test/wetest/cimv2/AssociatorNames/Makefile.make_install	2005-05-12 11:33:44.000000000 -0400
+++ pegasus-2.5/test/wetest/cimv2/AssociatorNames/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -29,9 +29,14 @@
 
 ROOT = ../../../..
 
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/test/config.mak
 
 XMLSCRIPTS = AssociatorNames30000 AssociatorNames30001 AssociatorNames30002 AssociatorNames30003 AssociatorNames30004 AssociatorNames30005 AssociatorNames30006 AssociatorNames30007 AssociatorNames30008
 
+TEST=true
 include $(ROOT)/test/configend.mak
+
+install:
--- pegasus-2.5/test/wetest/cimv2/ReferenceNames/Makefile.make_install	2005-05-12 11:33:49.000000000 -0400
+++ pegasus-2.5/test/wetest/cimv2/ReferenceNames/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -29,9 +29,15 @@
 
 ROOT = ../../../..
 
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/test/config.mak
 
 XMLSCRIPTS = ReferenceNames61000 ReferenceNames61001 ReferenceNames61002
 
+TEST=true
 include $(ROOT)/test/configend.mak
+
+install:
+
--- pegasus-2.5/test/wetest/cimv2/CreateClass/Makefile.make_install	2005-05-12 11:33:45.000000000 -0400
+++ pegasus-2.5/test/wetest/cimv2/CreateClass/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,7 +30,9 @@
 #
 
 ROOT = ../../../..
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/test/config.mak
 
 XMLSCRIPTS = CreateClass34000 CreateClass34001 CreateClass34002 CreateClass34004 CreateClass34005 CreateClass34006 CreateClass34007 CreateClass34008 CreateClass34009 CreateClass34010 CreateClass34011
@@ -40,4 +42,8 @@
               CreateClass34003             
 endif
 
+TEST=true
 include $(ROOT)/test/configend.mak
+
+install:
+
--- pegasus-2.5/test/wetest/cimv2/SetQualifier/Makefile.make_install	2005-05-12 11:33:49.000000000 -0400
+++ pegasus-2.5/test/wetest/cimv2/SetQualifier/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 
 ROOT = ../../../..
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/test/config.mak
 
 XMLSCRIPTS = SetQualifier38000 SetQualifier38001
@@ -38,4 +40,8 @@
           SetQualifier38002
 endif
 
+TEST=true
 include $(ROOT)/test/configend.mak
+
+install:
+
--- pegasus-2.5/test/wetest/cimv2/DeleteClass/Makefile.make_install	2005-05-12 11:33:45.000000000 -0400
+++ pegasus-2.5/test/wetest/cimv2/DeleteClass/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,7 +30,9 @@
 #
 
 ROOT = ../../../..
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/test/config.mak
 
 XMLSCRIPTS = DeleteClass36000 DeleteClass36001 DeleteClass36003 DeleteClass36004 DeleteClass36007 DeleteClass36008 DeleteClass36009 DeleteClass36010
@@ -40,4 +42,8 @@
             DeleteClass36002
 endif
 
+TEST=true
 include $(ROOT)/test/configend.mak
+
+install:
+
--- pegasus-2.5/test/wetest/cimv2/Load/Makefile.make_install	2005-05-12 11:33:48.000000000 -0400
+++ pegasus-2.5/test/wetest/cimv2/Load/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -34,7 +34,9 @@
 #       remove function.
 
 ROOT = $(PEGASUS_ROOT)
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/mak/configschema.mak
 
 # The following variable determine the version of the Schema to
@@ -89,3 +91,5 @@
 poststarttests:
 
 general:
+
+install:
--- pegasus-2.5/test/wetest/cimv2/EnumerateQualifiers/Makefile.make_install	2005-05-12 11:33:47.000000000 -0400
+++ pegasus-2.5/test/wetest/cimv2/EnumerateQualifiers/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -29,7 +29,9 @@
 
 ROOT = ../../../..
 
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/test/config.mak
 
 XMLSCRIPTS =
@@ -41,4 +43,8 @@
           EnumerateQualifiers31001
 endif
 
+TEST=true
 include $(ROOT)/test/configend.mak
+
+install:
+
--- pegasus-2.5/test/wetest/cimv2/EnumerateInstanceNames/Makefile.make_install	2005-05-12 11:33:46.000000000 -0400
+++ pegasus-2.5/test/wetest/cimv2/EnumerateInstanceNames/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -29,7 +29,9 @@
 
 ROOT = ../../../..
 
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/test/config.mak
 
 XMLSCRIPTS = EnumerateInstanceNames25000 EnumerateInstanceNames25002
@@ -39,4 +41,8 @@
            EnumerateInstanceNames25001
 endif
 
+TEST=true
 include $(ROOT)/test/configend.mak
+
+install:
+
--- pegasus-2.5/test/wetest/cimv2/Associators/Makefile.make_install	2005-05-12 11:33:44.000000000 -0400
+++ pegasus-2.5/test/wetest/cimv2/Associators/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -29,9 +29,14 @@
 
 ROOT = ../../../..
 
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/test/config.mak
 
 XMLSCRIPTS = Associators33000 Associators33001 Associators33002 Associators33003 Associators33004 Associators33005 Associators33006 Associators33007
 
+TEST=true
 include $(ROOT)/test/configend.mak
+
+install:
\ No newline at end of file
--- pegasus-2.5/test/wetest/cimv2/DeleteQualifier/Makefile.make_install	2005-05-12 11:33:45.000000000 -0400
+++ pegasus-2.5/test/wetest/cimv2/DeleteQualifier/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 
 ROOT = ../../../..
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/test/config.mak
 
 XMLSCRIPTS = DeleteQualifier39000 DeleteQualifier39001 DeleteQualifier39003
@@ -38,4 +40,8 @@
            DeleteQualifier39002
 endif
 
+TEST=true
 include $(ROOT)/test/configend.mak
+
+install:
+
--- pegasus-2.5/test/wetest/static/Property/Makefile.make_install	2005-07-27 16:51:13.000000000 -0400
+++ pegasus-2.5/test/wetest/static/Property/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 
 ROOT = ../../../..
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/test/config.mak
 
 XMLSCRIPTS = \
@@ -39,4 +41,8 @@
    SetProperty82202 \
    SetProperty82300
 
+TEST=true
 include $(ROOT)/test/configend.mak
+
+install:
+
--- pegasus-2.5/test/wetest/static/ModifyClass/Makefile.make_install	2005-05-12 11:33:53.000000000 -0400
+++ pegasus-2.5/test/wetest/static/ModifyClass/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,9 +28,15 @@
 #//==============================================================================
 
 ROOT = ../../../..
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/test/config.mak
 
 XMLSCRIPTS = ModifyClass43006
 
+TEST=true
 include $(ROOT)/test/configend.mak
+
+install:
+
--- pegasus-2.5/test/wetest/static/CreateInstance/Makefile.make_install	2005-05-12 11:33:50.000000000 -0400
+++ pegasus-2.5/test/wetest/static/CreateInstance/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 
 ROOT = ../../../..
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/test/config.mak
 
 XMLSCRIPTS = CreateInstance53000 CreateInstance53002 CreateInstance53003 CreateInstance53004 CreateInstance53005 CreateInstance53006 CreateInstance53007 CreateInstance53008 CreateInstance53009 CreateInstance53010 CreateInstance53011 CreateInstance53012 CreateInstance53013 CreateInstance53014 CreateInstance53015 CreateInstance53016 CreateInstance53017 CreateInstance53018 CreateInstance53019 CreateInstance53020 CreateInstance53021 CreateInstance53022 CreateInstance53023 CreateInstance53024 CreateInstance53025 CreateInstance53026 CreateInstance53027 CreateInstance53028 CreateInstance53029 CreateInstance53030 CreateInstance53031 CreateInstance53032 CreateInstance53033 CreateInstance53034 CreateInstance53035 CreateInstance53036 CreateInstance53037 CreateInstance53038 CreateInstance53039 CreateInstance53040 CreateInstance53041 CreateInstance53042 CreateInstance53043 CreateInstance53044 CreateInstance53045 CreateInstance53046 CreateInstance53047 CreateInstance53048 CreateInstance53049 CreateInstance53050 CreateInstance53051 CreateInstance53052 CreateInstance53053 CreateInstance53054 CreateInstance53055
@@ -37,4 +39,8 @@
 XMLSCRIPTS += CreateInstance53001
 endif
 
+TEST=true
 include $(ROOT)/test/configend.mak
+
+install:
+
--- pegasus-2.5/test/wetest/static/EnumerateInstances/Makefile.make_install	2005-05-12 11:33:51.000000000 -0400
+++ pegasus-2.5/test/wetest/static/EnumerateInstances/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 
 ROOT = ../../../..
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/test/config.mak
 
 XMLSCRIPTS = EnumerateInstances51003
@@ -62,4 +64,8 @@
 XmlScriptDefects: DeepLocalFT51006 \
 	          DeepLocalTT51004
 
+TEST=true
 include $(ROOT)/test/configend.mak
+
+install:
+
--- pegasus-2.5/test/wetest/static/GetInstance/Makefile.make_install	2005-05-12 11:33:52.000000000 -0400
+++ pegasus-2.5/test/wetest/static/GetInstance/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 
 ROOT = ../../../..
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/test/config.mak
 
 XMLSCRIPTS = GetInstance52000 GetInstance52001 GetInstance52002 GetInstance52003 GetInstance52005 GetInstance52006
@@ -41,4 +43,8 @@
 XMLSCRIPTS += GetInstance52004
 endif
 
+TEST=true
 include $(ROOT)/test/configend.mak
+
+install:
+
--- pegasus-2.5/test/wetest/static/Makefile.make_install	2005-05-12 11:33:53.000000000 -0400
+++ pegasus-2.5/test/wetest/static/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT=../../..
 
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/test/config.mak
 
 DIRS = \
@@ -47,5 +49,9 @@
 #	ModifyClass\
 #	DeleteClass
 	
+TEST=true
 include $(ROOT)/mak/recurse.mak
 
+
+install:
+
--- pegasus-2.5/test/wetest/static/ModifyInstance/Makefile.make_install	2005-05-12 11:33:53.000000000 -0400
+++ pegasus-2.5/test/wetest/static/ModifyInstance/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 
 ROOT = ../../../..
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/test/config.mak
 
 XMLSCRIPTS = ModifyInstance54000 ModifyInstance54003 ModifyInstance54004 ModifyInstance54005 ModifyInstance54006 
@@ -39,4 +41,8 @@
               ModifyInstance54002
 endif
 
+TEST=true
 include $(ROOT)/test/configend.mak
+
+install:
+
--- pegasus-2.5/test/wetest/static/ErrorXml/Makefile.make_install	2005-05-12 11:33:51.000000000 -0400
+++ pegasus-2.5/test/wetest/static/ErrorXml/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 
 ROOT = ../../../..
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/test/config.mak
 
 XMLSCRIPTS = \
@@ -87,4 +89,8 @@
     BadProtocolVersion03
 
 
+TEST=true
 include $(ROOT)/test/configend.mak
+
+install:
+
--- pegasus-2.5/test/wetest/static/DeleteClass/Makefile.make_install	2005-05-12 11:33:50.000000000 -0400
+++ pegasus-2.5/test/wetest/static/DeleteClass/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,9 +28,15 @@
 #//==============================================================================
 
 ROOT = ../../../..
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/test/config.mak
 
 XMLSCRIPTS = DeleteClass36005
 
+TEST=true
 include $(ROOT)/test/configend.mak
+
+install:
+
--- pegasus-2.5/test/wetest/static/Load/Makefile.make_install	2005-05-12 11:33:53.000000000 -0400
+++ pegasus-2.5/test/wetest/static/Load/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -34,7 +34,9 @@
 #       remove function.
 
 ROOT = $(PEGASUS_ROOT)
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/mak/configschema.mak
 
 # The following variable determine the version of the Schema to
@@ -86,3 +88,6 @@
 poststarttests:
 
 general:
+
+install:
+
--- pegasus-2.5/test/wetest/static/EnumerateInstanceNames/Makefile.make_install	2005-05-12 11:33:51.000000000 -0400
+++ pegasus-2.5/test/wetest/static/EnumerateInstanceNames/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../..
 
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/test/config.mak
 
 XMLSCRIPTS = EnumerateInstanceNames50000 EnumerateInstanceNames50002
@@ -37,4 +39,8 @@
 XMLSCRIPTS += EnumerateInstanceNames50001
 endif
 
+TEST=true
 include $(ROOT)/test/configend.mak
+
+install:
+
--- pegasus-2.5/test/wetest/static/DeleteInstance/Makefile.make_install	2005-05-12 11:33:50.000000000 -0400
+++ pegasus-2.5/test/wetest/static/DeleteInstance/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 
 ROOT = ../../../..
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/test/config.mak
 
 XMLSCRIPTS = DeleteInstance55000 DeleteInstance55001 DeleteInstance55003
@@ -38,4 +40,8 @@
               DeleteInstance55002
 endif
 
+TEST=true
 include $(ROOT)/test/configend.mak
+
+install:
+
--- pegasus-2.5/test/wetest/static/Headers/Makefile.make_install	2005-05-12 11:33:52.000000000 -0400
+++ pegasus-2.5/test/wetest/static/Headers/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 
 ROOT = ../../../..
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/test/config.mak
 
 XMLSCRIPTS = \
@@ -65,4 +67,8 @@
     BadCIMObjectValueEncoding03 \
     GoodCIMObjectValueEncoding01
 
+TEST=true
 include $(ROOT)/test/configend.mak
+
+install:
+
--- pegasus-2.5/src/slp/tests/Makefile.make_install	2005-05-12 11:33:38.000000000 -0400
+++ pegasus-2.5/src/slp/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,9 +28,13 @@
 #//==============================================================================
 ROOT=../../..
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 DIRS = \
 	srv_reg
 
+TEST=true
 include $(ROOT)/mak/recurse.mak
+
+install:
--- pegasus-2.5/src/slp/tests/srv_reg/Makefile.make_install	2005-05-12 11:33:38.000000000 -0400
+++ pegasus-2.5/src/slp/tests/srv_reg/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = $(PEGASUS_ROOT)
 DIR = Pegasus/../slp/tests/srvreg
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = srv_reg
 SOURCES = srv_reg.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Listener/tests/Makefile.make_install	2005-05-12 11:30:39.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Listener/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,9 +28,11 @@
 #//==============================================================================
 ROOT=../../../..
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 DIRS = \
 	TestListener
 
+TEST=true
 include $(ROOT)/mak/recurse.mak
--- pegasus-2.5/src/Pegasus/Listener/tests/TestListener/Makefile.make_install	2005-05-12 11:30:39.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Listener/tests/TestListener/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Listener/tests/TestListener
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -DPEGASUS_CONSUMER_INTERNAL
@@ -36,6 +38,7 @@
 PROGRAM = TestListener
 SOURCES = TestListener.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/HandlerService/tests/Makefile.make_install	2005-05-12 11:29:55.000000000 -0400
+++ pegasus-2.5/src/Pegasus/HandlerService/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,9 +28,11 @@
 #//==============================================================================
 ROOT = ../../../..
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 DIRS = \
     HandlerTable
 
+TEST=true
 include $(ROOT)/mak/recurse.mak
--- pegasus-2.5/src/Pegasus/HandlerService/tests/HandlerTable/Makefile.make_install	2005-05-12 11:29:55.000000000 -0400
+++ pegasus-2.5/src/Pegasus/HandlerService/tests/HandlerTable/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Server/IndicationService/tests/HandlerTable
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 EXTRA_INCLUDES = $(SYS_INCLUDES)
@@ -39,6 +41,7 @@
 
 SOURCES = HandlerTable.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Compiler/tests/Makefile.make_install	2005-05-12 11:29:44.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Compiler/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,9 +28,11 @@
 #//==============================================================================
 ROOT=../../../..
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 DIRS = \
     CompAssoc
 
+TEST=true
 include $(ROOT)/mak/recurse.mak
--- pegasus-2.5/src/Pegasus/Compiler/tests/CompAssoc/Makefile.make_install	2005-05-12 11:29:44.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Compiler/tests/CompAssoc/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Compiler/tests/CompAssoc
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = CompAssoc
 SOURCES = CompAssoc.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 MOF_PATH = $(ROOT)/Schemas/CIM25
--- pegasus-2.5/src/Pegasus/Compiler/cmdline/tests/Makefile.make_install	2005-05-12 11:29:43.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Compiler/cmdline/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -32,7 +32,9 @@
 
 MOF_PATH = $(ROOT)/Schemas/CIM25
 
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/mak/test.mak
 
 RESULTFILE =  $(TMP_DIR)/cmdline_result
@@ -148,3 +150,4 @@
 
 poststarttests:
 
+install:
--- pegasus-2.5/src/Pegasus/Compiler/cmdline/Makefile.make_install	2005-05-12 11:29:42.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Compiler/cmdline/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -36,3 +36,4 @@
 
 include $(ROOT)/mak/recurse.mak
  
+install:
--- pegasus-2.5/src/Pegasus/Compiler/cmdline/cimmofl/Makefile.make_install	2005-05-12 11:29:43.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Compiler/cmdline/cimmofl/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -58,3 +58,4 @@
 
 prepend-license:
 
+install:
--- pegasus-2.5/src/Pegasus/Handler/SystemLogListenerDestination/tests/Makefile.make_install	2005-05-12 11:29:57.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Handler/SystemLogListenerDestination/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Handler/SystemLogListenerDestination/tests
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../../libraries.mak
 
 EXTRA_INCLUDES = $(SYS_INCLUDES)
@@ -39,6 +41,7 @@
 
 SOURCES = SystemLogHandler.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Handler/EmailListenerDestination/tests/Makefile.make_install	2005-05-12 11:29:56.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Handler/EmailListenerDestination/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Handler/EmailListenerDestination/tests
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../../libraries.mak
 
 EXTRA_INCLUDES = $(SYS_INCLUDES)
@@ -39,6 +41,7 @@
 
 SOURCES = EmailHandler.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/ProviderManager2/tests/ProviderManagerService/Makefile.make_install	2005-05-12 11:31:02.000000000 -0400
+++ pegasus-2.5/src/Pegasus/ProviderManager2/tests/ProviderManagerService/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -26,6 +26,7 @@
 #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #//
 #//==============================================================================
+TEST=true
 include $(PEGASUS_ROOT)/mak/config.mak
 
 DIR = Pegasus/ProviderManager2/tests/ProviderManagerService
@@ -42,6 +43,7 @@
 
 SOURCES = ProviderManagerService.cpp
 
+TEST=true
 include $(PEGASUS_ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/ProviderManager2/tests/Makefile.make_install	2005-05-12 11:31:01.000000000 -0400
+++ pegasus-2.5/src/Pegasus/ProviderManager2/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -26,6 +26,7 @@
 #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #//
 #//==============================================================================
+TEST=true
 include $(PEGASUS_ROOT)/mak/config.mak
 
 DIRS = \
@@ -36,4 +37,5 @@
 	ProviderManagerService \
 	OperationResponseHandler
 
+TEST=true
 include $(PEGASUS_ROOT)/mak/recurse.mak
--- pegasus-2.5/src/Pegasus/ProviderManager2/tests/ProviderManager/Makefile.make_install	2005-05-12 11:31:03.000000000 -0400
+++ pegasus-2.5/src/Pegasus/ProviderManager2/tests/ProviderManager/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,6 +30,7 @@
 
 DIR = Pegasus/ProviderManager2/tests/ProviderManager
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 EXTRA_INCLUDES = $(SYS_INCLUDES)
@@ -54,4 +55,5 @@
 	TestProviderManagerMain.cpp \
 	TestProviderManager.cpp
 
+TEST=true
 include $(ROOT)/mak/dynamic-library.mak
--- pegasus-2.5/src/Pegasus/ProviderManager2/tests/ProviderManagerModule/Makefile.make_install	2005-05-12 11:31:02.000000000 -0400
+++ pegasus-2.5/src/Pegasus/ProviderManager2/tests/ProviderManagerModule/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -26,6 +26,7 @@
 #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #//
 #//==============================================================================
+TEST=true
 include $(PEGASUS_ROOT)/mak/config.mak
 
 DIR = Pegasus/ProviderManager2/tests/ProviderManagerModule
@@ -42,6 +43,7 @@
 
 SOURCES = ProviderManagerModule.cpp
 
+TEST=true
 include $(PEGASUS_ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/ProviderManager2/tests/Lockable/Makefile.make_install	2005-05-12 11:31:01.000000000 -0400
+++ pegasus-2.5/src/Pegasus/ProviderManager2/tests/Lockable/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -26,6 +26,7 @@
 #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #//
 #//==============================================================================
+TEST=true
 include $(PEGASUS_ROOT)/mak/config.mak
 
 DIR = Pegasus/ProviderManager2/tests/Lockable
@@ -40,6 +41,7 @@
 
 SOURCES = Lockable.cpp
 
+TEST=true
 include $(PEGASUS_ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/ProviderManager2/tests/SafeQueue/Makefile.make_install	2005-05-12 11:31:03.000000000 -0400
+++ pegasus-2.5/src/Pegasus/ProviderManager2/tests/SafeQueue/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -26,6 +26,7 @@
 #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #//
 #//==============================================================================
+TEST=true
 include $(PEGASUS_ROOT)/mak/config.mak
 
 DIR = Pegasus/ProviderManager2/tests/SafeQueue
@@ -40,6 +41,7 @@
 
 SOURCES = SafeQueue.cpp
 
+TEST=true
 include $(PEGASUS_ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/ProviderManager2/tests/OperationResponseHandler/Makefile.make_install	2005-05-12 11:31:02.000000000 -0400
+++ pegasus-2.5/src/Pegasus/ProviderManager2/tests/OperationResponseHandler/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,6 +30,7 @@
 
 DIR = Pegasus/ProviderManager2/tests/OperationResponseHandler
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 EXTRA_INCLUDES = $(SYS_INCLUDES)
@@ -47,6 +48,7 @@
 SOURCES = \
 	TestOperationResponseHandler.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/Property/Makefile.make_install	2005-05-12 11:31:00.000000000 -0400
+++ pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/Property/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,8 +28,10 @@
 #//==============================================================================
 
 ROOT = ../../../../../../../../..
+TEST=true
 include $(ROOT)/mak/config.mak
 #include $(ROOT)/test/config.mak
+TEST=true
 include ../config.mak
 
 XMLSCRIPTS = \
@@ -38,4 +40,5 @@
    SetProperty82200 \
    SetProperty82300
 
+TEST=true
 include $(ROOT)/test/configend.mak
--- pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/ModifyClass/Makefile.make_install	2005-05-12 11:30:59.000000000 -0400
+++ pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/ModifyClass/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,10 +28,13 @@
 #//==============================================================================
 
 ROOT = ../../../../../../../../..
+TEST=true
 include $(ROOT)/mak/config.mak
 #include $(ROOT)/test/config.mak
+TEST=true
 include ../config.mak
 
 XMLSCRIPTS = ModifyClass43006
 
+TEST=true
 include $(ROOT)/test/configend.mak
--- pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/CreateInstance/Makefile.make_install	2005-05-12 11:30:56.000000000 -0400
+++ pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/CreateInstance/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,8 +28,10 @@
 #//==============================================================================
 
 ROOT = ../../../../../../../../..
+TEST=true
 include $(ROOT)/mak/config.mak
 #include $(ROOT)/test/config.mak
+TEST=true
 include ../config.mak
 
 XMLSCRIPTS = CreateInstance53000 \
@@ -91,4 +93,5 @@
 XMLSCRIPTS += CreateInstance53001
 endif
 
+TEST=true
 include $(ROOT)/test/configend.mak
--- pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/ProcessIndication/Makefile.make_install	2005-05-12 11:31:00.000000000 -0400
+++ pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/ProcessIndication/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -29,6 +29,7 @@
 JAVAROOT = ../../../../..
 ROOT = ../../../../../../../../..
 
+TEST=true
 include $(ROOT)/mak/config.mak
 #include $(ROOT)/mak/program.mak
 
--- pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/EnumerateInstances/Makefile.make_install	2005-05-12 11:30:57.000000000 -0400
+++ pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/EnumerateInstances/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,8 +28,10 @@
 #//==============================================================================
 
 ROOT = ../../../../../../../../..
+TEST=true
 include $(ROOT)/mak/config.mak
 #include $(ROOT)/test/config.mak
+TEST=true
 include ../config.mak
 
 XMLSCRIPTS = EnumerateInstances51003
@@ -63,4 +65,5 @@
 XmlScriptDefects: DeepLocalFT51006 \
 	          DeepLocalTT51004
 
+TEST=true
 include $(ROOT)/test/configend.mak
--- pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/GetInstance/Makefile.make_install	2005-05-12 11:30:58.000000000 -0400
+++ pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/GetInstance/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,8 +28,10 @@
 #//==============================================================================
 
 ROOT = ../../../../../../../../..
+TEST=true
 include $(ROOT)/mak/config.mak
 #include $(ROOT)/test/config.mak
+TEST=true
 include ../config.mak
 
 XMLSCRIPTS = GetInstance52000 GetInstance52001 GetInstance52002 GetInstance52003 GetInstance52005 GetInstance52006
@@ -42,4 +44,5 @@
 XMLSCRIPTS += GetInstance52004
 endif
 
+TEST=true
 include $(ROOT)/test/configend.mak
--- pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/Makefile.make_install	2005-05-12 11:30:59.000000000 -0400
+++ pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT=../../../../../../../..
 
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/test/config.mak
 
 DIRS = \
@@ -50,5 +52,6 @@
 #	DeleteClass
 #	Headers\
 
+TEST=true
 include $(ROOT)/mak/recurse.mak
 
--- pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/ModifyInstance/Makefile.make_install	2005-05-12 11:31:00.000000000 -0400
+++ pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/ModifyInstance/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,8 +28,10 @@
 #//==============================================================================
 
 ROOT = ../../../../../../../../..
+TEST=true
 include $(ROOT)/mak/config.mak
 #include $(ROOT)/test/config.mak
+TEST=true
 include ../config.mak
 
 XMLSCRIPTS = ModifyInstance54000 ModifyInstance54003 ModifyInstance54004 ModifyInstance54005 ModifyInstance54006 
@@ -40,4 +42,5 @@
               ModifyInstance54002
 endif
 
+TEST=true
 include $(ROOT)/test/configend.mak
--- pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/ErrorXml/Makefile.make_install	2005-05-12 11:30:57.000000000 -0400
+++ pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/ErrorXml/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,11 +28,14 @@
 #//==============================================================================
 
 ROOT = ../../../../../../../../..
+TEST=true
 include $(ROOT)/mak/config.mak
 #include $(ROOT)/test/config.mak
+TEST=true
 include ../config.mak
 
 XMLSCRIPTS = BadAttributeName01 BadBooleanValue01 BadInstanceClassName01 BadMethodName01 BadQualDecl01 BadQualDeclType01 DuplicateProperty01 DuplicateQualifier01 MissingBooleanValue01 MissingCIMEndTag01 MissingClassName01 MissingClassNameStartTag01 MissingIParamvalueEndTag01 MissingIParamvalueStartTag01 MissingKeyValue01 MissingKeyValueEndTag01 MissingMessageEndTag01 MissingMethodCallEndTag01 MissingPropertyReferenceEndTag01 MissingReqEndTag01 MissingValueArray01 MissingXmlVersion01 BadChar16Value01 BadDateTimeValue01 BadOpeningElement01 BadQualValueElement01 BadReal32Value01 BadReal64Value01 IllegalValueClassName01 MissingInstanceNameClassName01 MissingParamValueName01 MissingValueElementEndTag01 BadCharacterReference01 BadCharacterReference02 BadCharacterReference03 BadCharacterReference04 BadCharacterReference05 BadCharacterReference06 BadCharacterReference07 BadEntityReference01 BadEntityReference02 BadEntityReference03 GoodCharacterReference01 GoodCharacterReference02 GoodCharacterReference03 GoodCharacterReference04 GoodEntityReference01
 
 
+TEST=true
 include $(ROOT)/test/configend.mak
--- pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/Client/Makefile.make_install	2005-05-12 11:30:56.000000000 -0400
+++ pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/Client/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -29,6 +29,7 @@
 JAVAROOT = ../../../../..
 ROOT = ../../../../../../../../..
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 .SUFFIXES: .java .class .jar
--- pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/JMPI_TestPropertyTypes/Makefile.make_install	2005-05-12 11:30:58.000000000 -0400
+++ pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/JMPI_TestPropertyTypes/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -29,6 +29,7 @@
 JAVAROOT = ../../../../..
 ROOT = ../../../../../../../../..
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 .SUFFIXES: .java .class .jar
--- pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/Load/Makefile.make_install	2005-05-22 17:50:57.000000000 -0400
+++ pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/Load/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -34,7 +34,9 @@
 #       remove function.
 
 ROOT = $(PEGASUS_ROOT)
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/mak/configschema.mak
 
 # The following variable determine the version of the Schema to
--- pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/EnumerateInstanceNames/Makefile.make_install	2005-05-12 11:30:57.000000000 -0400
+++ pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/EnumerateInstanceNames/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,8 +28,10 @@
 #//==============================================================================
 ROOT = ../../../../../../../../..
 
+TEST=true
 include $(ROOT)/mak/config.mak
 #include $(ROOT)/test/config.mak
+TEST=true
 include ../config.mak
 
 XMLSCRIPTS = EnumerateInstanceNames50000 EnumerateInstanceNames50002
@@ -38,4 +40,5 @@
 XMLSCRIPTS += EnumerateInstanceNames50001
 endif
 
+TEST=true
 include $(ROOT)/test/configend.mak
--- pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/DeleteInstance/Makefile.make_install	2005-05-12 11:30:56.000000000 -0400
+++ pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/DeleteInstance/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,8 +28,10 @@
 #//==============================================================================
 
 ROOT = ../../../../../../../../..
+TEST=true
 include $(ROOT)/mak/config.mak
 #include $(ROOT)/test/config.mak
+TEST=true
 include ../config.mak
 
 XMLSCRIPTS = DeleteInstance55000 DeleteInstance55001 DeleteInstance55003
@@ -39,4 +41,5 @@
               DeleteInstance55002
 endif
 
+TEST=true
 include $(ROOT)/test/configend.mak
--- pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/InvokeMethod/Makefile.make_install	2005-05-12 11:30:58.000000000 -0400
+++ pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/InvokeMethod/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,8 +28,10 @@
 #//==============================================================================
 
 ROOT = ../../../../../../../../..
+TEST=true
 include $(ROOT)/mak/config.mak
 #include $(ROOT)/test/config.mak
+TEST=true
 include ../config.mak
 
 XMLSCRIPTS = MethodCall1000
@@ -39,4 +41,5 @@
 #              DeleteInstance55002
 #endif
 
+TEST=true
 include $(ROOT)/test/configend.mak
--- pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/Headers/Makefile.make_install	2005-05-12 11:30:58.000000000 -0400
+++ pegasus-2.5/src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests/Headers/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,11 +28,14 @@
 #//==============================================================================
 
 ROOT = ../../../../../../../../..
+TEST=true
 include $(ROOT)/mak/config.mak
 #include $(ROOT)/test/config.mak
+TEST=true
 include ../config.mak
 
 XMLSCRIPTS = BadCIMMethodValue01 BadCIMMethodValue02 BadCIMObjectValue01 BadCIMObjectValue02 BadCIMObjectValue03 BadCIMObjectValue04 BadCIMOperationValue01 BadCIMProtocolVersionValue01 ExtraCIMBatchTag01 ExtraCIMBatchTag02 MissingCIMBatchTag01 MissingCIMMethodTag01 MissingCIMMethodTag02 MissingCIMObjectTag01 MissingCIMObjectTag02 MissingCIMOperationTag01 MissingCIMOperationTag02 UnsupportedCIMProtocolVersionValue01 UnsupportedCIMVersionValue01 UnsupportedDTDVersionValue01 UnsupportedHTTPMethod01 MissingCIMMethodValue01 MissingCIMProtocolVersion01 MissingMessage01 BadCIMMethodValue03 BadCIMMethodValueEncoding01 BadCIMObjectValueEncoding01 BadCIMObjectValueEncoding02 BadCIMObjectValueEncoding03 GoodCIMObjectValueEncoding01
 
 
+TEST=true
 include $(ROOT)/test/configend.mak
--- pegasus-2.5/src/Pegasus/ProviderManager2/Default/tests/ProviderModule/Makefile.make_install	2005-05-12 11:30:54.000000000 -0400
+++ pegasus-2.5/src/Pegasus/ProviderManager2/Default/tests/ProviderModule/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -26,6 +26,7 @@
 #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #//
 #//==============================================================================
+TEST=true
 include $(PEGASUS_ROOT)/mak/config.mak
 
 DIR = Pegasus/ProviderManager2/Default/tests/ProviderModule
@@ -45,6 +46,7 @@
 
 SOURCES = ProviderModule.cpp
 
+TEST=true
 include $(PEGASUS_ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/ProviderManager2/Default/tests/Makefile.make_install	2005-05-12 11:30:53.000000000 -0400
+++ pegasus-2.5/src/Pegasus/ProviderManager2/Default/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -26,6 +26,7 @@
 #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #//
 #//==============================================================================
+TEST=true
 include $(PEGASUS_ROOT)/mak/config.mak
 
 DIRS = \
@@ -34,4 +35,5 @@
 	ProviderModule \
     ResponseHandler
 
+TEST=true
 include $(PEGASUS_ROOT)/mak/recurse.mak
--- pegasus-2.5/src/Pegasus/ProviderManager2/Default/tests/ProviderFacade/Makefile.make_install	2005-05-12 11:30:53.000000000 -0400
+++ pegasus-2.5/src/Pegasus/ProviderManager2/Default/tests/ProviderFacade/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -26,6 +26,7 @@
 #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #//
 #//==============================================================================
+TEST=true
 include $(PEGASUS_ROOT)/mak/config.mak
 
 DIR = Pegasus/ProviderManager2/Default/tests/ProviderFacade
@@ -42,6 +43,7 @@
 
 SOURCES = ProviderFacade.cpp
 
+TEST=true
 include $(PEGASUS_ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/ProviderManager2/Default/tests/ProviderManager/Makefile.make_install	2005-05-12 11:30:53.000000000 -0400
+++ pegasus-2.5/src/Pegasus/ProviderManager2/Default/tests/ProviderManager/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -26,6 +26,7 @@
 #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #//
 #//==============================================================================
+TEST=true
 include $(PEGASUS_ROOT)/mak/config.mak
 
 DIR = Pegasus/ProviderManager2/Default/tests/ProviderManager
@@ -45,6 +46,7 @@
 
 SOURCES = ProviderManager.cpp
 
+TEST=true
 include $(PEGASUS_ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/ProviderManager2/Default/tests/ResponseHandler/Makefile.make_install	2005-05-12 11:30:54.000000000 -0400
+++ pegasus-2.5/src/Pegasus/ProviderManager2/Default/tests/ResponseHandler/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -26,6 +26,7 @@
 #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #//
 #//==============================================================================
+TEST=true
 include $(PEGASUS_ROOT)/mak/config.mak
 
 DIR = Pegasus/ProviderManager2/Default/tests/ResponseHandler
@@ -43,6 +44,7 @@
 
 SOURCES = TestResponseHandler.cpp
 
+TEST=true
 include $(PEGASUS_ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Repository/tests/Repository2/Makefile.make_install	2005-06-01 17:13:16.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Repository/tests/Repository2/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Repository/tests/Repository2
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -56,6 +58,7 @@
 PROGRAM = Repository2
 SOURCES = Repository2.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests: testxml testbin
--- pegasus-2.5/src/Pegasus/Repository/tests/LoadClass/Makefile.make_install	2005-05-12 11:31:48.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Repository/tests/LoadClass/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Repository/tests/LoadClass
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = LoadClass
 SOURCES = LoadClass.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Repository/tests/EnumerateClassNames/Makefile.make_install	2005-05-23 17:07:31.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Repository/tests/EnumerateClassNames/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Repository/tests/EnumerateClassNames
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = EnumerateClassNames
 SOURCES = EnumerateClassNames.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 
--- pegasus-2.5/src/Pegasus/Repository/tests/CompareXmlBin/Makefile.make_install	2005-05-23 17:07:30.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Repository/tests/CompareXmlBin/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -48,6 +48,7 @@
 ROOT = ../../../../..
 DIR = Pegasus/Repository/tests/CompareXmlBin
 
+TEST=true
 include $(ROOT)/mak/config.mak
 ### include ../libraries.mak
 
@@ -211,5 +212,5 @@
 	@ $(MAKE) "-SC" $(ROOT)/Schemas/Pegasus/Internal repositoryServer REPOSITORY_DIR=$(REPO_DIR) REPOSITORY_NAME=$(REPO_XML) REPOSITORY_MODE=XML
 	@ $(MAKE) "-SC" $(ROOT)/Schemas/Pegasus/Internal repository REPOSITORY_DIR=$(REPO_DIR) REPOSITORY_NAME=$(REPO_BIN) REPOSITORY_MODE=BIN
 
-
+install:
 
--- pegasus-2.5/src/Pegasus/Repository/tests/Repository/Makefile.make_install	2005-05-23 17:07:32.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Repository/tests/Repository/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Repository/tests/Repository
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = Repository
 SOURCES = Repository.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests: testxml testbin
--- pegasus-2.5/src/Pegasus/Repository/tests/RepositoryMix/Makefile.make_install	2005-05-23 17:07:33.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Repository/tests/RepositoryMix/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Repository/tests/RepositoryMix
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = RepositoryMix
 SOURCES = RepositoryMix.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests: testxml testbin testbinmix testxmlmix
--- pegasus-2.5/src/Pegasus/Repository/tests/Makefile.make_install	2005-05-13 19:04:39.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Repository/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,6 +28,7 @@
 #//==============================================================================
 ROOT = ../../../..
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 #
@@ -56,4 +57,5 @@
     LoadClass \
     CompareXmlCompressed
 
+TEST=true
 include ../../../../mak/recurse.mak
--- pegasus-2.5/src/Pegasus/Repository/tests/Inst/Makefile.make_install	2005-05-12 11:31:48.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Repository/tests/Inst/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Repository/tests/Inst
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = Inst
 SOURCES = Inst.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Repository/tests/QualifierDeclRep/Makefile.make_install	2005-05-23 17:07:31.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Repository/tests/QualifierDeclRep/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Repository/tests/QualifierDeclRep
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = QualifierDeclRep
 SOURCES = QualifierDeclRep.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests: testxml testbin
--- pegasus-2.5/src/Pegasus/Repository/tests/NameSpaceManager/Makefile.make_install	2005-05-17 17:54:46.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Repository/tests/NameSpaceManager/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Repository/tests/NameSpaceManager
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = NameSpaceManager
 SOURCES = NameSpaceManager.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Repository/tests/InheritanceTree/Makefile.make_install	2005-05-12 11:31:48.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Repository/tests/InheritanceTree/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Repository/tests/InheritanceTree
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = InheritanceTree
 SOURCES = InheritanceTree.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Repository/tests/NameSpace/Makefile.make_install	2005-05-23 17:07:31.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Repository/tests/NameSpace/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Repository/tests/NameSpace
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = NameSpace
 SOURCES = NameSpace.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests: testxml testbin
--- pegasus-2.5/src/Pegasus/Repository/tests/LoadRepository/Makefile.make_install	2005-05-17 17:54:45.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Repository/tests/LoadRepository/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Repository/tests/LoadRepository
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -37,6 +39,7 @@
 
 SOURCES = LoadRepository.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Repository/tests/SharedNameSpace/Makefile.make_install	2005-05-23 17:07:33.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Repository/tests/SharedNameSpace/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Repository/tests/SharedNameSpace
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = SharedNameSpace
 SOURCES = SharedNameSpace.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests: testxml testbin
--- pegasus-2.5/src/Pegasus/Repository/tests/SharedInheritanceTree/Makefile.make_install	2005-05-17 17:54:48.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Repository/tests/SharedInheritanceTree/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Repository/tests/SharedInheritanceTree
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = SharedInheritanceTree
 SOURCES = SharedInheritanceTree.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Repository/tests/AssocTable/Makefile.make_install	2005-05-12 11:31:06.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Repository/tests/AssocTable/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Repository/tests/AssocTable
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = AssocTable
 SOURCES = AssocTable.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Repository/tests/CompareXmlCompressed/Makefile.make_install	2005-05-12 11:31:47.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Repository/tests/CompareXmlCompressed/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -49,6 +49,7 @@
 ROOT = ../../../../..
 DIR = Pegasus/Repository/tests/$(TESTNAME)
 
+TEST=true
 include $(ROOT)/mak/config.mak
 ### include ../libraries.mak
 
@@ -202,5 +203,5 @@
 	@ $(MAKE) "-SC" $(ROOT)/Schemas/Pegasus/Internal repositoryServer REPOSITORY_DIR=$(REPO_DIR) REPOSITORY_NAME=$(REPO_XML) REPOSITORY_MODE=XML PEGASUS_ENABLE_COMPRESSED_REPOSITORY=build_non_compressed
 	@ $(MAKE) "-SC" $(ROOT)/Schemas/Pegasus/Internal repository REPOSITORY_DIR=$(REPO_DIR) REPOSITORY_NAME=$(REPO_CMP) REPOSITORY_MODE=XML
 
-
+install:
 
--- pegasus-2.5/src/Pegasus/Repository/tests/ClassDeclRep/Makefile.make_install	2005-05-23 17:07:30.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Repository/tests/ClassDeclRep/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Repository/tests/ClassDeclRep
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -37,6 +39,7 @@
 SOURCES = ClassDeclRep.cpp
 POST_LIBRARIES = -L$(ROOT)/src/PegasusRepository -lPegasusRepository
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 
--- pegasus-2.5/src/Pegasus/Repository/tests/CompareRepositories/Makefile.make_install	2005-05-12 11:31:07.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Repository/tests/CompareRepositories/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -29,7 +29,9 @@
 ROOT = ../../../../..
 DIR = Pegasus/Repository/tests/CompareRepositories
 
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -38,6 +40,7 @@
 PROGRAM = CompareRepositories
 SOURCES = CompareRepositories.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 .PHONY: FORCE local-clean tests poststarttests
--- pegasus-2.5/src/Pegasus/IndicationService/tests/Subscription/Makefile.make_install	2005-05-12 11:30:38.000000000 -0400
+++ pegasus-2.5/src/Pegasus/IndicationService/tests/Subscription/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/IndicationService/tests/Subscription
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 EXTRA_INCLUDES = $(SYS_INCLUDES)
@@ -39,6 +41,7 @@
 
 SOURCES = Subscription.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/IndicationService/tests/ProcessIndication/Makefile.make_install	2005-08-09 16:51:21.000000000 -0400
+++ pegasus-2.5/src/Pegasus/IndicationService/tests/ProcessIndication/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/IndicationService/tests/ProcessIndication
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 EXTRA_INCLUDES = $(SYS_INCLUDES)
@@ -43,6 +45,7 @@
 LOCAL_DEFINES = -DINDICATION_DIR="""$(DISPLAYCONSUMER_DIR)""" -DPEGASUS_INTERNALONLY
 endif
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/IndicationService/tests/Makefile.make_install	2005-05-12 11:30:37.000000000 -0400
+++ pegasus-2.5/src/Pegasus/IndicationService/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,6 +28,7 @@
 #//==============================================================================
 ROOT = ../../../..
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 DIRS = \
@@ -37,4 +38,5 @@
     ProcessIndication \
     Subscription
 
+TEST=true
 include $(ROOT)/mak/recurse.mak
--- pegasus-2.5/src/Pegasus/IndicationService/tests/IndicationProcess/Makefile.make_install	2005-05-12 11:30:37.000000000 -0400
+++ pegasus-2.5/src/Pegasus/IndicationService/tests/IndicationProcess/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/IndicationService/tests/IndicationProcess
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 EXTRA_INCLUDES = $(SYS_INCLUDES)
@@ -43,6 +45,7 @@
 LOCAL_DEFINES = -DINDICATION_DIR="""$(DISPLAYCONSUMER_DIR)""" -DPEGASUS_INTERNALONLY
 endif
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/IndicationService/tests/DisableEnable2/Makefile.make_install	2005-08-09 16:51:20.000000000 -0400
+++ pegasus-2.5/src/Pegasus/IndicationService/tests/DisableEnable2/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/IndicationService/tests/DisableEnable2
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 EXTRA_INCLUDES = $(SYS_INCLUDES)
@@ -39,6 +41,7 @@
 
 SOURCES = DisableEnable2.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/IndicationService/tests/DisableEnable/Makefile.make_install	2005-08-09 16:51:20.000000000 -0400
+++ pegasus-2.5/src/Pegasus/IndicationService/tests/DisableEnable/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/IndicationService/tests/DisableEnable
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 EXTRA_INCLUDES = $(SYS_INCLUDES)
@@ -39,6 +41,7 @@
 
 SOURCES = DisableEnable.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/CQL/tests/Queries/Makefile.make_install	2005-05-12 11:28:35.000000000 -0400
+++ pegasus-2.5/src/Pegasus/CQL/tests/Queries/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -29,7 +29,9 @@
 
 ROOT = ../../../../..
 
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/mak/test.mak
 
 # Steps to add a testcase:
@@ -153,3 +155,4 @@
 
 general:
 
+install:
\ No newline at end of file
--- pegasus-2.5/src/Pegasus/CQL/tests/RegularExpression/Makefile.make_install	2005-05-12 11:28:36.000000000 -0400
+++ pegasus-2.5/src/Pegasus/CQL/tests/RegularExpression/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -29,6 +29,7 @@
 ROOT = ../../../../..
 DIR = Pegasus/CQL/tests/RegularExpression
 #DIRS = msg
+TEST=true
 include $(ROOT)/mak/config.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -43,6 +44,7 @@
 PROGRAM = RegularExpression
 SOURCES = RegularExpression.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/CQL/tests/CQLChainedIdentifier/Makefile.make_install	2005-05-12 11:28:34.000000000 -0400
+++ pegasus-2.5/src/Pegasus/CQL/tests/CQLChainedIdentifier/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -31,6 +31,7 @@
 
 #DIRS = msg 
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -45,6 +46,7 @@
 SOURCES = CQLChainedIdentifier.cpp
 
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests: 
--- pegasus-2.5/src/Pegasus/CQL/tests/Makefile.make_install	2005-05-12 11:28:35.000000000 -0400
+++ pegasus-2.5/src/Pegasus/CQL/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -26,6 +26,7 @@
 #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #//
 #//==============================================================================
+TEST=true
 include $(PEGASUS_ROOT)/mak/config.mak
                                                                                                                                        
 DIRS = \
@@ -35,4 +36,5 @@
     CQLValue \
     Queries
 
+TEST=true
 include $(PEGASUS_ROOT)/mak/recurse.mak
--- pegasus-2.5/src/Pegasus/CQL/tests/CQLValue/Makefile.make_install	2005-05-12 11:28:35.000000000 -0400
+++ pegasus-2.5/src/Pegasus/CQL/tests/CQLValue/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -31,6 +31,7 @@
 
 #DIRS = msg 
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -47,6 +48,7 @@
 SOURCES = CQLValue.cpp
 
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/CQL/tests/QueryContext/Makefile.make_install	2005-05-12 11:28:36.000000000 -0400
+++ pegasus-2.5/src/Pegasus/CQL/tests/QueryContext/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -31,6 +31,7 @@
 
 #DIRS = msg 
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -47,6 +48,7 @@
 PROGRAM = TestQueryContext
 SOURCES = TestQueryContext.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Consumer/tests/Makefile.make_install	2005-05-12 11:29:46.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Consumer/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,9 +28,11 @@
 #//==============================================================================
 ROOT = ../../../..
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 DIRS = \
 	DisplayConsumer
 
+TEST=true
 include $(ROOT)/mak/recurse.mak
--- pegasus-2.5/src/Pegasus/Consumer/tests/DisplayConsumer/Makefile.make_install	2005-05-12 11:29:46.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Consumer/tests/DisplayConsumer/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,10 +28,12 @@
 #//==============================================================================
 ROOT = ../../../../..
 
+TEST=true
 include ../libraries.mak
 
 DIR = Pegasus/Consumer/tests/DisplayConsumer
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 LOCAL_DEFINES = -DPEGASUS_CONSUMER_INTERNAL -DPEGASUS_INTERNALONLY
@@ -40,6 +42,7 @@
 
 LIBRARY = DisplayConsumer
  
+TEST=true
 include $(ROOT)/mak/library.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Server/tests/Makefile.make_install	2005-05-12 11:31:59.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Server/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,8 +28,10 @@
 #//==============================================================================
 ROOT = ../../../..
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 DIRS = \
 
+TEST=true
 include $(ROOT)/mak/recurse.mak
--- pegasus-2.5/src/Pegasus/Server/ProviderRegistrationManager/tests/wildCardNamespaceNames/Makefile.make_install	2005-05-12 11:31:59.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Server/ProviderRegistrationManager/tests/wildCardNamespaceNames/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../../..
 DIR = Pegasus/Server/ProviderRegistrationManager/tests/wildCardNamespaceNames
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 EXTRA_INCLUDES = $(SYS_INCLUDES)
@@ -39,6 +41,7 @@
 
 SOURCES = wildCardNamespaceNames.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Server/ProviderRegistrationManager/tests/load/Makefile.make_install	2005-05-24 16:49:01.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Server/ProviderRegistrationManager/tests/load/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -34,6 +34,7 @@
 #       remove function.
 
 ROOT = $(PEGASUS_ROOT)
+TEST=true
 include $(ROOT)/mak/config.mak
 
 REPOSITORYDIR = $(TMP_DIR)
--- pegasus-2.5/src/Pegasus/Server/ProviderRegistrationManager/tests/lookupMethodProvider/Makefile.make_install	2005-05-12 11:31:58.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Server/ProviderRegistrationManager/tests/lookupMethodProvider/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../../..
 DIR = Pegasus/Server/ProviderRegistrationManager/tests/lookupMethodProvider
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 EXTRA_INCLUDES = $(SYS_INCLUDES)
@@ -39,6 +41,7 @@
 
 SOURCES = lookupMethodProvider.cpp 
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Server/ProviderRegistrationManager/tests/Makefile.make_install	2005-05-12 11:31:56.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Server/ProviderRegistrationManager/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -40,4 +40,5 @@
 
 #   lookupIndicationProvider \
 
+TEST=true
 include $(ROOT)/mak/recurse.mak
--- pegasus-2.5/src/Pegasus/Server/ProviderRegistrationManager/tests/lookupInstanceProvider/Makefile.make_install	2005-05-12 11:31:58.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Server/ProviderRegistrationManager/tests/lookupInstanceProvider/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../../..
 DIR = Pegasus/Server/ProviderRegistrationManager/tests/lookupInstanceProvider
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 EXTRA_INCLUDES = $(SYS_INCLUDES)
@@ -39,6 +41,7 @@
 
 SOURCES = lookupInstanceProvider.cpp 
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Server/ProviderRegistrationManager/tests/lookupIndicationProvider/Makefile.make_install	2005-05-12 11:31:58.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Server/ProviderRegistrationManager/tests/lookupIndicationProvider/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../../..
 DIR = Pegasus/Server/ProviderRegistrationManager/tests/lookupIndicationProvider
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 EXTRA_INCLUDES = $(SYS_INCLUDES)
@@ -39,6 +41,7 @@
 
 SOURCES = lookupIndicationProvider.cpp 
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Server/ProviderRegistrationManager/tests/modifyInstances/Makefile.make_install	2005-05-12 11:31:59.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Server/ProviderRegistrationManager/tests/modifyInstances/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../../..
 DIR = Pegasus/Server/ProviderRegistrationManager/tests/modifyInstances
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 EXTRA_INCLUDES = $(SYS_INCLUDES)
@@ -39,6 +41,7 @@
 
 SOURCES = modifyInstances.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Server/ProviderRegistrationManager/tests/deleteInstances/Makefile.make_install	2005-05-12 11:31:57.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Server/ProviderRegistrationManager/tests/deleteInstances/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../../..
 DIR = Pegasus/Server/ProviderRegistrationManager/tests/deleteInstances
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 EXTRA_INCLUDES = $(SYS_INCLUDES)
@@ -39,6 +41,7 @@
 
 SOURCES = deleteInstances.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Server/ProviderRegistrationManager/tests/createInstances/Makefile.make_install	2005-05-12 11:31:56.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Server/ProviderRegistrationManager/tests/createInstances/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../../..
 DIR = Pegasus/Server/ProviderRegistrationManager/tests/createInstances
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 EXTRA_INCLUDES = $(SYS_INCLUDES)
@@ -39,6 +41,7 @@
 
 SOURCES = createInstances.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/ExportServer/tests/Makefile.make_install	2005-05-12 11:29:54.000000000 -0400
+++ pegasus-2.5/src/Pegasus/ExportServer/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,9 +28,11 @@
 #//==============================================================================
 ROOT=../../../..
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 DIRS = \
 #    ExportServer
 
+TEST=true
 include $(ROOT)/mak/recurse.mak
--- pegasus-2.5/src/Pegasus/ExportServer/tests/ExportServer/Makefile.make_install	2005-05-12 11:29:53.000000000 -0400
+++ pegasus-2.5/src/Pegasus/ExportServer/tests/ExportServer/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/ExportServer/tests/ExportServer
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = TestExportServer
 SOURCES = ExportServer.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/ExportServer/tests/HandlerTable/Makefile.make_install	2005-05-12 11:29:54.000000000 -0400
+++ pegasus-2.5/src/Pegasus/ExportServer/tests/HandlerTable/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/ExportServer/tests/HandlerTable
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 EXTRA_INCLUDES = $(SYS_INCLUDES)
@@ -39,6 +41,7 @@
 
 SOURCES = HandlerTable.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/DynListener/tests/Makefile.make_install	2005-05-12 11:29:51.000000000 -0400
+++ pegasus-2.5/src/Pegasus/DynListener/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,9 +28,11 @@
 #//==============================================================================
 ROOT=../../../..
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 DIRS = \
 	TestDynListener
 
+TEST=true
 include $(ROOT)/mak/recurse.mak
--- pegasus-2.5/src/Pegasus/DynListener/tests/TestDynListener/Makefile.make_install	2005-05-12 11:29:52.000000000 -0400
+++ pegasus-2.5/src/Pegasus/DynListener/tests/TestDynListener/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/DynListener/tests/TestDynListener
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY -DPEGASUS_CONSUMER_INTERNAL
@@ -36,6 +38,7 @@
 PROGRAM = TestDynListener
 SOURCES = TestListener.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Config/tests/ConfigManager/Makefile.make_install	2005-05-12 11:29:45.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Config/tests/ConfigManager/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,8 +30,10 @@
 
 DIR = Pegasus/Config/tests/ConfigManager
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -40,6 +42,7 @@
 
 SOURCES = ConfigManager.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 LOCAL_FILES_TO_CLEAN = \
--- pegasus-2.5/src/Pegasus/Config/tests/Makefile.make_install	2005-05-12 11:29:45.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Config/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,10 +28,12 @@
 #//==============================================================================
 ROOT=../../../..
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 DIRS = \
 	ConfigFileHandler \
 	ConfigManager
 
+TEST=true
 include $(ROOT)/mak/recurse.mak
--- pegasus-2.5/src/Pegasus/Config/tests/ConfigFileHandler/Makefile.make_install	2005-05-12 11:29:44.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Config/tests/ConfigFileHandler/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,8 +30,10 @@
 
 DIR = Pegasus/Config/tests/ConfigFileHandler
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -40,6 +42,7 @@
 
 SOURCES = ConfigFileHandler.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 LOCAL_FILES_TO_CLEAN = \
--- pegasus-2.5/src/Pegasus/msg/Listener/Makefile.make_install	2005-05-12 11:32:02.000000000 -0400
+++ pegasus-2.5/src/Pegasus/msg/Listener/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -50,3 +50,4 @@
 messages: $(MSG_BUNDLES)
 
 # DO NOT DELETE
+install:
--- pegasus-2.5/src/Pegasus/msg/Server/Makefile.make_install	2005-05-12 11:32:02.000000000 -0400
+++ pegasus-2.5/src/Pegasus/msg/Server/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -50,3 +50,4 @@
 messages: $(MSG_BUNDLES)
 
 # DO NOT DELETE
+install:
--- pegasus-2.5/src/Pegasus/msg/CLI/Makefile.make_install	2005-05-12 11:32:02.000000000 -0400
+++ pegasus-2.5/src/Pegasus/msg/CLI/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -50,3 +50,5 @@
 messages: $(MSG_BUNDLES)
 
 # DO NOT DELETE
+
+install:
--- pegasus-2.5/src/Pegasus/Security/Authentication/tests/LocalAuthFile/Makefile.make_install	2005-05-12 11:31:53.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Security/Authentication/tests/LocalAuthFile/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,8 +30,10 @@
 
 DIR = Pegasus/Security/Authentication/tests/LocalAuthFile
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -40,6 +42,7 @@
 
 SOURCES = LocalAuthFile.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Security/Authentication/tests/Makefile.make_install	2005-05-12 11:31:53.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Security/Authentication/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,6 +28,7 @@
 #//==============================================================================
 ROOT=../../../../..
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 DIRS = \
@@ -36,4 +37,5 @@
     BasicAuthenticationHandler \
     AuthenticationManager 
 
+TEST=true
 include $(ROOT)/mak/recurse.mak
--- pegasus-2.5/src/Pegasus/Security/Authentication/tests/AuthenticationManager/Makefile.make_install	2005-05-12 11:31:52.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Security/Authentication/tests/AuthenticationManager/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,8 +30,10 @@
 
 DIR = Pegasus/Security/Authentication/tests/AuthenticationManager
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
+TEST=true
 include ../libraries.mak
 
 
@@ -41,6 +43,7 @@
 
 SOURCES = AuthenticationManager.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Security/Authentication/tests/LocalAuthenticationHandler/Makefile.make_install	2005-05-12 11:31:53.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Security/Authentication/tests/LocalAuthenticationHandler/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,8 +30,10 @@
 
 DIR = Pegasus/Security/Authentication/tests/LocalAuthenticationHandler
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -40,6 +42,7 @@
 
 SOURCES = LocalAuthenticationHandler.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Security/Authentication/tests/BasicAuthenticationHandler/Makefile.make_install	2005-05-12 11:31:52.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Security/Authentication/tests/BasicAuthenticationHandler/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,8 +30,10 @@
 
 DIR = Pegasus/Security/Authentication/tests/BasicAuthenticationHandler
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -40,6 +42,7 @@
 
 SOURCES = BasicAuthenticationHandler.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Security/UserManager/tests/AuthorizationHandler/Makefile.make_install	2005-05-12 11:31:55.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Security/UserManager/tests/AuthorizationHandler/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,8 +30,10 @@
 
 DIR = Pegasus/Security/UserManager/tests/AuthorizationHandler
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
+TEST=true
 include ../libraries.mak
 
 
@@ -41,6 +43,7 @@
 
 SOURCES = AuthorizationHandler.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Security/UserManager/tests/Makefile.make_install	2005-05-12 11:31:55.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Security/UserManager/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,10 +28,12 @@
 #//==============================================================================
 ROOT=../../../../..
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 DIRS = \
 	UserManager \
 	AuthorizationHandler
 
+TEST=true
 include $(ROOT)/mak/recurse.mak
--- pegasus-2.5/src/Pegasus/Security/UserManager/tests/UserManager/Makefile.make_install	2005-05-12 11:31:55.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Security/UserManager/tests/UserManager/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,8 +30,10 @@
 
 DIR = Pegasus/Security/UserManager/tests/UserManager
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -40,6 +42,7 @@
 
 SOURCES = UserManager.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Client/tests/slp/Makefile.make_install	2005-05-12 11:28:40.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Client/tests/slp/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -29,7 +29,9 @@
 ROOT = $(PEGASUS_ROOT)
 DIRCLIENT = Pegasus/Client
 DIR = Pegasus/Client/tests/slp
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 EXTRA_INCLUDES = $(SYS_INCLUDES)
@@ -42,6 +44,7 @@
 
 SOURCES = slpclient.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Client/tests/InvokeMethod2/Makefile.make_install	2005-05-12 11:28:39.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Client/tests/InvokeMethod2/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Client/tests/InvokeMethod2
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 EXTRA_INCLUDES = $(SYS_INCLUDES)
@@ -37,6 +39,7 @@
 
 SOURCES = InvokeMethod2.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Client/tests/SSLClientVerification/Makefile.make_install	2005-05-12 11:28:40.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Client/tests/SSLClientVerification/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,6 +28,7 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Client/tests/SSLClientVerification
+TEST=true
 include $(ROOT)/mak/config.mak
 
 ifdef PEGASUS_HAS_SSL
@@ -35,6 +36,7 @@
   SYS_INCLUDES += -I$(OPENSSL_HOME)/include
 endif
 
+TEST=true
 include ../libraries.mak
 
 EXTRA_INCLUDES = $(SYS_INCLUDES)
@@ -51,7 +53,9 @@
 CURRENT_USER=`whoami`
 endif
 
+TEST=true
 include $(ROOT)/mak/program.mak
+TEST=true
 include $(ROOT)/mak/commands.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Client/tests/MTTestClient/Makefile.make_install	2005-05-12 11:28:39.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Client/tests/MTTestClient/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -31,6 +31,7 @@
 PEGASUS_ZOS_PROGRAM_OBJECT = yes
 
 DIR = Clients/ipinfo
+TEST=true
 include $(ROOT)/mak/config.mak
 
 LIBRARIES = \
@@ -42,6 +43,7 @@
 PROGRAM = MTTestClient
 SOURCES = MTTestClient.cpp 
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Client/tests/Makefile.make_install	2005-05-19 07:37:57.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Client/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,6 +28,7 @@
 #//==============================================================================
 ROOT = ../../../../
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 DIRS = AssociationClient Client InvokeMethod2 EnumInstances DeleteNamespace ClientStatistics
@@ -39,4 +40,5 @@
   DIRS += $(DIRS_SLP)
 endif
 
+TEST=true
 include $(ROOT)/mak/recurse.mak
--- pegasus-2.5/src/Pegasus/Client/tests/DeleteNamespace/Makefile.make_install	2005-05-12 11:28:38.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Client/tests/DeleteNamespace/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,6 +28,7 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Client/tests/DeleteNamespace
+TEST=true
 include $(ROOT)/mak/config.mak
 
 ifdef PEGASUS_HAS_SSL
@@ -35,6 +36,7 @@
   SYS_INCLUDES += -I$(OPENSSL_HOME)/include
 endif
 
+TEST=true
 include ../libraries.mak
 
 EXTRA_INCLUDES = $(SYS_INCLUDES)
@@ -43,6 +45,7 @@
 
 SOURCES = DeleteNamespace.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Client/tests/ClientStatistics/Makefile.make_install	2005-05-12 11:28:37.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Client/tests/ClientStatistics/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Client/tests/ClientStatistics
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 EXTRA_INCLUDES = $(SYS_INCLUDES) $(ACE_INCLUDES)
@@ -37,6 +39,7 @@
 
 SOURCES = ClientStatistics.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Client/tests/Client/Makefile.make_install	2005-05-12 11:28:37.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Client/tests/Client/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Client/tests/Client
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 EXTRA_INCLUDES = $(SYS_INCLUDES) $(ACE_INCLUDES)
@@ -37,6 +39,7 @@
 
 SOURCES = Client.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Client/tests/EnumInstances/Makefile.make_install	2005-05-12 11:28:38.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Client/tests/EnumInstances/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Client/tests/EnumInstances
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 EXTRA_INCLUDES = $(SYS_INCLUDES)
@@ -37,6 +39,7 @@
 
 SOURCES = EnumInstances.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Client/tests/AssociationClient/Makefile.make_install	2005-05-12 11:28:37.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Client/tests/AssociationClient/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = $(PEGASUS_ROOT)
 DIR = Pegasus/Client/tests/AssociationClient
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 EXTRA_INCLUDES = $(SYS_INCLUDES)
@@ -37,6 +39,7 @@
 
 SOURCES = AssociationClient.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/ControlProviders/QueryCapabilitiesProvider/tests/Makefile.make_install	2005-05-12 11:29:49.000000000 -0400
+++ pegasus-2.5/src/Pegasus/ControlProviders/QueryCapabilitiesProvider/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,6 +30,7 @@
 
 DIR = Pegasus/ControlProviders/QueryCapabilitiesProvider/tests
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 LIBRARIES = \
@@ -41,6 +42,7 @@
 PROGRAM = testCIMQueryCap
 SOURCES = TestCIMQueryCap.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 CIM_SCHEMA_DIR = $(ROOT)/Schemas/CIMPrelim291
--- pegasus-2.5/src/Pegasus/ControlProviders/Statistic/test/Makefile.make_install	2005-05-12 11:29:50.000000000 -0400
+++ pegasus-2.5/src/Pegasus/ControlProviders/Statistic/test/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -29,7 +29,7 @@
 ROOT=$(PEGASUS_ROOT)
 DIR = Pegasus/ControlProviders/Statistic/test
 include $(ROOT)/mak/config.mak
-
+TEST=true
 LIBRARIES = \
 	pegclient \
    	pegcommon
--- pegasus-2.5/src/Pegasus/ControlProviders/ProviderRegistrationProvider/tests/Makefile.make_install	2005-05-12 11:29:48.000000000 -0400
+++ pegasus-2.5/src/Pegasus/ControlProviders/ProviderRegistrationProvider/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -34,4 +34,5 @@
    createInstances \
    modifyInstances
 
+TEST=true
 include $(ROOT)/mak/recurse.mak
--- pegasus-2.5/src/Pegasus/ControlProviders/ProviderRegistrationProvider/tests/modifyInstances/Makefile.make_install	2005-05-12 11:29:49.000000000 -0400
+++ pegasus-2.5/src/Pegasus/ControlProviders/ProviderRegistrationProvider/tests/modifyInstances/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../../..
 DIR = Pegasus/ControlProviders/ProviderRegistrationProvider/tests/modifyInstances
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 EXTRA_INCLUDES = $(SYS_INCLUDES)
@@ -39,6 +41,7 @@
 
 SOURCES = modifyInstances.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/ControlProviders/ProviderRegistrationProvider/tests/createInstances/Makefile.make_install	2005-05-12 11:29:49.000000000 -0400
+++ pegasus-2.5/src/Pegasus/ControlProviders/ProviderRegistrationProvider/tests/createInstances/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../../..
 DIR = Pegasus/ControlProviders/ProviderRegistrationProvider/tests/createInstances
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 EXTRA_INCLUDES = $(SYS_INCLUDES)
@@ -39,6 +41,7 @@
 
 SOURCES = createInstances.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/ControlProviders/InteropProvider/tests/Makefile.make_install	2005-05-12 11:29:47.000000000 -0400
+++ pegasus-2.5/src/Pegasus/ControlProviders/InteropProvider/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,6 +28,7 @@
 #//==============================================================================
 ROOT=$(PEGASUS_ROOT)
 DIR = Pegasus/ControlProviders/InteropProvider/tests
+TEST=true
 include $(ROOT)/mak/config.mak
 
 LIBRARIES = \
@@ -42,6 +43,7 @@
 PROGRAM = TestInterop
 SOURCES = interop.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/ExportClient/tests/Makefile.make_install	2005-05-12 11:29:53.000000000 -0400
+++ pegasus-2.5/src/Pegasus/ExportClient/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,8 +28,10 @@
 #//==============================================================================
 ROOT=../../../..
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 DIRS = ExportClient
 
+TEST=true
 include $(ROOT)/mak/recurse.mak
--- pegasus-2.5/src/Pegasus/ExportClient/tests/ExportClient/Makefile.make_install	2005-05-12 11:29:52.000000000 -0400
+++ pegasus-2.5/src/Pegasus/ExportClient/tests/ExportClient/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/ExportClient/tests/ExportClient
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = TestExportClient
 SOURCES = ExportClient.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/WQL/tests/ExecQuery/Makefile.make_install	2005-05-12 11:32:00.000000000 -0400
+++ pegasus-2.5/src/Pegasus/WQL/tests/ExecQuery/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -27,13 +27,16 @@
 #//
 #//==============================================================================
 ROOT = ../../../../..
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/src/Pegasus/Client/tests/libraries.mak
 
 PROGRAM = testExecQuery
 
 SOURCES = TestExecQuery.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/WQL/tests/ParserCLI/Makefile.make_install	2005-07-29 11:55:55.000000000 -0400
+++ pegasus-2.5/src/Pegasus/WQL/tests/ParserCLI/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -31,6 +31,7 @@
 
 LIBRARIES = pegwql pegcommon pegquerycommon
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -38,6 +39,7 @@
 PROGRAM = TestParserCLI
 SOURCES = ParserCLI.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 # Warning: These tests are based on a specific set of paramaters and their
--- pegasus-2.5/src/Pegasus/WQL/tests/Makefile.make_install	2005-05-12 11:32:00.000000000 -0400
+++ pegasus-2.5/src/Pegasus/WQL/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,6 +28,7 @@
 #//==============================================================================
 ROOT=../../../..
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 DIRS = \
@@ -39,4 +40,5 @@
        ExecQuery
 endif
 
+TEST=true
 include $(ROOT)/mak/recurse.mak
--- pegasus-2.5/src/Pegasus/WQL/tests/Parser/Makefile.make_install	2005-05-12 11:32:01.000000000 -0400
+++ pegasus-2.5/src/Pegasus/WQL/tests/Parser/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -32,6 +32,7 @@
 
 LIBRARIES = pegwql pegcommon pegquerycommon
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -39,6 +40,7 @@
 PROGRAM = TestParser
 SOURCES = Parser.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Query/QueryExpression/tests/Queries/Makefile.make_install	2005-05-17 13:09:27.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Query/QueryExpression/tests/Queries/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -31,7 +31,9 @@
 DIR = Pegasus/Query/QueryExpression/tests/Queries
 
 
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/mak/test.mak
 
 QueryExpression.query.res: QueryExpression.query
@@ -49,4 +51,4 @@
 
 depend:
 
-
+install:
--- pegasus-2.5/src/Pegasus/Query/QueryExpression/tests/Makefile.make_install	2005-05-12 11:31:05.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Query/QueryExpression/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -35,7 +35,9 @@
 EXTRA_INCLUDES = -Int_includes
 endif
 
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/mak/configschema.mak
 
 LIBRARIES = \
@@ -57,6 +59,7 @@
 QEXPRTESTNS=root/SampleProvider
 QEXPRTESTNSDIRECTORY=$(REPOSITORY_ROOT)/root\#SampleProvider     
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 repository:
@@ -75,3 +78,4 @@
 
 clean:
 
+install:
\ No newline at end of file
--- pegasus-2.5/src/Pegasus/Common/tests/Property/Makefile.make_install	2005-05-12 11:28:54.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/Property/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Common/tests/Property
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = TestProperty
 SOURCES = Property.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/Match/Makefile.make_install	2005-05-12 11:28:50.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/Match/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Common/tests/Match
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = TestMatch
 SOURCES = Match.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/IPC/Makefile.make_install	2005-05-12 11:28:48.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/IPC/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Common/tests/IPC
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = IPC
 SOURCES = IPC.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/WebServer/Makefile.make_install	2005-05-12 11:29:40.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/WebServer/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Common/tests/WebServer
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = WebServer
 SOURCES = WebServer.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/ModuleController/Makefile.make_install	2005-05-12 11:28:52.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/ModuleController/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Common/tests/ModuleController
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = mod_control
 SOURCES = mod_control.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/MessageSerializer/Makefile.make_install	2005-05-12 11:28:51.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/MessageSerializer/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Common/tests/MessageSerializer
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = TestMessageSerializer
 SOURCES = MessageSerializer.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/ToMof/Makefile.make_install	2005-05-12 11:29:38.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/ToMof/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Common/tests/ToMof
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -37,6 +39,7 @@
 
 SOURCES = tomof.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/Service/BeeperService/Makefile.make_install	2005-05-12 11:28:56.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/Service/BeeperService/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,6 +28,7 @@
 #//==============================================================================
 ROOT = ../../../../../..
 DIR = Pegasus/Common/tests/Service/BeeperService
+TEST=true
 include $(ROOT)/mak/config.mak
 LIBRARIES = pegcommon
 
@@ -39,6 +40,7 @@
 
 SOURCES = BeeperService.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 SERVICE_PATH = e:/tog/pegasus_home/bin/BeeperService.exe
--- pegasus-2.5/src/Pegasus/Common/tests/Service/Makefile.make_install	2005-05-12 11:28:57.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/Service/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,8 +28,10 @@
 #//==============================================================================
 ROOT = ../../../../..
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 DIRS = InstallService RemoveService BeeperService
 
+TEST=true
 include $(ROOT)/mak/recurse.mak
--- pegasus-2.5/src/Pegasus/Common/tests/Service/RemoveService/Makefile.make_install	2005-05-12 11:29:35.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/Service/RemoveService/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,6 +28,7 @@
 #//==============================================================================
 ROOT = ../../../../../..
 DIR = Pegasus/Common/tests/Service/RemoveService
+TEST=true
 include $(ROOT)/mak/config.mak
 
 EXTRA_INCLUDES = $(SYS_INCLUDES)
@@ -38,6 +39,7 @@
 
 SOURCES = RemoveService.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/Service/InstallService/Makefile.make_install	2005-05-12 11:28:57.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/Service/InstallService/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,6 +28,7 @@
 #//==============================================================================
 ROOT = ../../../../../..
 DIR = Pegasus/Common/tests/Service/InstallService
+TEST=true
 include $(ROOT)/mak/config.mak
 
 EXTRA_INCLUDES = $(SYS_INCLUDES)
@@ -38,6 +39,7 @@
 
 SOURCES = InstallService.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/ParamValue/Makefile.make_install	2005-05-12 11:28:53.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/ParamValue/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Common/tests/ParamValue
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -37,6 +39,7 @@
 
 SOURCES = ParamValue.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/Abstract/Makefile.make_install	2005-05-12 11:28:41.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/Abstract/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = $(PEGASUS_ROOT)
 DIR = Pegasus/Common/tests/Abstract
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = TestAbstract
 SOURCES = Abstract.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/InstanceDecl/Makefile.make_install	2005-05-12 11:28:49.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/InstanceDecl/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Common/tests/InstanceDecl
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = TestInstanceDecl
 SOURCES = InstanceDecl.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/Resolve/Makefile.make_install	2005-05-12 11:28:56.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/Resolve/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Common/tests/Resolve
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = TestResolve
 SOURCES = Resolve.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/TimeValue/Makefile.make_install	2005-05-12 11:29:38.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/TimeValue/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Common/tests/TimeValue
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = TestTimeValue
 SOURCES = TimeValue.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/Dir/Makefile.make_install	2005-05-12 11:28:45.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/Dir/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Common/tests/Dir
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = TestDir
 SOURCES = Dir.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/IndicationFormatter/Makefile.make_install	2005-06-20 14:50:52.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/IndicationFormatter/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -1,6 +1,8 @@
 ROOT = ../../../../..
 DIR = Pegasus/Common/tests/IndicationFormatter
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -8,6 +10,7 @@
 PROGRAM = TestIndicationFormatter
 SOURCES = IndicationFormatter.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/XmlParser/Makefile.make_install	2005-05-12 11:29:40.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/XmlParser/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Common/tests/XmlParser
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = TestXmlParser
 SOURCES = XmlParser.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/Formatter/Makefile.make_install	2005-05-12 11:28:47.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/Formatter/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Common/tests/Formatter
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = TestFormatter
 SOURCES = Formatter.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/Compare/Makefile.make_install	2005-05-12 11:28:44.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/Compare/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Common/tests/Compare
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = TestCompare
 SOURCES = Compare.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/DynLoad/Makefile.make_install	2005-10-03 12:32:47.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/DynLoad/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Common/tests/DynLoad
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = TestDynLoad
 SOURCES = DynLoad.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/QualifierList/Makefile.make_install	2005-05-12 11:28:55.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/QualifierList/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Common/tests/QualifierList
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = TestQualifierList
 SOURCES = QualifierList.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/Makefile.make_install	2005-06-20 14:50:53.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -26,6 +26,7 @@
 #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #//
 #//==============================================================================
+TEST=true
 include $(PEGASUS_ROOT)/mak/config.mak
 
 DIRS = \
@@ -91,4 +92,5 @@
 	StatisticalData
 endif
 
+TEST=true
 include $(PEGASUS_ROOT)/mak/recurse.mak
--- pegasus-2.5/src/Pegasus/Common/tests/Tracer/Makefile.make_install	2005-05-12 11:29:38.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/Tracer/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,8 +30,10 @@
 
 DIR = Pegasus/Common/tests/Tracer
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -40,6 +42,7 @@
 
 SOURCES = Tracer.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/ObjectNormalizer/Makefile.make_install	2005-05-12 11:28:52.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/ObjectNormalizer/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,7 +30,9 @@
 
 DIR = Pegasus/Common/tests/ObjectNormalizer
 
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 PROGRAM = TestObjectNormalizer
@@ -39,6 +41,7 @@
 	TestObjectNormalizer.cpp\
 	LocalRepository.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/Qualifier/Makefile.make_install	2005-05-12 11:28:55.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/Qualifier/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Common/tests/Qualifier
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = TestQualifier
 SOURCES = Qualifier.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/StrToInstName/Makefile.make_install	2005-05-12 11:29:37.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/StrToInstName/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Common/tests/StrToInstName
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = TestStrToInstName
 SOURCES = StrToInstName.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/Stack/Makefile.make_install	2005-05-12 11:29:36.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/Stack/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Common/tests/Stack
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = TestStack
 SOURCES = Stack.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/XmlDump/Makefile.make_install	2005-05-12 11:29:40.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/XmlDump/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Common/tests/XmlDump
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -37,6 +39,7 @@
 
 SOURCES = XmlDump.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/WebClient/Makefile.make_install	2005-05-12 11:29:39.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/WebClient/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Common/tests/WebClient
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = WebClient
 SOURCES = WebClient.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/Flavor/Makefile.make_install	2005-05-12 11:28:47.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/Flavor/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Common/tests/Flavor
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -37,6 +39,7 @@
 
 SOURCES = Flavor.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/DQueue/Makefile.make_install	2005-05-12 11:28:45.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/DQueue/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Common/tests/DQueue
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = DQueue
 SOURCES = DQueue.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/Config/Makefile.make_install	2005-05-12 11:28:44.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/Config/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Common/tests/Config
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = TestConfig
 SOURCES = Config.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/Parameter/Makefile.make_install	2005-05-12 11:28:54.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/Parameter/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Common/tests/Parameter
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = TestParameter
 SOURCES = Parameter.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/Thread/Makefile.make_install	2005-05-12 11:29:37.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/Thread/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Common/tests/Thread
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = Thread
 SOURCES = Thread.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/DynamicLibrary/Makefile.make_install	2005-05-12 11:28:46.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/DynamicLibrary/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -26,10 +26,12 @@
 #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #//
 #//==============================================================================
+TEST=true
 include ../libraries.mak
 
 DIR = Pegasus/Common/tests/DynamicLibrary
 
+TEST=true
 include $(PEGASUS_ROOT)/mak/config.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -38,6 +40,7 @@
 
 PROGRAM = TestDynamicLibrary
 
+TEST=true
 include $(PEGASUS_ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/L10N/Makefile.make_install	2005-05-12 11:28:49.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/L10N/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -31,7 +31,9 @@
 
 DIRS = msg 
 
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -39,6 +41,7 @@
 PROGRAM = TestL10N
 SOURCES = l10n.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/L10N/msg/Makefile.make_install	2005-05-12 11:28:49.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/L10N/msg/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,12 +30,12 @@
 
 DIR = Pegasus/Common/tests/L10N/msg
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 # ICU package name
 MSG_PACKAGE = pegasusTest
 
-
 # Destination directory for the compiled bundles
 MSG_DIR = $(MSG_ROOT)/test
 
@@ -49,8 +49,10 @@
 
 # Keep the following in the order listed
 
+TEST=true
 include $(ROOT)/mak/message.mak
 
 messages: $(MSG_BUNDLES)
 
+install:
 # DO NOT DELETE
--- pegasus-2.5/src/Pegasus/Common/tests/Base64/Makefile.make_install	2005-05-12 11:28:43.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/Base64/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Common/tests/Base64
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = TestBase64
 SOURCES = Base64.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/async_callback/Makefile.make_install	2005-05-16 13:33:42.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/async_callback/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Common/tests/async_callback
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = TestAsyncCallback
 SOURCES = async_callback.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/DynLib/Makefile.make_install	2005-05-12 11:28:46.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/DynLib/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -27,10 +27,12 @@
 #//
 #//==============================================================================
 ROOT = ../../../../..
+TEST=true
 include ../libraries.mak
 
 DIR = Pegasus/Common/tests/DynLib
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -43,6 +45,7 @@
 
 LIBRARY = TestDynLib
 
+TEST=true
 include $(ROOT)/mak/dynamic-library.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/Reference/Makefile.make_install	2005-05-12 11:28:55.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/Reference/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Common/tests/Reference
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = TestReference
 SOURCES = Reference.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/HashTable/Makefile.make_install	2005-05-12 11:28:48.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/HashTable/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Common/tests/HashTable
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = TestHashTable
 SOURCES = HashTable.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/MessageQueue/Makefile.make_install	2005-05-12 11:28:51.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/MessageQueue/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Common/tests/MessageQueue
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = TestMessageQueue
 SOURCES = MessageQueue.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/Value/Makefile.make_install	2005-05-12 11:29:39.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/Value/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Common/tests/Value
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -37,6 +39,7 @@
 
 SOURCES = Value.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/MessageQueueService/Makefile.make_install	2005-05-12 11:28:51.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/MessageQueueService/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Common/tests/MessageQueueService
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = MessageQueueService
 SOURCES = MessageQueueService.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/Scope/Makefile.make_install	2005-05-12 11:28:56.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/Scope/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Common/tests/Scope
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -37,6 +39,7 @@
 
 SOURCES = Scope.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/Method/Makefile.make_install	2005-05-12 11:28:52.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/Method/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Common/tests/Method
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = TestMethod
 SOURCES = Method.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/String/Makefile.make_install	2005-05-12 11:29:37.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/String/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Common/tests/String
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = TestString
 SOURCES = String.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/AtomicInt/Makefile.make_install	2005-05-12 11:28:43.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/AtomicInt/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Common/tests/AtomicInt
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = TestAtomicInt
 SOURCES = AtomicInt.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/ValidateClass/Makefile.make_install	2005-05-12 11:29:39.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/ValidateClass/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Common/tests/ValidateClass
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = TestValidateClass
 SOURCES = ValidateClass.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/StatisticalData/Makefile.make_install	2005-05-12 11:29:36.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/StatisticalData/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Common/tests/StatisticalData
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -37,6 +39,7 @@
 
 SOURCES = StatisticalData.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/FileSystem/Makefile.make_install	2005-05-12 11:28:47.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/FileSystem/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Common/tests/FileSystem
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = TestFileSystem
 SOURCES = FileSystem.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 LOCAL_FILES_TO_CLEAN = \
--- pegasus-2.5/src/Pegasus/Common/tests/ClassDecl/Makefile.make_install	2005-05-12 11:28:44.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/ClassDecl/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Common/tests/ClassDecl
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = TestClassDecl
 SOURCES = ClassDecl.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/XmlReader/Makefile.make_install	2005-05-12 11:29:41.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/XmlReader/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Common/tests/XmlReader
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -37,6 +39,7 @@
 
 SOURCES = XmlReader.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/XmlPrint/Makefile.make_install	2005-05-12 11:29:41.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/XmlPrint/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Common/tests/XmlPrint
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -37,6 +39,7 @@
 
 SOURCES = XmlPrint.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/Object/Makefile.make_install	2005-05-12 11:28:53.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/Object/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Common/tests/Object
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = TestObject
 SOURCES = Object.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/ThreadPool/Makefile.make_install	2005-05-12 11:29:37.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/ThreadPool/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Common/tests/ThreadPool
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = ThreadPool
 SOURCES = ThreadPool.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/Queue/Makefile.make_install	2005-05-12 11:28:55.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/Queue/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Common/tests/Queue
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = TestQueue
 SOURCES = Queue.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/AnonymousPipe/Parent/Makefile.make_install	2005-05-12 11:28:42.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/AnonymousPipe/Parent/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,6 +28,7 @@
 #//==============================================================================
 ROOT = ../../../../../..
 DIR = Pegasus/Common/tests/AnonymousPipe/Parent
+TEST=true
 include $(ROOT)/mak/config.mak
 
 LIBRARIES = \
@@ -39,6 +40,7 @@
 
 SOURCES = AnonymousPipe.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/AnonymousPipe/Makefile.make_install	2005-05-12 11:28:42.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/AnonymousPipe/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,8 +28,10 @@
 #//==============================================================================
 ROOT = ../../../../..
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 DIRS = Child Parent
 
+TEST=true
 include $(ROOT)/mak/recurse.mak
--- pegasus-2.5/src/Pegasus/Common/tests/AnonymousPipe/Child/Makefile.make_install	2005-05-12 11:28:42.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/AnonymousPipe/Child/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,6 +28,7 @@
 #//==============================================================================
 ROOT = ../../../../../..
 DIR = Pegasus/Common/tests/AnonymousPipe/Child
+TEST=true
 include $(ROOT)/mak/config.mak
 
 LIBRARIES = \
@@ -39,6 +40,7 @@
 
 SOURCES = Child.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/Logger/Makefile.make_install	2005-05-12 11:28:50.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/Logger/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Common/tests/Logger
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = TestLogger
 SOURCES = Logger.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/HTTPListener/Makefile.make_install	2005-05-12 11:28:48.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/HTTPListener/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Common/tests/HTTPListener
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = TestHTTPListener
 SOURCES = HTTPListener.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/Stopwatch/Makefile.make_install	2005-05-12 11:29:36.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/Stopwatch/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Common/tests/Stopwatch
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = TestStopwatch
 SOURCES = Stopwatch.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/AutoPtr/Makefile.make_install	2005-05-12 11:28:43.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/AutoPtr/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,8 +30,10 @@
 
 DIR = Pegasus/Common/tests/AutoPtr
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -40,6 +42,7 @@
 
 SOURCES = TestAutoPtr.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/QualifierDecl/Makefile.make_install	2005-05-12 11:28:54.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/QualifierDecl/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Common/tests/QualifierDecl
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = TestQualifierDecl
 SOURCES = QualifierDecl.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/DateTime/Makefile.make_install	2005-05-12 11:28:45.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/DateTime/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Common/tests/DateTime
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -36,6 +38,7 @@
 PROGRAM = TestDateTime
 SOURCES = DateTime.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/Array/Makefile.make_install	2005-05-12 11:28:43.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/Array/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,9 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Pegasus/Common/tests/Array
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -37,6 +39,7 @@
 
 SOURCES = Array.cpp Str.cpp Int.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Pegasus/Common/tests/OperationContext/Makefile.make_install	2005-05-12 11:28:53.000000000 -0400
+++ pegasus-2.5/src/Pegasus/Common/tests/OperationContext/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -26,8 +26,10 @@
 #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #//
 #//==============================================================================
+TEST=true
 include $(PEGASUS_ROOT)/mak/config.mak
 
+TEST=true
 include ../libraries.mak
 
 DIR = Pegasus/Common/tests/OperationContext
@@ -38,6 +40,7 @@
 
 SOURCES = TestOperationContext.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/SDK/samples/Providers/CMPI/FilesAndDirectories/tests/Makefile.make_install	2005-05-12 11:41:25.000000000 -0400
+++ pegasus-2.5/src/SDK/samples/Providers/CMPI/FilesAndDirectories/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,6 +28,7 @@
 #//==============================================================================
 ROOT = ../../../../
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 XMLSCRIPTS =  \
--- pegasus-2.5/src/Server/Makefile.make_install	2005-08-19 18:50:20.000000000 -0400
+++ pegasus-2.5/src/Server/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -100,6 +100,8 @@
 
 SOURCES = cimserver.cpp
 
+INSTALL_BIN=sbin
+
 include $(ROOT)/mak/program.mak
 
 ifeq ($(PEGASUS_PLATFORM),WIN32_IX86_MSVC)
@@ -214,7 +216,7 @@
 stageCIMServerConfigurationFiles:
 	@$(RM) $(PEGASUS_HOME)/cimserver_planned.conf
 	@$(COPY) cimserver_planned.conf $(PEGASUS_HOME)
-	
+
 install_run:
 	@$(MAKE) -f $(ROOT)/src/Server/Makefile stageServerSSLFiles-SystemIndependent
 	@$(MAKE) -f $(ROOT)/src/Server/Makefile stageClientSSLFiles-SystemIndependent
@@ -234,4 +236,3 @@
 else
 	cimserver
 endif
-
--- pegasus-2.5/src/utils/cnv2rootbundle/Makefile.make_install	2005-05-12 11:33:39.000000000 -0400
+++ pegasus-2.5/src/utils/cnv2rootbundle/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,11 +28,12 @@
 #//==============================================================================
 ROOT= ../../..
 DIR = utils/cnv2rootbundle
+
 include $(ROOT)/mak/config.mak
 
 PROGRAM = cnv2rootbundle
 SOURCES = cnv2rootbundle.cpp
-
+PEGASUS_INSTALL=
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/utils/Makefile.make_install	2005-05-12 11:33:39.000000000 -0400
+++ pegasus-2.5/src/utils/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -27,7 +27,7 @@
 #//
 #//==============================================================================
 ROOT=../..
-
+PEGASUS_INSTALL=
 include $(ROOT)/mak/config.mak
 
 DIRS = stripcrs \
--- pegasus-2.5/src/utils/mu/tests/Makefile.make_install	2005-05-12 11:33:39.000000000 -0400
+++ pegasus-2.5/src/utils/mu/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,6 +28,7 @@
 #//==============================================================================
 ROOT = ../../../..
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 #   Inst \
@@ -35,4 +36,5 @@
 DIRS = \
     SortCmd
 
+TEST=true
 include ../../../../mak/recurse.mak
--- pegasus-2.5/src/utils/mu/tests/SortCmd/Makefile.make_install	2005-05-12 11:33:40.000000000 -0400
+++ pegasus-2.5/src/utils/mu/tests/SortCmd/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -29,6 +29,7 @@
 ROOT = ../../../../..
 ## DIR = pegasus/src/utils/mu/tests/SortCmd
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 
@@ -38,6 +39,7 @@
 ## PROGRAM = 
 ## SOURCES =
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 .PHONY: FORCE local-clean tests poststarttests
--- pegasus-2.5/src/utils/stripcrs/Makefile.make_install	2005-05-12 11:33:40.000000000 -0400
+++ pegasus-2.5/src/utils/stripcrs/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,11 +28,12 @@
 #//==============================================================================
 ROOT= ../../..
 DIR = utils/stripcrs
+
 include $(ROOT)/mak/config.mak
 
 PROGRAM = stripcrs
 SOURCES = stripcrs.cpp
-
+PEGASUS_INSTALL=
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Providers/IndicationConsumer/Makefile.make_install	2005-05-12 11:32:03.000000000 -0400
+++ pegasus-2.5/src/Providers/IndicationConsumer/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -31,10 +31,12 @@
 
 ROOT = ../../..
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
 
 #Directories to recurse
 DIRS = \
        SimpleDisplayConsumer
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/recurse.mak
--- pegasus-2.5/src/Providers/IndicationConsumer/SimpleDisplayConsumer/Makefile.make_install	2005-05-12 11:32:04.000000000 -0400
+++ pegasus-2.5/src/Providers/IndicationConsumer/SimpleDisplayConsumer/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,6 +30,7 @@
 
 DIR = Providers/IndicationConsumer/SimpleDisplayConsumer
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
 
 LOCAL_DEFINES = -DPEGASUS_CONSUMER_INTERNAL -DPEGASUS_INTERNALONLY -DINDICATION_DIR=\"$(DISPLAYCONSUMER_DIR)\"
@@ -52,4 +53,5 @@
 LOCAL_DEFINES = -DPEGASUS_CONSUMER_INTERNAL -DINDICATION_DIR="""$(DISPLAYCONSUMER_DIR)""" -DPEGASUS_INTERNALONLY
 endif
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/dynamic-library.mak
--- pegasus-2.5/src/Providers/statistic/Makefile.make_install	2005-05-12 11:41:22.000000000 -0400
+++ pegasus-2.5/src/Providers/statistic/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,6 +30,7 @@
 
 DIR = Providers/statistic
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
 
 LIBRARY = IBM_CIMOMStatDataProvider
@@ -43,4 +44,5 @@
 	IBM_CIMOMStatDataProvider.cpp \
 	IBM_CIMOMStatDataProviderMain.cpp
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/library.mak
--- pegasus-2.5/src/Providers/slp/Makefile.make_install	2005-05-12 11:41:22.000000000 -0400
+++ pegasus-2.5/src/Providers/slp/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -31,6 +31,7 @@
 DIR = Providers/slp
 
 DEFINES += -DPEGASUS_DEBUG
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
 
 LIBRARY = SLPProvider
@@ -44,6 +45,7 @@
 SOURCES = \
    SLPProvider.cpp
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/library.mak
 
 #ifeq ($(PEGASUS_PLATFORM),LINUX_IX86_GNU)
--- pegasus-2.5/src/Providers/sample/InstanceProvider/Makefile.make_install	2005-05-12 11:41:18.000000000 -0400
+++ pegasus-2.5/src/Providers/sample/InstanceProvider/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,6 +30,7 @@
 
 DIR = Providers/sample/InstanceProvider
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 LIBRARY = SampleInstanceProvider
@@ -43,6 +44,7 @@
 	InstanceProviderMain.cpp \
 	InstanceProvider.cpp
 
+TEST=true
 include $(ROOT)/mak/dynamic-library.mak
 
 tests:
--- pegasus-2.5/src/Providers/sample/SNMPIndicationProvider/Makefile.make_install	2005-05-12 11:41:22.000000000 -0400
+++ pegasus-2.5/src/Providers/sample/SNMPIndicationProvider/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -26,6 +26,7 @@
 #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #//
 #//==============================================================================
+TEST=true
 include $(PEGASUS_ROOT)/mak/config.mak
 
 DIR = Providers/sample/SNMPIndicationProvider
@@ -41,4 +42,5 @@
 	SNMPIndicationProviderMain.cpp \
 	SNMPIndicationProvider.cpp
 
+TEST=true
 include $(PEGASUS_ROOT)/mak/dynamic-library.mak
--- pegasus-2.5/src/Providers/sample/CMPI/FilesAndDirectories/tests/Makefile.make_install	2005-05-12 11:41:18.000000000 -0400
+++ pegasus-2.5/src/Providers/sample/CMPI/FilesAndDirectories/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,7 +28,11 @@
 #//==============================================================================
 ROOT = $(PEGASUS_ROOT)
 
+TEST=true
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
+TEST=true
 include $(ROOT)/test/config.mak
 
 XMLSCRIPTS =  \
@@ -40,7 +44,10 @@
    ReferenceDirNames12002 \
    PlainFileMethodCall11001
 
+TEST=true
+TEST=true
 include $(ROOT)/test/configend.mak
 
 poststarttests:
 
+install:
\ No newline at end of file
--- pegasus-2.5/src/Providers/sample/CMPI/FilesAndDirectories/Makefile.make_install	2005-06-03 20:58:16.000000000 -0400
+++ pegasus-2.5/src/Providers/sample/CMPI/FilesAndDirectories/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,6 +30,7 @@
 
 DIR = Providers/sample/CMPI/FilesAndDirectories
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 ifeq ($(PEGASUS_PLATFORM),ZOS_ZSERIES_IBM)
@@ -50,6 +51,7 @@
    CWS_DirectoryContainsFile.c \
    cwsutil.c
 
+TEST=true
 include $(ROOT)/mak/library.mak
 
 tests:
--- pegasus-2.5/src/Providers/sample/Makefile.make_install	2005-05-12 11:41:20.000000000 -0400
+++ pegasus-2.5/src/Providers/sample/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -26,6 +26,7 @@
 #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #//
 #//==============================================================================
+TEST=true
 include $(PEGASUS_ROOT)/mak/config.mak
 
 DIRS = \
@@ -46,4 +47,5 @@
 	CMPI/FilesAndDirectories/tests
 endif
 
+TEST=true
 include $(PEGASUS_ROOT)/mak/recurse.mak
--- pegasus-2.5/src/Providers/sample/IndicationProvider/Makefile.make_install	2005-05-12 11:41:18.000000000 -0400
+++ pegasus-2.5/src/Providers/sample/IndicationProvider/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -26,6 +26,7 @@
 #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #//
 #//==============================================================================
+TEST=true
 include $(PEGASUS_ROOT)/mak/config.mak
 
 DIR = Providers/sample/IndicationProvider
@@ -41,4 +42,5 @@
 	IndicationProviderMain.cpp \
 	IndicationProvider.cpp
 
+TEST=true
 include $(PEGASUS_ROOT)/mak/dynamic-library.mak
--- pegasus-2.5/src/Providers/sample/RT_Indication/Makefile.make_install	2005-05-12 11:41:21.000000000 -0400
+++ pegasus-2.5/src/Providers/sample/RT_Indication/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -26,10 +26,12 @@
 #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #//
 #//==============================================================================
+TEST=true
 include $(PEGASUS_ROOT)/mak/config.mak
 
 DIRS = \
 	RT_IndicationProvider \
         RT_IndicationConsumer
 
+TEST=true
 include $(PEGASUS_ROOT)/mak/recurse.mak
--- pegasus-2.5/src/Providers/sample/RT_Indication/RT_IndicationProvider/Makefile.make_install	2005-05-12 11:41:21.000000000 -0400
+++ pegasus-2.5/src/Providers/sample/RT_Indication/RT_IndicationProvider/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -26,6 +26,7 @@
 #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #//
 #//==============================================================================
+TEST=true
 include $(PEGASUS_ROOT)/mak/config.mak
 
 DIR = Providers/sample/RT_Indication/RT_IndicationProvider
@@ -45,4 +46,5 @@
 	RT_IndicationProviderMain.cpp \
 	RT_IndicationProvider.cpp
 
+TEST=true
 include $(PEGASUS_ROOT)/mak/dynamic-library.mak
--- pegasus-2.5/src/Providers/sample/RT_Indication/RT_IndicationConsumer/Makefile.make_install	2005-05-12 11:41:21.000000000 -0400
+++ pegasus-2.5/src/Providers/sample/RT_Indication/RT_IndicationConsumer/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,6 +30,7 @@
 
 DIR = Providers/sample/RT_Indication/RT_IndicationConsumer
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 LOCAL_DEFINES = -DPEGASUS_CONSUMER_INTERNAL -DPEGASUS_INTERNALONLY
@@ -45,6 +46,7 @@
    RT_IndicationConsumerMain.cpp \
    RT_IndicationConsumer.cpp 
 
+TEST=true
 include $(ROOT)/mak/dynamic-library.mak
 
 tests:
--- pegasus-2.5/src/Providers/sample/Load/Makefile.make_install	2005-05-20 17:48:05.000000000 -0400
+++ pegasus-2.5/src/Providers/sample/Load/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -34,7 +34,9 @@
 #       remove function.
 
 ROOT = $(PEGASUS_ROOT)
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/mak/configschema.mak
 
 # Loads the sample MOF into a separate namespace.
--- pegasus-2.5/src/Providers/sample/InstanceQueryProvider/tests/Makefile.make_install	2005-05-12 11:41:19.000000000 -0400
+++ pegasus-2.5/src/Providers/sample/InstanceQueryProvider/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -29,7 +29,11 @@
 # Test the Family Provider using the script toosl
 
 ROOT = $(PEGASUS_ROOT)
+TEST=true
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
+TEST=true
 include $(ROOT)/mak/configschema.mak
 
 # Loads the sample MOF into a separate namespace.
--- pegasus-2.5/src/Providers/sample/InstanceQueryProvider/Makefile.make_install	2005-05-12 11:41:18.000000000 -0400
+++ pegasus-2.5/src/Providers/sample/InstanceQueryProvider/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,6 +30,7 @@
 
 DIR = Providers/sample/InstanceQueryProvider
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 LIBRARY = SampleInstanceQueryProvider
@@ -47,6 +48,7 @@
 	InstanceQueryProviderMain.cpp \
 	InstanceQueryProvider.cpp
 
+TEST=true
 include $(ROOT)/mak/dynamic-library.mak
 
 tests:
--- pegasus-2.5/src/Providers/sample/AssociationProvider/Makefile.make_install	2005-05-12 11:41:17.000000000 -0400
+++ pegasus-2.5/src/Providers/sample/AssociationProvider/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,6 +30,7 @@
 
 DIR = Providers/sample/AssociationProvider
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 LIBRARY = SampleAssociationProvider
@@ -42,6 +43,7 @@
    AssociationProviderMain.cpp \
    AssociationProvider.cpp
 
+TEST=true
 include $(ROOT)/mak/library.mak
 
 tests:
--- pegasus-2.5/src/Providers/sample/AssociationProvider/testclient/Makefile.make_install	2005-05-12 11:41:17.000000000 -0400
+++ pegasus-2.5/src/Providers/sample/AssociationProvider/testclient/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,6 +30,7 @@
 
 DIR = Providers/sample/AssociationProvider/testclient
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 PROGRAM = AssociationTestClient
@@ -49,6 +50,7 @@
 	pegclient \
 	pegcommon
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 general:
--- pegasus-2.5/src/Providers/sample/MethodProvider/Makefile.make_install	2005-05-12 11:41:20.000000000 -0400
+++ pegasus-2.5/src/Providers/sample/MethodProvider/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,6 +30,7 @@
 
 DIR = Providers/sample/MethodProvider
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 LIBRARY = SampleMethodProvider
@@ -43,6 +44,7 @@
    MethodProviderMain.cpp \
    MethodProvider.cpp
 
+TEST=true
 include $(ROOT)/mak/dynamic-library.mak
 
 tests:
--- pegasus-2.5/src/Providers/sample/LocalizedProvider/Makefile.make_install	2005-05-12 11:41:19.000000000 -0400
+++ pegasus-2.5/src/Providers/sample/LocalizedProvider/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,6 +30,7 @@
 
 DIR = Providers/sample/LocalizedProvider
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 LIBRARY = SampleLocalizedProvider
@@ -43,6 +44,7 @@
 	LocalizedProviderMain.cpp \
 	LocalizedProvider.cpp
 
+TEST=true
 include $(ROOT)/mak/dynamic-library.mak
 
 tests:
--- pegasus-2.5/src/Providers/sample/LocalizedProvider/msg/Makefile.make_install	2005-05-12 11:41:20.000000000 -0400
+++ pegasus-2.5/src/Providers/sample/LocalizedProvider/msg/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -33,6 +33,7 @@
 
 DIR = Providers/sample/LocalizedProvider/msg
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 # ICU package name for genrb
@@ -52,8 +53,11 @@
 
 # Keep the following in the order listed, and at the end of the file
 
+TEST=true
 include $(ROOT)/mak/message.mak
 
 messages: $(MSG_BUNDLES)
 
 # DO NOT DELETE
+
+install:
\ No newline at end of file
--- pegasus-2.5/src/Providers/ManagedSystem/tests/Makefile.make_install	2005-05-17 12:59:41.000000000 -0400
+++ pegasus-2.5/src/Providers/ManagedSystem/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -29,6 +29,9 @@
 # wbemexec test associated ManagedSystem
 
 ROOT = ../../../..
+TEST=true
+TEST=true
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
 
 HOSTNAME =
--- pegasus-2.5/src/Providers/ManagedSystem/DNSService/tests/Makefile.make_install	2005-05-17 13:07:57.000000000 -0400
+++ pegasus-2.5/src/Providers/ManagedSystem/DNSService/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -29,7 +29,11 @@
 # wbemexec tests for ManagedSystem DNS provider
 
 ROOT = ../../../../..
+TEST=true
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
+TEST=true
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/test.mak
 
 HOSTNAME =
--- pegasus-2.5/src/Providers/ManagedSystem/DNSService/tests/testclient/Makefile.make_install	2005-05-12 11:32:05.000000000 -0400
+++ pegasus-2.5/src/Providers/ManagedSystem/DNSService/tests/testclient/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -32,12 +32,18 @@
 
 DIR = Providers/ManagedSystem/DNSService/tests/testclient
 
+TEST=true
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
+TEST=true
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include ../../../libraries.mak
 
 PROGRAM = DNSTestClient
 SOURCES = DNSTestClient.cpp
 
+TEST=true
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Providers/ManagedSystem/DNSService/Makefile.make_install	2005-05-12 10:54:39.000000000 -0400
+++ pegasus-2.5/src/Providers/ManagedSystem/DNSService/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -46,6 +46,7 @@
 
 DIR = Providers/ManagedSystem/DNSService
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
 
 LIBRARY = DNSProvider
@@ -77,6 +78,7 @@
 	-lpegcommon \
 	-lpegprovider
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/dynamic-library.mak
 
 tests:
--- pegasus-2.5/src/Providers/ManagedSystem/NTPProviderSecurity/Makefile.make_install	2005-05-12 10:54:40.000000000 -0400
+++ pegasus-2.5/src/Providers/ManagedSystem/NTPProviderSecurity/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -37,6 +37,7 @@
 
 DIR = Providers/ManagedSystem/NTPProviderSecurity
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
 
 LIBRARY = NTPProviderSecurity
@@ -51,6 +52,7 @@
 	-lpegcommon \
 	-lpegprovider
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/library.mak
 
 tests:
--- pegasus-2.5/src/Providers/ManagedSystem/Makefile.make_install	2005-05-12 10:54:39.000000000 -0400
+++ pegasus-2.5/src/Providers/ManagedSystem/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -38,6 +38,7 @@
 
 ROOT = ../../..
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
 
 DIRS =  \
@@ -77,5 +78,6 @@
           DNSService/tests/testclient
 endif
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/recurse.mak
 
--- pegasus-2.5/src/Providers/ManagedSystem/IP/tests/Makefile.make_install	2005-05-17 13:06:18.000000000 -0400
+++ pegasus-2.5/src/Providers/ManagedSystem/IP/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -29,7 +29,11 @@
 # wbemexec tests for ManagedSystem IP provider
 
 ROOT = ../../../../..
+TEST=true
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
+TEST=true
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/test.mak
 
 HOSTNAME =
@@ -150,3 +154,4 @@
 
 prepend-license:
 
+install:
--- pegasus-2.5/src/Providers/ManagedSystem/IP/Makefile.make_install	2005-05-12 10:54:39.000000000 -0400
+++ pegasus-2.5/src/Providers/ManagedSystem/IP/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -41,6 +41,7 @@
 
 DIR = Providers/ManagedSystem/IP
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
 
 LIBRARY = IPProviderModule
@@ -67,6 +68,7 @@
   EXTRA_LIBRARIES += -lnm
 endif
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/dynamic-library.mak
 
 tests:
--- pegasus-2.5/src/Providers/ManagedSystem/IP/testclient/Makefile.make_install	2005-05-12 11:32:05.000000000 -0400
+++ pegasus-2.5/src/Providers/ManagedSystem/IP/testclient/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -32,13 +32,16 @@
 
 DIR = Providers/ManagedSystem/IP/testclient
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include ../../libraries.mak
 
 PROGRAM = IPTestClient
 SOURCES = IPTestClient.cpp
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Providers/ManagedSystem/ComputerSystem/tests/Makefile.make_install	2005-05-12 10:54:38.000000000 -0400
+++ pegasus-2.5/src/Providers/ManagedSystem/ComputerSystem/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -41,6 +41,8 @@
 
 DIR = Providers/ManagedSystem/ComputerSystem/tests
 
+TEST=true
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
 
 PROGRAM = CSProviderTestClient
@@ -62,6 +64,8 @@
     pegconfig \
     pegcommon
 
+TEST=true
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/program.mak
 
 ifeq ($(OS),VMS)
--- pegasus-2.5/src/Providers/ManagedSystem/ComputerSystem/Makefile.make_install	2005-05-12 10:54:38.000000000 -0400
+++ pegasus-2.5/src/Providers/ManagedSystem/ComputerSystem/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -41,6 +41,7 @@
 
 DIR = Providers/ManagedSystem/ComputerSystem
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
 
 LIBRARY = ComputerSystemProvider
@@ -57,6 +58,7 @@
     pegclient \
     pegcommon
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/dynamic-library.mak
 
 tests:
--- pegasus-2.5/src/Providers/ManagedSystem/Processor/tests/Makefile.make_install	2005-05-12 10:54:42.000000000 -0400
+++ pegasus-2.5/src/Providers/ManagedSystem/Processor/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -42,6 +42,8 @@
 
 DIR = Providers/ManagedSystem/Processor/tests
 
+TEST=true
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
 
 PROGRAM = ProcessorProviderTestClient
@@ -62,6 +64,8 @@
     pegclient \
     pegcommon
 
+TEST=true
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/program.mak
 
 ifeq ($(OS),VMS)
--- pegasus-2.5/src/Providers/ManagedSystem/Processor/Makefile.make_install	2005-05-12 10:54:42.000000000 -0400
+++ pegasus-2.5/src/Providers/ManagedSystem/Processor/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -42,6 +42,7 @@
 
 DIR = Providers/ManagedSystem/Processor
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
 
 LIBRARY = ProcessorProviderModule
@@ -58,6 +59,7 @@
     pegclient \
     pegcommon
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/dynamic-library.mak
 
 general:
--- pegasus-2.5/src/Providers/ManagedSystem/OperatingSystem/tests/Makefile.make_install	2005-05-17 13:01:10.000000000 -0400
+++ pegasus-2.5/src/Providers/ManagedSystem/OperatingSystem/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -29,7 +29,11 @@
 # wbemexec test associated ManagedSystem
 
 ROOT = ../../../../..
+TEST=true
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
+TEST=true
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/test.mak
 
 HOSTNAME =
@@ -117,3 +121,4 @@
 
 prepend-license:
 
+install:
\ No newline at end of file
--- pegasus-2.5/src/Providers/ManagedSystem/OperatingSystem/tests/OSTestClient/Makefile.make_install	2005-05-12 11:32:07.000000000 -0400
+++ pegasus-2.5/src/Providers/ManagedSystem/OperatingSystem/tests/OSTestClient/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -32,6 +32,8 @@
 
 DIR = Providers/ManagedSystem/OperatingSystem/tests/OSTestClient
 
+TEST=true
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
 
 LIBRARIES = \
@@ -41,6 +43,8 @@
 PROGRAM = OSTestClient
 SOURCES = OSTestClient.cpp
 
+TEST=true
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Providers/ManagedSystem/OperatingSystem/Makefile.make_install	2005-05-12 10:54:41.000000000 -0400
+++ pegasus-2.5/src/Providers/ManagedSystem/OperatingSystem/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -40,6 +40,7 @@
 
 DIR = Providers/ManagedSystem/OperatingSystem
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
 
 LIBRARY = OSProvider
@@ -58,6 +59,7 @@
 	-lpegcommon \
 	-lpegprovider
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/dynamic-library.mak
 
 tests:
--- pegasus-2.5/src/Providers/ManagedSystem/NISServerService/tests/Makefile.make_install	2005-05-17 13:04:38.000000000 -0400
+++ pegasus-2.5/src/Providers/ManagedSystem/NISServerService/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -29,7 +29,11 @@
 # wbemexec tests for ManagedSystem NIS provider
 
 ROOT = ../../../../..
+TEST=true
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
+TEST=true
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/test.mak
 
 HOSTNAME =
--- pegasus-2.5/src/Providers/ManagedSystem/NISServerService/Makefile.make_install	2005-05-12 10:54:40.000000000 -0400
+++ pegasus-2.5/src/Providers/ManagedSystem/NISServerService/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -41,6 +41,7 @@
 
 DIR = Providers/ManagedSystem/NISServerService
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
 
 LIBRARY = NISProvider
@@ -65,6 +66,7 @@
 	-lpegcommon \
 	-lpegprovider
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/library.mak
 
 tests:
--- pegasus-2.5/src/Providers/ManagedSystem/NISServerService/testclient/Makefile.make_install	2005-05-12 11:32:06.000000000 -0400
+++ pegasus-2.5/src/Providers/ManagedSystem/NISServerService/testclient/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -32,12 +32,15 @@
 
 DIR = Providers/ManagedSystem/NISServerService/testclient
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/src/Clients/libraries.mak
 
 PROGRAM = NISTestClient
 SOURCES = NISTestClient.cpp
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Providers/ManagedSystem/NTPService/tests/Makefile.make_install	2005-05-17 13:02:42.000000000 -0400
+++ pegasus-2.5/src/Providers/ManagedSystem/NTPService/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -29,7 +29,11 @@
 # wbemexec tests for ManagedSystem NTP provider
 
 ROOT = ../../../../..
+TEST=true
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
+TEST=true
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/test.mak
 
  HOSTNAME =
--- pegasus-2.5/src/Providers/ManagedSystem/NTPService/Makefile.make_install	2005-05-12 10:54:40.000000000 -0400
+++ pegasus-2.5/src/Providers/ManagedSystem/NTPService/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -38,6 +38,7 @@
 
 DIR = Providers/ManagedSystem/NTPService
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
 
 LIBRARY = NTPProvider
@@ -71,6 +72,7 @@
 	-lpegprovider \
 	-lNTPProviderSecurity
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/dynamic-library.mak
 
 tests:
--- pegasus-2.5/src/Providers/ManagedSystem/NTPService/testclient/Makefile.make_install	2005-05-12 11:32:06.000000000 -0400
+++ pegasus-2.5/src/Providers/ManagedSystem/NTPService/testclient/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -32,12 +32,15 @@
 
 DIR = Providers/ManagedSystem/NTPService/testclient
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include ../../libraries.mak
 
 PROGRAM = NTPTestClient
 SOURCES = NTPTestClient.cpp
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Providers/ManagedSystem/Process/tests/Makefile.make_install	2005-05-12 10:54:41.000000000 -0400
+++ pegasus-2.5/src/Providers/ManagedSystem/Process/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -42,6 +42,8 @@
 
 DIR = Providers/ManagedSystem/Process/tests
 
+TEST=true
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
 
 PROGRAM = ProcessProviderTestClient
@@ -62,6 +64,8 @@
     pegclient \
     pegcommon
 
+TEST=true
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/program.mak
 
 ifeq ($(OS),VMS)
--- pegasus-2.5/src/Providers/ManagedSystem/Process/Makefile.make_install	2005-05-12 10:54:41.000000000 -0400
+++ pegasus-2.5/src/Providers/ManagedSystem/Process/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -42,6 +42,7 @@
 
 DIR = Providers/ManagedSystem/Process
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
 
 LIBRARY = ProcessProvider
@@ -59,6 +60,7 @@
     pegclient \
     pegcommon
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/dynamic-library.mak
 
 general:
--- pegasus-2.5/src/Providers/Makefile.make_install	2005-05-12 11:32:04.000000000 -0400
+++ pegasus-2.5/src/Providers/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,7 +30,7 @@
 # This makefile simply recurses all of the toplevel provider directories
 
 ROOT = ../..
-
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
 
 #Directories to recurse
@@ -40,11 +40,11 @@
     sample \
     TestProviders \
     IndicationConsumer
-	
-	
+
 ifdef PEGASUS_ENABLE_SLP
 DIRS += \
     slp
 endif
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/recurse.mak
--- pegasus-2.5/src/Providers/linux/load/Makefile.make_install	2005-05-12 10:54:51.000000000 -0400
+++ pegasus-2.5/src/Providers/linux/load/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -34,7 +34,9 @@
 # Makefile loads the Linux_CDROMDrive provider
 
 ROOT = ../../../..
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/configschema.mak
 
 MOF_PATH = .
--- pegasus-2.5/src/Providers/linux/Interrupt/Makefile.make_install	2005-05-12 10:54:44.000000000 -0400
+++ pegasus-2.5/src/Providers/linux/Interrupt/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -46,6 +46,7 @@
 
 DIR = Providers/linux/Interrupt
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
 
 LIBRARY = LinuxInterruptProvider
@@ -71,6 +72,7 @@
 	-lDeviceLocator \
 	-lFileReader
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/library.mak
 
 tests:
--- pegasus-2.5/src/Providers/linux/CDROMDrive/Makefile.make_install	2005-05-12 10:54:43.000000000 -0400
+++ pegasus-2.5/src/Providers/linux/CDROMDrive/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -44,6 +44,7 @@
 
 DIR = Providers/linux/CDROMDrive
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
 
 LIBRARY = LinuxCDROMDriveProvider
@@ -69,6 +70,7 @@
 	-lDeviceLocator \
 	-lFileReader
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/library.mak
 
 tests:
--- pegasus-2.5/src/Providers/linux/NetworkAdapter/Makefile.make_install	2005-05-12 10:54:45.000000000 -0400
+++ pegasus-2.5/src/Providers/linux/NetworkAdapter/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -45,6 +45,7 @@
 
 DIR = Providers/linux/NetworkAdapter
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
 
 LIBRARY = LinuxNetworkAdapterProvider
@@ -68,6 +69,7 @@
 	-lNetworkAdapterData \
 	-lDeviceLocator
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/library.mak
 
 tests:
--- pegasus-2.5/src/Providers/linux/SoftwareElement/Makefile.make_install	2005-05-12 10:54:50.000000000 -0400
+++ pegasus-2.5/src/Providers/linux/SoftwareElement/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -45,6 +45,7 @@
 
 DIR = Providers/linux/SoftwareElement
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
 
 LIBRARY = LinuxSoftwareElementProvider
@@ -67,6 +68,7 @@
 	-lpegprovider \
 	-lPackageManagerData
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/library.mak
 
 tests:
--- pegasus-2.5/src/Providers/linux/Makefile.make_install	2005-05-12 10:54:44.000000000 -0400
+++ pegasus-2.5/src/Providers/linux/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -40,6 +40,7 @@
 
 ROOT = ../../..
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
 
 DIRS =  ProviderSupport \
@@ -55,5 +56,6 @@
 	PCIController \
 	CDROMDrive
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/recurse.mak
 
--- pegasus-2.5/src/Providers/linux/DiskDrive/Makefile.make_install	2005-05-12 10:54:43.000000000 -0400
+++ pegasus-2.5/src/Providers/linux/DiskDrive/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -45,6 +45,7 @@
 
 DIR = Providers/linux/DiskDrive
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
 
 LIBRARY = LinuxDiskDriveProvider
@@ -70,6 +71,7 @@
 	-lDeviceLocator \
 	-lFileReader
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/library.mak
 
 tests:
--- pegasus-2.5/src/Providers/linux/Processor/Makefile.make_install	2005-05-12 10:54:46.000000000 -0400
+++ pegasus-2.5/src/Providers/linux/Processor/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -45,6 +45,7 @@
 
 DIR = Providers/linux/Processor
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
 
 LIBRARY = LinuxProcessorProvider
@@ -70,6 +71,7 @@
 	-lDeviceLocator \
 	-lFileReader
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/library.mak
 
 tests:
--- pegasus-2.5/src/Providers/linux/IOPort/Makefile.make_install	2005-05-12 10:54:43.000000000 -0400
+++ pegasus-2.5/src/Providers/linux/IOPort/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -45,6 +45,7 @@
 
 DIR = Providers/linux/IOPort
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
 
 LIBRARY = LinuxIOPortProvider
@@ -66,6 +67,7 @@
 	-lpegprovider \
 	-lDeviceLocator
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/library.mak
 
 tests:
--- pegasus-2.5/src/Providers/linux/ProviderData/PackageManager/Makefile.make_install	2005-05-12 10:54:48.000000000 -0400
+++ pegasus-2.5/src/Providers/linux/ProviderData/PackageManager/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -47,6 +47,7 @@
 
 DIR = Providers/linux/ProviderData/PackageManager
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
 
 EXTRA_INCLUDES = -I.. -I$(PROVIDERINCLUDE_ROOT)
@@ -56,5 +57,6 @@
 SOURCES = DebianPackageManagerData.cpp \
 	  DebianPackageInformation.cpp
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/library.mak
 
--- pegasus-2.5/src/Providers/linux/ProviderData/Interrupt/Makefile.make_install	2005-05-12 10:54:47.000000000 -0400
+++ pegasus-2.5/src/Providers/linux/ProviderData/Interrupt/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -47,6 +47,7 @@
 
 DIR = Providers/linux/ProviderData/Interrupt
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
 
 EXTRA_INCLUDES = -I.. -I$(PROVIDERINCLUDE_ROOT) \
@@ -61,5 +62,6 @@
 DYNAMIC_LIBRARIES = \
 	-lDeviceLocator
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/library.mak
 
--- pegasus-2.5/src/Providers/linux/ProviderData/CDROMDrive/Makefile.make_install	2005-05-12 10:54:46.000000000 -0400
+++ pegasus-2.5/src/Providers/linux/ProviderData/CDROMDrive/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -47,6 +47,7 @@
 
 DIR = Providers/linux/ProviderData/CDROMDrive
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
 
 EXTRA_INCLUDES = -I.. -I$(PROVIDERINCLUDE_ROOT) \
@@ -61,5 +62,6 @@
 DYNAMIC_LIBRARIES = \
 	-lDeviceLocator
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/library.mak
 
--- pegasus-2.5/src/Providers/linux/ProviderData/NetworkAdapter/Makefile.make_install	2005-05-12 10:54:48.000000000 -0400
+++ pegasus-2.5/src/Providers/linux/ProviderData/NetworkAdapter/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -47,6 +47,7 @@
 
 DIR = Providers/linux/ProviderData/NetworkAdapter
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
 
 EXTRA_INCLUDES = -I.. -I$(PROVIDERINCLUDE_ROOT) \
@@ -58,5 +59,6 @@
 SOURCES = NetworkAdapterData.cpp \
 	EthernetAdapterData.cpp
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/library.mak
 
--- pegasus-2.5/src/Providers/linux/ProviderData/Makefile.make_install	2005-05-12 10:54:47.000000000 -0400
+++ pegasus-2.5/src/Providers/linux/ProviderData/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -41,6 +41,7 @@
 
 ROOT = ../../../..
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
 
 #Directories to recurse
@@ -52,5 +53,6 @@
 	Interrupt \
 	Controller
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/recurse.mak
 
--- pegasus-2.5/src/Providers/linux/ProviderData/DiskDrive/Makefile.make_install	2005-05-12 10:54:47.000000000 -0400
+++ pegasus-2.5/src/Providers/linux/ProviderData/DiskDrive/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -47,6 +47,7 @@
 
 DIR = Providers/linux/ProviderData/DiskDrive
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
 
 EXTRA_INCLUDES = -I.. -I$(PROVIDERINCLUDE_ROOT) \
@@ -62,5 +63,6 @@
 DYNAMIC_LIBRARIES = \
 	-lDeviceLocator
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/library.mak
 
--- pegasus-2.5/src/Providers/linux/ProviderData/Processor/Makefile.make_install	2005-05-12 10:54:48.000000000 -0400
+++ pegasus-2.5/src/Providers/linux/ProviderData/Processor/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -47,6 +47,7 @@
 
 DIR = Providers/linux/ProviderData/Processor
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
 
 EXTRA_INCLUDES = -I.. -I$(PROVIDERINCLUDE_ROOT) \
@@ -62,4 +63,5 @@
 DYNAMIC_LIBRARIES = \
 	-lDeviceLocator
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/library.mak
--- pegasus-2.5/src/Providers/linux/ProviderData/Controller/Makefile.make_install	2005-05-12 10:54:46.000000000 -0400
+++ pegasus-2.5/src/Providers/linux/ProviderData/Controller/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -47,6 +47,7 @@
 
 DIR = Providers/linux/ProviderData/Controller
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
 
 EXTRA_INCLUDES = -I.. -I$(PROVIDERINCLUDE_ROOT) \
@@ -56,5 +57,6 @@
 
 SOURCES = PCIControllerData.cpp
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/library.mak
 
--- pegasus-2.5/src/Providers/linux/PCIController/Makefile.make_install	2005-05-12 10:54:45.000000000 -0400
+++ pegasus-2.5/src/Providers/linux/PCIController/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -46,6 +46,7 @@
 
 DIR = Providers/linux/PCIController
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
 
 LIBRARY = LinuxPCIControllerProvider
@@ -72,6 +73,7 @@
 	-lDeviceLocator \
 	-lFileReader
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/library.mak
 
 tests:
--- pegasus-2.5/src/Providers/linux/OperatingSystem/Makefile.make_install	2005-05-12 10:54:45.000000000 -0400
+++ pegasus-2.5/src/Providers/linux/OperatingSystem/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -44,6 +44,7 @@
 
 DIR = Providers/linux/OperatingSystem
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
 
 LIBRARY = LinuxOperatingSystemProvider
@@ -64,6 +65,7 @@
 	-lpegcommon \
 	-lpegprovider
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/library.mak
 
 tests:
--- pegasus-2.5/src/Providers/linux/ProviderSupport/DeviceLocator/tests/Makefile.make_install	2005-05-12 10:54:49.000000000 -0400
+++ pegasus-2.5/src/Providers/linux/ProviderSupport/DeviceLocator/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -39,7 +39,11 @@
 ROOT = ../../../../../..
 DIR = Providers/linux/ProviderSupport/DeviceLocator/tests
 PEGASUS_DEBUG = 1
+TEST=true
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
+TEST=true
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include libraries.mak
 
 PROVIDERINCLUDE_ROOT = $(ROOT)/src/Providers/linux/Include
@@ -50,6 +54,8 @@
 
 SOURCES = BusScanners.cpp
 
+TEST=true
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/program.mak
 
 tests:	
--- pegasus-2.5/src/Providers/linux/ProviderSupport/DeviceLocator/Makefile.make_install	2005-05-12 10:54:49.000000000 -0400
+++ pegasus-2.5/src/Providers/linux/ProviderSupport/DeviceLocator/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -50,6 +50,7 @@
 
 DIR = Providers/linux/ProviderSupport/DeviceLocator
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
 
 EXTRA_INCLUDES = -I.. -I$(PROVIDERSUPPORT_ROOT)/FileReader -I$(PROVIDERINCLUDE_ROOT)
@@ -79,4 +80,5 @@
 DYNAMIC_LIBRARIES = \
 	-lFileReader
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/library.mak
--- pegasus-2.5/src/Providers/linux/ProviderSupport/FileReader/tests/Makefile.make_install	2005-05-12 10:54:50.000000000 -0400
+++ pegasus-2.5/src/Providers/linux/ProviderSupport/FileReader/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -40,7 +40,11 @@
 ROOT = ../../../../../..
 DIR = Providers/linux/ProviderSupport/FileReader/tests
 PEGASUS_DEBUG = 1
+TEST=true
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
+TEST=true
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include libraries.mak
 
 EXTRA_INCLUDES = $(SYS_INCLUDES) $(ACE_INCLUDES) -I..
@@ -49,6 +53,8 @@
 
 SOURCES = ScannerTests.cpp
 
+TEST=true
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/program.mak
 
 tests:	
--- pegasus-2.5/src/Providers/linux/ProviderSupport/FileReader/Makefile.make_install	2005-05-12 10:54:49.000000000 -0400
+++ pegasus-2.5/src/Providers/linux/ProviderSupport/FileReader/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -48,6 +48,7 @@
 
 #LOCAL_DEFINES = -ggdb
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
 
 EXTRA_INCLUDES = -I..
@@ -58,5 +59,6 @@
 	StreamScanner.cpp \
 	ExecScanner.cpp
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/library.mak
 
--- pegasus-2.5/src/Providers/linux/ProviderSupport/Makefile.make_install	2005-05-12 10:54:50.000000000 -0400
+++ pegasus-2.5/src/Providers/linux/ProviderSupport/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -43,6 +43,7 @@
 
 ROOT = ../../../..
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
 
 #Directories to recurse
@@ -51,4 +52,5 @@
        DeviceLocator/tests \
        FileReader/tests 
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/recurse.mak
--- pegasus-2.5/src/Providers/linux/IPRoute/Makefile.make_install	2005-05-12 10:54:44.000000000 -0400
+++ pegasus-2.5/src/Providers/linux/IPRoute/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -45,6 +45,7 @@
 
 DIR = Providers/linux/IPRoute
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
 
 LIBRARY = LinuxIPRouteProvider
@@ -66,6 +67,7 @@
 	-lpegprovider \
 	-lDeviceLocator
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/library.mak
 
 tests:
--- pegasus-2.5/src/Providers/generic/Makefile.make_install	2005-05-12 11:41:16.000000000 -0400
+++ pegasus-2.5/src/Providers/generic/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,6 +30,7 @@
 
 ROOT = ../../..
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/config.mak
 
 # removed _NamespaceProvider
@@ -37,4 +38,5 @@
 DIRS = \
 	OperatingSystemProvider
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/recurse.mak
--- pegasus-2.5/src/Providers/generic/OperatingSystemProvider/Makefile.make_install	2005-05-12 11:41:16.000000000 -0400
+++ pegasus-2.5/src/Providers/generic/OperatingSystemProvider/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -26,6 +26,7 @@
 #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #//
 #//==============================================================================
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(PEGASUS_ROOT)/mak/config.mak
 
 DIR = Providers/generic/OperatingSystemProvider
@@ -41,4 +42,5 @@
 	OperatingSystemProvider.cpp \
 	OperatingSystemProviderMain.cpp
 
+INSTALL_LIB=$(PEGASUS_ARCH_LIB_DIR)/Pegasus/providers
 include $(ROOT)/mak/library.mak
--- pegasus-2.5/src/Providers/TestProviders/InstanceProvider/Makefile.make_install	2005-05-12 11:41:12.000000000 -0400
+++ pegasus-2.5/src/Providers/TestProviders/InstanceProvider/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,6 +30,7 @@
 
 DIR = Providers/TestProviders/InstanceProvider
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 LIBRARY = TestInstanceProvider
@@ -42,6 +43,7 @@
 	TestInstanceProviderMain.cpp \
 	TestInstanceProvider.cpp
 
+TEST=true
 include $(ROOT)/mak/library.mak
 
 tests:
--- pegasus-2.5/src/Providers/TestProviders/InstanceProvider/testclient/Makefile.make_install	2005-05-12 11:41:13.000000000 -0400
+++ pegasus-2.5/src/Providers/TestProviders/InstanceProvider/testclient/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -32,6 +32,7 @@
 
 DIR = Providers/TestProviders/InstanceProvider/testclient
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 #LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -46,6 +47,7 @@
 
 SOURCES = TestInstanceProviderClient.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Providers/TestProviders/MethodTestProvider/Makefile.make_install	2005-05-12 11:41:14.000000000 -0400
+++ pegasus-2.5/src/Providers/TestProviders/MethodTestProvider/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,6 +30,7 @@
 
 DIR = Providers/TestProviders/MethodTestProvider
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 LIBRARY = MethodTestProvider
@@ -43,4 +44,5 @@
     MethodTestProviderMain.cpp \
     MethodTestProvider.cpp
 
+TEST=true
 include $(ROOT)/mak/dynamic-library.mak
--- pegasus-2.5/src/Providers/TestProviders/MethodTestProvider/testclient/Makefile.make_install	2005-05-12 11:41:14.000000000 -0400
+++ pegasus-2.5/src/Providers/TestProviders/MethodTestProvider/testclient/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -32,6 +32,7 @@
 
 DIR = Providers/TestProviders/MethodTestProvider/testclient
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -46,6 +47,7 @@
 
 SOURCES = TestMethodTestProvider.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Providers/TestProviders/AssociationTests/Tests/Makefile.make_install	2005-05-12 11:32:09.000000000 -0400
+++ pegasus-2.5/src/Providers/TestProviders/AssociationTests/Tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -63,6 +63,7 @@
 
 DIR = Providers/TestProviders/AssociationTests/Tests
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -79,6 +80,7 @@
 	pegcommon \
 	pegclient
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 general:
--- pegasus-2.5/src/Providers/TestProviders/AssociationTests/Makefile.make_install	2005-03-07 20:08:23.000000000 -0500
+++ pegasus-2.5/src/Providers/TestProviders/AssociationTests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -2,6 +2,7 @@
 
 DIR = Providers/AssociationTest/AssociationTestProvider
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 LIBRARY = AssociationTestProvider
@@ -14,6 +15,7 @@
 	AssociationTestProviderMain.cpp \
 	AssociationTestProvider.cpp
 
+TEST=true
 include $(ROOT)/mak/library.mak
 
 tests:
--- pegasus-2.5/src/Providers/TestProviders/CMPI/TestFail_1/tests/Makefile.make_install	2005-07-01 17:54:24.000000000 -0400
+++ pegasus-2.5/src/Providers/TestProviders/CMPI/TestFail_1/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -27,6 +27,7 @@
 #//
 #//==============================================================================
 ROOT = ../../../../../../
+TEST=true
 include $(ROOT)/mak/config.mak
 
 LIBRARIES = \
@@ -41,7 +42,9 @@
 
 PROGRAM = TestCMPI_Fail_1
 
+TEST=true
 include $(ROOT)/mak/program.mak
+TEST=true
 include $(ROOT)/test/config.mak
 
 tests:
--- pegasus-2.5/src/Providers/TestProviders/CMPI/TestFail_1/Makefile.make_install	2005-06-24 15:57:38.000000000 -0400
+++ pegasus-2.5/src/Providers/TestProviders/CMPI/TestFail_1/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -32,6 +32,7 @@
 
 LOCAL_DEFINES = -DPEGASUS_USE_EXPERIMENTAL
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 ifeq ($(PEGASUS_PLATFORM),ZOS_ZSERIES_IBM)
@@ -46,6 +47,7 @@
 SOURCES = \
 	cmpiTestFail_1Provider.c
 
+TEST=true
 include $(ROOT)/mak/library.mak
 
 tests:
--- pegasus-2.5/src/Providers/TestProviders/CMPI/TestFail_3/tests/Makefile.make_install	2005-07-01 17:54:25.000000000 -0400
+++ pegasus-2.5/src/Providers/TestProviders/CMPI/TestFail_3/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -27,6 +27,7 @@
 #//
 #//==============================================================================
 ROOT = ../../../../../../
+TEST=true
 include $(ROOT)/mak/config.mak
 
 LIBRARIES = \
@@ -41,7 +42,9 @@
 
 PROGRAM = TestCMPI_Fail_3
 
+TEST=true
 include $(ROOT)/mak/program.mak
+TEST=true
 include $(ROOT)/test/config.mak
 
 tests:
--- pegasus-2.5/src/Providers/TestProviders/CMPI/TestFail_3/Makefile.make_install	2005-06-24 15:57:40.000000000 -0400
+++ pegasus-2.5/src/Providers/TestProviders/CMPI/TestFail_3/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -32,6 +32,7 @@
 
 LOCAL_DEFINES = -DPEGASUS_USE_EXPERIMENTAL
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 ifeq ($(PEGASUS_PLATFORM),ZOS_ZSERIES_IBM)
@@ -46,6 +47,7 @@
 SOURCES = \
 	cmpiTestFail_3Provider.c
 
+TEST=true
 include $(ROOT)/mak/library.mak
 
 tests:
--- pegasus-2.5/src/Providers/TestProviders/CMPI/TestMethod/tests/Makefile.make_install	2005-07-01 17:54:26.000000000 -0400
+++ pegasus-2.5/src/Providers/TestProviders/CMPI/TestMethod/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -27,6 +27,7 @@
 #//
 #//==============================================================================
 ROOT = ../../../../../../
+TEST=true
 include $(ROOT)/mak/config.mak
 
 LIBRARIES = \
@@ -44,7 +45,9 @@
 
 PROGRAM = TestCMPIMethod
 
+TEST=true
 include $(ROOT)/mak/program.mak
+TEST=true
 include $(ROOT)/test/config.mak
 
 LOGFILES = TestCMPIMethod
--- pegasus-2.5/src/Providers/TestProviders/CMPI/TestMethod/Makefile.make_install	2005-07-22 16:51:42.000000000 -0400
+++ pegasus-2.5/src/Providers/TestProviders/CMPI/TestMethod/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -31,6 +31,7 @@
 DIR = Providers/TestProviders/CMPI/TestMethod
 
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 ifeq ($(PEGASUS_PLATFORM),ZOS_ZSERIES_IBM)
@@ -47,6 +48,7 @@
 SOURCES = \
 	cmpiTestMethodProvider.c
 
+TEST=true
 include $(ROOT)/mak/library.mak
 
 tests:
--- pegasus-2.5/src/Providers/TestProviders/CMPI/TestIndications/tests/Makefile.make_install	2005-05-12 11:41:09.000000000 -0400
+++ pegasus-2.5/src/Providers/TestProviders/CMPI/TestIndications/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -29,6 +29,7 @@
 ROOT = ../../../../../../
 DIR = Providers/TestProviders/CMPI/TestIndications/tests
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 LIBRARIES = \
@@ -48,7 +49,9 @@
 
 SOURCES = TestCMPIIndicationSubscription.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
+TEST=true
 include $(ROOT)/test/config.mak
 
 tests:
--- pegasus-2.5/src/Providers/TestProviders/CMPI/TestIndications/Makefile.make_install	2005-07-22 16:49:40.000000000 -0400
+++ pegasus-2.5/src/Providers/TestProviders/CMPI/TestIndications/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -31,6 +31,7 @@
 DIR = Providers/TestProviders/CMPI/TestIndications
 
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 LOCAL_DEFINES = -DPEGASUS_ROOT=\"$(PEGASUS_ROOT)\"
@@ -47,6 +48,7 @@
 SOURCES = \
 	cmpiTestIndicationProvider.c
 
+TEST=true
 include $(ROOT)/mak/library.mak
 
 tests:
--- pegasus-2.5/src/Providers/TestProviders/CMPI/TestFail_2/tests/Makefile.make_install	2005-07-01 17:54:25.000000000 -0400
+++ pegasus-2.5/src/Providers/TestProviders/CMPI/TestFail_2/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -27,6 +27,7 @@
 #//
 #//==============================================================================
 ROOT = ../../../../../../
+TEST=true
 include $(ROOT)/mak/config.mak
 
 LIBRARIES = \
@@ -41,7 +42,9 @@
 
 PROGRAM = TestCMPI_Fail_2
 
+TEST=true
 include $(ROOT)/mak/program.mak
+TEST=true
 include $(ROOT)/test/config.mak
 
 tests:
--- pegasus-2.5/src/Providers/TestProviders/CMPI/TestFail_2/Makefile.make_install	2005-06-24 15:57:39.000000000 -0400
+++ pegasus-2.5/src/Providers/TestProviders/CMPI/TestFail_2/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -32,6 +32,7 @@
 
 LOCAL_DEFINES = -DPEGASUS_USE_EXPERIMENTAL
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 ifeq ($(PEGASUS_PLATFORM),ZOS_ZSERIES_IBM)
@@ -46,6 +47,7 @@
 SOURCES = \
 	cmpiTestFail_2Provider.c
 
+TEST=true
 include $(ROOT)/mak/library.mak
 
 tests:
--- pegasus-2.5/src/Providers/TestProviders/CMPI/TestInstance/tests/Makefile.make_install	2005-07-01 17:54:26.000000000 -0400
+++ pegasus-2.5/src/Providers/TestProviders/CMPI/TestInstance/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,6 +28,7 @@
 #//==============================================================================
 ROOT = ../../../../../../
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 LIBRARIES = \
@@ -47,7 +48,9 @@
 
 PROGRAM = TestCMPIInstanceExecQuery
 
+TEST=true
 include $(ROOT)/mak/program.mak
+TEST=true
 include $(ROOT)/test/config.mak
 
 LOGFILES = TestCMPIInstance
--- pegasus-2.5/src/Providers/TestProviders/CMPI/TestInstance/Makefile.make_install	2005-07-22 16:54:22.000000000 -0400
+++ pegasus-2.5/src/Providers/TestProviders/CMPI/TestInstance/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,6 +30,7 @@
 
 DIR = Providers/TestProviders/CMPI/TestInstance
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 LOCAL_DEFINES = -DPEGASUS_ROOT=\"$(PEGASUS_ROOT)\"
@@ -46,6 +47,7 @@
 SOURCES = \
 	cmpiTestInstanceProvider.c
 
+TEST=true
 include $(ROOT)/mak/library.mak
 
 tests:
--- pegasus-2.5/src/Providers/TestProviders/CMPI/TestProviderThreaded/tests/Makefile.make_install	2005-08-04 15:11:53.000000000 -0400
+++ pegasus-2.5/src/Providers/TestProviders/CMPI/TestProviderThreaded/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -27,6 +27,7 @@
 #//
 #//==============================================================================
 ROOT = ../../../../../../
+TEST=true
 include $(ROOT)/mak/config.mak
 
 LIBRARIES = \
@@ -41,7 +42,9 @@
 
 PROGRAM = TestCMPIThreadProvider
 
+TEST=true
 include $(ROOT)/mak/program.mak
+TEST=true
 include $(ROOT)/test/config.mak
 
 tests:
--- pegasus-2.5/src/Providers/TestProviders/CMPI/TestProviderThreaded/Makefile.make_install	2005-08-04 15:11:53.000000000 -0400
+++ pegasus-2.5/src/Providers/TestProviders/CMPI/TestProviderThreaded/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -31,6 +31,7 @@
 DIR = Providers/TestProviders/CMPI/TestProviderThreaded
 
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 ifeq ($(PEGASUS_PLATFORM),ZOS_ZSERIES_IBM)
@@ -45,6 +46,7 @@
 SOURCES = \
 	cmpiTestCMPIThreadProvider.c
 
+TEST=true
 include $(ROOT)/mak/library.mak
 
 tests:
--- pegasus-2.5/src/Providers/TestProviders/CMPI/TestFail_4/tests/Makefile.make_install	2005-07-29 14:54:03.000000000 -0400
+++ pegasus-2.5/src/Providers/TestProviders/CMPI/TestFail_4/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,9 +28,13 @@
 #//==============================================================================
 
 ROOT = ../../../../../../
+TEST=true
 include $(ROOT)/mak/config.mak
+
 include $(ROOT)/test/config.mak
 
 XMLSCRIPTS = EnumerateInstance_Fail_4
 
 include $(ROOT)/test/configend.mak
+
+install:
--- pegasus-2.5/src/Providers/TestProviders/CMPI/TestFail_4/Makefile.make_install	2005-07-29 14:54:02.000000000 -0400
+++ pegasus-2.5/src/Providers/TestProviders/CMPI/TestFail_4/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -32,6 +32,7 @@
 
 LOCAL_DEFINES = -DPEGASUS_USE_EXPERIMENTAL
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 ifeq ($(PEGASUS_PLATFORM),ZOS_ZSERIES_IBM)
@@ -46,6 +47,7 @@
 SOURCES = \
 	cmpiTestFail_4Provider.c
 
+TEST=true
 include $(ROOT)/mak/library.mak
 
 tests:
--- pegasus-2.5/src/Providers/TestProviders/FamilyProvider/tests/Makefile.make_install	2005-05-12 11:41:12.000000000 -0400
+++ pegasus-2.5/src/Providers/TestProviders/FamilyProvider/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -29,7 +29,9 @@
 # Test the Family Provider using the script toosls
 
 ROOT = $(PEGASUS_ROOT)
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/mak/configschema.mak
 SHH = @
 
@@ -199,4 +201,6 @@
 
 clean:
 
+install:
+
 # END_OF_FILE
--- pegasus-2.5/src/Providers/TestProviders/FamilyProvider/Makefile.make_install	2005-05-12 11:41:11.000000000 -0400
+++ pegasus-2.5/src/Providers/TestProviders/FamilyProvider/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,6 +30,7 @@
 
 DIR = Providers/TestProviders/FamilyProvider
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 LIBRARY = FamilyProvider
@@ -43,6 +44,7 @@
 	FamilyProviderMain.cpp \
 	FamilyProvider.cpp
 
+TEST=true
 include $(ROOT)/mak/dynamic-library.mak
 
 tests:
--- pegasus-2.5/src/Providers/TestProviders/Makefile.make_install	2005-08-04 15:11:53.000000000 -0400
+++ pegasus-2.5/src/Providers/TestProviders/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,7 +30,8 @@
 # This makefile simply recurses all of the toplevel provider directories
 
 ROOT = ../../..
-
+TEST = true
+TEST=true
 include $(ROOT)/mak/config.mak
 
 #Directories to recurse
@@ -78,4 +79,5 @@
 	CMPI/TestInstance/tests
 endif
 endif
+TEST=true
 include $(ROOT)/mak/recurse.mak
--- pegasus-2.5/src/Providers/TestProviders/AlertIndicationProvider/Makefile.make_install	2005-05-12 11:32:08.000000000 -0400
+++ pegasus-2.5/src/Providers/TestProviders/AlertIndicationProvider/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -26,6 +26,7 @@
 #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #//
 #//==============================================================================
+TEST=true
 include $(PEGASUS_ROOT)/mak/config.mak
 
 DIR = Providers/TestProviders/AlertIndicationProvider
@@ -42,4 +43,5 @@
 	AlertIndicationProviderMain.cpp \
 	AlertIndicationProvider.cpp
 
+TEST=true
 include $(PEGASUS_ROOT)/mak/dynamic-library.mak
--- pegasus-2.5/src/Providers/TestProviders/ProcessIndicationProvider/Makefile.make_install	2005-05-12 11:41:15.000000000 -0400
+++ pegasus-2.5/src/Providers/TestProviders/ProcessIndicationProvider/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -26,6 +26,7 @@
 #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #//
 #//==============================================================================
+TEST=true
 include $(PEGASUS_ROOT)/mak/config.mak
 
 DIR = Providers/TestProviders/ProcessIndicationProvider
@@ -41,4 +42,5 @@
 	ProcessIndicationProviderMain.cpp \
 	ProcessIndicationProvider.cpp
 
+TEST=true
 include $(PEGASUS_ROOT)/mak/dynamic-library.mak
--- pegasus-2.5/src/Providers/TestProviders/DynamicIndicationProvider/Makefile.make_install	2005-05-12 11:41:11.000000000 -0400
+++ pegasus-2.5/src/Providers/TestProviders/DynamicIndicationProvider/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,6 +30,7 @@
 
 DIR = Providers/TestProviders/DynamicIndicationProvider
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 LOCAL_DEFINES = -DPEGASUS_CONSUMER_INTERNAL -DPEGASUS_INTERNALONLY 
@@ -44,4 +45,5 @@
    DynamicIndicationProviderMain.cpp \
    DynamicIndicationProvider.cpp
 
+TEST=true
 include $(ROOT)/mak/library.mak
--- pegasus-2.5/src/Providers/TestProviders/ClientProvider/Makefile.make_install	2005-05-12 11:41:10.000000000 -0400
+++ pegasus-2.5/src/Providers/TestProviders/ClientProvider/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,6 +30,7 @@
 
 DIR = Providers/TestProviders/ClientProvider
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 LIBRARY = TestClientProvider
@@ -43,6 +44,7 @@
    ClientProviderMain.cpp \
    ClientProvider.cpp
 
+TEST=true
 include $(ROOT)/mak/dynamic-library.mak
 
 tests:
--- pegasus-2.5/src/Providers/TestProviders/ClientProvider/Load/Makefile.make_install	2005-05-12 11:41:10.000000000 -0400
+++ pegasus-2.5/src/Providers/TestProviders/ClientProvider/Load/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -34,7 +34,9 @@
 #       remove function.
 
 ROOT = $(PEGASUS_ROOT)
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/mak/configschema.mak
 
 # The following variable determine the version of the Schema to
--- pegasus-2.5/src/Providers/TestProviders/DefaultInstanceProvider/Makefile.make_install	2005-05-12 11:41:11.000000000 -0400
+++ pegasus-2.5/src/Providers/TestProviders/DefaultInstanceProvider/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,6 +30,7 @@
 
 DIR = Providers/TestProviders/DefaultInstanceProvider
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 LIBRARY = PG_DefaultInstanceProvider
@@ -45,6 +46,7 @@
    DefaultInstanceProvider.cpp \
    DefaultInstanceProviderMain.cpp
 
+TEST=true
 include $(ROOT)/mak/dynamic-library.mak
 
 tests:
--- pegasus-2.5/src/Providers/TestProviders/UserContextTestProvider/Makefile.make_install	2005-05-12 11:41:15.000000000 -0400
+++ pegasus-2.5/src/Providers/TestProviders/UserContextTestProvider/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,6 +30,7 @@
 
 DIR = Providers/TestProviders/UserContextTestProvider
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 LIBRARY = UserContextTestProvider
@@ -41,6 +42,7 @@
 SOURCES = \
    UserContextTestProvider.cpp
 
+TEST=true
 include $(ROOT)/mak/library.mak
 
 tests:
--- pegasus-2.5/src/Providers/TestProviders/UserContextTestProvider/testclient/Makefile.make_install	2005-05-12 11:41:15.000000000 -0400
+++ pegasus-2.5/src/Providers/TestProviders/UserContextTestProvider/testclient/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -32,6 +32,7 @@
 
 DIR = Providers/TestProviders/UserContextTestProvider/testclient
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -46,6 +47,7 @@
 
 SOURCES = TestUserContext.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Providers/TestProviders/PG_TestPropertyTypes/Makefile.make_install	2005-05-12 11:41:14.000000000 -0400
+++ pegasus-2.5/src/Providers/TestProviders/PG_TestPropertyTypes/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,6 +30,7 @@
 
 DIR = Providers/TestProviders/PG_TestPropertyTypes
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 LIBRARY = PG_TestPropertyTypes
@@ -42,6 +43,7 @@
 SOURCES = \
    PG_TestPropertyTypes.cpp
 
+TEST=true
 include $(ROOT)/mak/dynamic-library.mak
 
 tests:
--- pegasus-2.5/src/Providers/TestProviders/Load/Makefile.make_install	2005-07-29 14:54:03.000000000 -0400
+++ pegasus-2.5/src/Providers/TestProviders/Load/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -37,7 +37,9 @@
 #       making this probably implementation independent.
 
 ROOT = $(PEGASUS_ROOT)
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/mak/configschema.mak
 
 # Loads the sample MOF into a separate namespace.
--- pegasus-2.5/src/Providers/TestProviders/IndicationStressTestProvider/Makefile.make_install	2005-05-12 11:41:12.000000000 -0400
+++ pegasus-2.5/src/Providers/TestProviders/IndicationStressTestProvider/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,6 +30,7 @@
 
 DIR = Providers/TestProviders/IndicationStressTestProvider
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 LIBRARY = IndicationStressTestProvider
@@ -43,6 +44,7 @@
 	IndicationStressTestProviderMain.cpp \
 	IndicationStressTestProvider.cpp
 
+TEST=true
 include $(ROOT)/mak/library.mak
 
 tests:
--- pegasus-2.5/src/Providers/TestProviders/IndicationStressTestProvider/testclient/Makefile.make_install	2005-08-09 16:51:22.000000000 -0400
+++ pegasus-2.5/src/Providers/TestProviders/IndicationStressTestProvider/testclient/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,6 +30,7 @@
 
 DIR = Providers/TestProviders/IndicationStressTestProvider/testclient
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 PEGASUS_ZOS_PROGRAM_OBJECT = yes
@@ -51,6 +52,7 @@
 
 SOURCES = IndicationStressTest.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Providers/TestProviders/MCCA_TestAssocProvider/Makefile.make_install	2005-05-12 11:41:13.000000000 -0400
+++ pegasus-2.5/src/Providers/TestProviders/MCCA_TestAssocProvider/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,6 +30,7 @@
 
 DIR = Providers/TestProviders/MCCA_TestAssocProvider
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 LIBRARY = MCCATestAssocProvider
@@ -43,6 +44,7 @@
    MCCA_TestAssocProviderMain.cpp \
    MCCA_TestAssocProvider.cpp
 
+TEST=true
 include $(ROOT)/mak/dynamic-library.mak
 
 tests:
--- pegasus-2.5/src/Clients/cimprovider/tests/Makefile.make_install	2005-05-12 11:27:41.000000000 -0400
+++ pegasus-2.5/src/Clients/cimprovider/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,7 +30,9 @@
 
 DIR = Clients/cimprovider/tests
 
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/mak/test.mak
 
 RESULTFILE =  $(TMP_DIR)/result
@@ -110,3 +112,5 @@
 strip-license:
 
 prepend-license:
+
+install:
--- pegasus-2.5/src/Clients/tomof/Makefile.make_install	2005-05-12 11:27:46.000000000 -0400
+++ pegasus-2.5/src/Clients/tomof/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -27,7 +27,7 @@
 #//
 #//==============================================================================
 ROOT = $(PEGASUS_ROOT)
-
+PEGASUS_INSTALL=
 PROGRAM_NAME = tomof
 DIR = Clients/$(PROGRAM_NAME)
 include $(ROOT)/mak/config.mak
--- pegasus-2.5/src/Clients/g11ntest/Makefile.make_install	2005-05-12 11:27:42.000000000 -0400
+++ pegasus-2.5/src/Clients/g11ntest/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -29,7 +29,7 @@
 ROOT = $(PEGASUS_ROOT)
 
 PEGASUS_ZOS_PROGRAM_OBJECT = yes
-
+TEST=true
 DIR = Clients/g11ntest
 include $(ROOT)/mak/config.mak
 
--- pegasus-2.5/src/Clients/cimuser/tests/Makefile.make_install	2005-05-12 11:27:41.000000000 -0400
+++ pegasus-2.5/src/Clients/cimuser/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,7 +30,9 @@
 
 DIR = Clients/cimuser/tests
 
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/mak/test.mak
 
 RESULTFILE =  $(TMP_DIR)/result
--- pegasus-2.5/src/Clients/cimuser/Makefile.make_install	2005-05-12 11:27:41.000000000 -0400
+++ pegasus-2.5/src/Clients/cimuser/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -46,6 +46,8 @@
 
 SOURCES = CIMUserCommand.cpp
 
+INSTALL_BIN=sbin
+
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Clients/TestClient/Makefile.make_install	2005-05-12 11:27:37.000000000 -0400
+++ pegasus-2.5/src/Clients/TestClient/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -29,7 +29,7 @@
 ROOT = $(PEGASUS_ROOT)
 
 PEGASUS_ZOS_PROGRAM_OBJECT = yes
-
+TEST=true
 DIR = Clients/TestClient
 include $(ROOT)/mak/config.mak
 
--- pegasus-2.5/src/Clients/repupgrade/tests/Makefile.make_install	2005-05-12 11:27:45.000000000 -0400
+++ pegasus-2.5/src/Clients/repupgrade/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -37,6 +37,7 @@
 
 DIR = Clients/repupgrade/tests
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 LIBRARIES = \
@@ -49,7 +50,9 @@
 
 SOURCES = UpgradeTest.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
+TEST=true
 include $(ROOT)/mak/test.mak
 
 tests:
--- pegasus-2.5/src/Clients/repupgrade/Makefile.make_install	2005-05-12 11:27:44.000000000 -0400
+++ pegasus-2.5/src/Clients/repupgrade/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -29,7 +29,7 @@
 ROOT = ../../..
 
 PEGASUS_ZOS_PROGRAM_OBJECT = yes
-
+PEGASUS_INSTALL = 
 DIR = Clients/repupgrade
 
 include $(ROOT)/mak/config.mak
--- pegasus-2.5/src/Clients/repupgrade/SSPModules/SampleSSPModule/Makefile.make_install	2005-05-12 11:27:45.000000000 -0400
+++ pegasus-2.5/src/Clients/repupgrade/SSPModules/SampleSSPModule/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -29,7 +29,7 @@
 ROOT = ../../../../../
 
 DIR = Clients/repupgrade/SSPModules/SampleSSPModule
-
+TEST=true
 include $(ROOT)/mak/config.mak
 
 LOCAL_DEFINES = -DPEGASUS_CONFIG_INTERNAL -DPEGASUS_INTERNALONLY
@@ -49,5 +49,5 @@
 
 SOURCES = \
 	SampleSSPModule.cpp 
-
+TEST=true
 include $(ROOT)/mak/dynamic-library.mak
--- pegasus-2.5/src/Clients/TestCertClient/Makefile.make_install	2005-05-12 11:27:37.000000000 -0400
+++ pegasus-2.5/src/Clients/TestCertClient/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -29,7 +29,7 @@
 ROOT = $(PEGASUS_ROOT)
 
 PEGASUS_ZOS_PROGRAM_OBJECT = yes
-
+TEST=true
 DIR = Clients/TestCertClient
 include $(ROOT)/mak/config.mak
 
--- pegasus-2.5/src/Clients/CLITestClients/CreateInstance/Makefile.make_install	2005-05-12 11:27:33.000000000 -0400
+++ pegasus-2.5/src/Clients/CLITestClients/CreateInstance/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,7 +30,9 @@
 
 PROGRAM_NAME = CreateInstance
 DIR = Clients/CLITestClients/$(PROGRAM_NAME)
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../../libraries.mak
 
 EXTRA_INCLUDES = $(SYS_INCLUDES)
@@ -41,6 +43,7 @@
 
 SOURCES = $(PROGRAM_NAME).cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Clients/CLITestClients/EnumerateInstances/Makefile.make_install	2005-05-12 11:27:34.000000000 -0400
+++ pegasus-2.5/src/Clients/CLITestClients/EnumerateInstances/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,7 +30,9 @@
 
 PROGRAM_NAME = EnumerateInstances
 DIR = Clients/CLITestClients/$(PROGRAM_NAME)
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../../libraries.mak
 
 EXTRA_INCLUDES = $(SYS_INCLUDES)
@@ -41,6 +43,7 @@
 
 SOURCES = $(PROGRAM_NAME).cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Clients/CLITestClients/GetInstance/Makefile.make_install	2005-05-12 11:27:34.000000000 -0400
+++ pegasus-2.5/src/Clients/CLITestClients/GetInstance/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,7 +30,9 @@
 
 PROGRAM_NAME = GetInstance
 DIR = Clients/CLITestClients/$(PROGRAM_NAME)
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../../libraries.mak
 
 EXTRA_INCLUDES = $(SYS_INCLUDES)
@@ -41,6 +43,7 @@
 
 SOURCES = $(PROGRAM_NAME).cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Clients/CLITestClients/Makefile.make_install	2005-05-12 11:27:34.000000000 -0400
+++ pegasus-2.5/src/Clients/CLITestClients/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -27,7 +27,8 @@
 #//
 #//==============================================================================
 ROOT = $(PEGASUS_ROOT)
-
+TEST = true
+TEST=true
 include $(ROOT)/mak/config.mak
 
 DIRS = \
@@ -41,4 +42,5 @@
     
 
 
+TEST=true
 include $(ROOT)/mak/recurse.mak
--- pegasus-2.5/src/Clients/CLITestClients/EnumInstNames/Makefile.make_install	2005-05-12 11:27:33.000000000 -0400
+++ pegasus-2.5/src/Clients/CLITestClients/EnumInstNames/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,7 +30,9 @@
 
 PROGRAM_NAME = EnumInstNames
 DIR = Clients/CLITestClients/$(PROGRAM_NAME)
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../../libraries.mak
 
 EXTRA_INCLUDES = $(SYS_INCLUDES)
@@ -41,6 +43,7 @@
 
 SOURCES = $(PROGRAM_NAME).cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Clients/CLITestClients/CLI/Makefile.make_install	2005-05-12 11:27:32.000000000 -0400
+++ pegasus-2.5/src/Clients/CLITestClients/CLI/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -31,6 +31,7 @@
 PROGRAM_NAME = CLI
 
 DIR = Clients/CLITestClients/$(PROGRAM_NAME)
+TEST=true
 include $(ROOT)/mak/config.mak
 
 LIBRARIES = \
@@ -46,6 +47,7 @@
 
 SOURCES = $(PROGRAM_NAME).cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Clients/CLITestClients/CLI/doc/Makefile.make_install	2005-06-03 12:19:58.000000000 -0400
+++ pegasus-2.5/src/Clients/CLITestClients/CLI/doc/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -36,6 +36,7 @@
 # found in Linux/Unix environments including.
 # nroff and man2html
 #
+TEST=true
 include $(PEGASUS_ROOT)/mak/config.mak
 
 GROFFOPTIONS=man
--- pegasus-2.5/src/Clients/CLITestClients/EnumerateInstanceNames/Makefile.make_install	2005-05-12 11:27:34.000000000 -0400
+++ pegasus-2.5/src/Clients/CLITestClients/EnumerateInstanceNames/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,7 +30,9 @@
 
 PROGRAM_NAME = EnumerateInstanceNames
 DIR = Clients/CLITestClients/$(PROGRAM_NAME)
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../../libraries.mak
 
 EXTRA_INCLUDES = $(SYS_INCLUDES)
@@ -41,6 +43,7 @@
 
 SOURCES = $(PROGRAM_NAME).cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Clients/CLITestClients/DeleteInstance/Makefile.make_install	2005-05-12 11:27:33.000000000 -0400
+++ pegasus-2.5/src/Clients/CLITestClients/DeleteInstance/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,7 +30,9 @@
 
 PROGRAM_NAME = DeleteInstance
 DIR = Clients/CLITestClients/$(PROGRAM_NAME)
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../../libraries.mak
 
 EXTRA_INCLUDES = $(SYS_INCLUDES)
@@ -41,6 +43,7 @@
 
 SOURCES = $(PROGRAM_NAME).cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Clients/ssltrustmgr/tests/Makefile.make_install	2005-09-01 08:35:01.000000000 -0400
+++ pegasus-2.5/src/Clients/ssltrustmgr/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,8 +30,11 @@
 
 DIR = Clients/ssltrustmgr/tests
 
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/mak/test.mak
+TEST=true
 include $(ROOT)/mak/commands.mak
 
 RESULTFILE =  $(TMP_DIR)/result
@@ -263,3 +266,5 @@
 strip-license:
 
 prepend-license:
+
+install:
--- pegasus-2.5/src/Clients/ssltrustmgr/Makefile.make_install	2005-05-12 11:27:45.000000000 -0400
+++ pegasus-2.5/src/Clients/ssltrustmgr/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -48,7 +48,7 @@
     pegcommon
 
 EXTRA_INCLUDES = $(SYS_INCLUDES)
-
+INSTALL_BIN=sbin
 PROGRAM = ssltrustmgr
 
 SOURCES = \
--- pegasus-2.5/src/Clients/cimauth/tests/Makefile.make_install	2005-05-12 11:27:39.000000000 -0400
+++ pegasus-2.5/src/Clients/cimauth/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,7 +30,9 @@
 
 DIR = Clients/cimauth/tests
 
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/mak/test.mak
 
 RESULTFILE =  $(TMP_DIR)/result
--- pegasus-2.5/src/Clients/cimauth/Makefile.make_install	2005-05-12 11:27:39.000000000 -0400
+++ pegasus-2.5/src/Clients/cimauth/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -47,6 +47,8 @@
 
 SOURCES = CIMAuthCommand.cpp
 
+INSTALL_BIN=sbin
+
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Clients/ipinfo/Makefile.make_install	2005-05-12 11:27:43.000000000 -0400
+++ pegasus-2.5/src/Clients/ipinfo/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,6 +30,8 @@
 
 PEGASUS_ZOS_PROGRAM_OBJECT = yes
 
+PEGASUS_INSTALL=
+
 DIR = Clients/ipinfo
 include $(ROOT)/mak/config.mak
 
--- pegasus-2.5/src/Clients/SendTestIndications/Makefile.make_install	2005-05-12 11:27:36.000000000 -0400
+++ pegasus-2.5/src/Clients/SendTestIndications/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -27,6 +27,9 @@
 #//
 #//==============================================================================
 ROOT = ../../..
+TEST = true
+
+TEST=true
 include $(ROOT)/mak/config.mak
 
 DIR = Clients/SendTestIndications
@@ -38,6 +41,7 @@
    pegclient \
    pegcommon 
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Clients/CGIClient/tests/Makefile.make_install	2005-05-12 11:27:31.000000000 -0400
+++ pegasus-2.5/src/Clients/CGIClient/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,9 +28,11 @@
 #//==============================================================================
 ROOT = ../../../..
 
+TEST=true
 include $(PEGASUS_ROOT)/mak/config.mak
 
 DIRS = \
     CGIQueryString
 
+TEST=true
 include $(PEGASUS_ROOT)/mak/recurse.mak
--- pegasus-2.5/src/Clients/CGIClient/tests/CGIQueryString/Makefile.make_install	2005-05-12 11:27:31.000000000 -0400
+++ pegasus-2.5/src/Clients/CGIClient/tests/CGIQueryString/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -28,6 +28,7 @@
 #//==============================================================================
 ROOT = ../../../../..
 DIR = Clients/CGIClient/tests/CGIQueryString
+TEST=true
 include $(ROOT)/mak/config.mak
 
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
@@ -45,6 +46,7 @@
     ../../CGIQueryString.cpp \
     CGIQueryString.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 ifeq ($(OS),VMS)
--- pegasus-2.5/src/Clients/CGIClient/Makefile.make_install	2005-05-12 11:27:31.000000000 -0400
+++ pegasus-2.5/src/Clients/CGIClient/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -33,7 +33,7 @@
 DIR = Clients/CGIClient
 include $(ROOT)/mak/config.mak
 include ../libraries.mak
-
+PEGASUS_INSTALL=
 LOCAL_DEFINES = -DPEGASUS_INTERNALONLY
 
 PROGRAM = CGIClient
--- pegasus-2.5/src/Clients/cimconfig/tests/Makefile.make_install	2005-05-12 11:27:40.000000000 -0400
+++ pegasus-2.5/src/Clients/cimconfig/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,7 +30,9 @@
 
 DIR = Clients/cimconfig/tests
 
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/mak/test.mak
 
 RESULTFILE =  $(TMP_DIR)/result
--- pegasus-2.5/src/Clients/cimconfig/Makefile.make_install	2005-05-12 11:27:39.000000000 -0400
+++ pegasus-2.5/src/Clients/cimconfig/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -47,6 +47,8 @@
 
 SOURCES = CIMConfigCommand.cpp
 
+INSTALL_BIN=sbin
+
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Clients/benchmarkTest/benchmarkProvider/Makefile.make_install	2005-05-12 11:27:38.000000000 -0400
+++ pegasus-2.5/src/Clients/benchmarkTest/benchmarkProvider/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,6 +30,7 @@
 
 DIR = Clients/benchmarkTest/benchmarkProvider
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 LIBRARY = benchmarkProviderModule
@@ -43,4 +44,5 @@
    benchmarkProvider.cpp \
    benchmarkProviderMain.cpp 
 
+TEST=true
 include $(ROOT)/mak/library.mak
--- pegasus-2.5/src/Clients/benchmarkTest/benchmarkClient/Makefile.make_install	2005-05-12 11:27:38.000000000 -0400
+++ pegasus-2.5/src/Clients/benchmarkTest/benchmarkClient/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -31,6 +31,7 @@
 PEGASUS_ZOS_PROGRAM_OBJECT = yes
 
 DIR = Clients/benchmarkTest/benchmarkClient
+TEST=true
 include $(ROOT)/mak/config.mak
 
 LIBRARIES = \
@@ -43,6 +44,7 @@
 PROGRAM = benchmarkTest
 SOURCES = benchmarkTest.cpp benchmarkTestException.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/src/Clients/benchmarkTest/Load/Makefile.make_install	2005-05-12 11:27:37.000000000 -0400
+++ pegasus-2.5/src/Clients/benchmarkTest/Load/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -26,9 +26,13 @@
 #// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #//
 #//==============================================================================
+TEST=true
 include $(PEGASUS_ROOT)/mak/config.mak
+TEST=true
 include $(PEGASUS_ROOT)/mak/configschema.mak
+TEST=true
 include $(PEGASUS_ROOT)/mak/test.mak
+TEST=true
 include $(PEGASUS_ROOT)/mak/commands.mak
 
 ifdef TESTID
--- pegasus-2.5/src/Clients/benchmarkTest/benchmarkDefinition/Makefile.make_install	2005-05-12 11:27:38.000000000 -0400
+++ pegasus-2.5/src/Clients/benchmarkTest/benchmarkDefinition/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -29,7 +29,7 @@
 ROOT = $(PEGASUS_ROOT)
 
 DIR = Clients/benchmarkTest/benchmarkDefinition
-
+TEST=true
 include $(ROOT)/mak/config.mak
 
 
@@ -43,6 +43,7 @@
 SOURCES = \
    benchmarkDefinition.cpp 
 
+TEST=true
 include $(ROOT)/mak/library.mak
 
 tests:
--- pegasus-2.5/src/Clients/wbemexec/tests/Makefile.make_install	2005-05-18 21:58:50.000000000 -0400
+++ pegasus-2.5/src/Clients/wbemexec/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -30,6 +30,7 @@
 
 DIR = Clients/wbemexec/tests
 
+TEST=true
 include $(ROOT)/mak/config.mak
 include $(ROOT)/mak/test.mak
 
@@ -702,3 +703,4 @@
 
 prepend-license:
 
+install:
\ No newline at end of file
--- pegasus-2.5/src/Clients/MCCATestClient/Makefile.make_install	2005-05-12 11:27:35.000000000 -0400
+++ pegasus-2.5/src/Clients/MCCATestClient/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -27,13 +27,16 @@
 #//
 #//==============================================================================
 ROOT = $(PEGASUS_ROOT)
-
+TEST = true
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include $(ROOT)/mak/configschema.mak
 
 PEGASUS_ZOS_PROGRAM_OBJECT = yes
 
 DIR = Clients/MCCATestClient
+TEST=true
 include $(ROOT)/mak/config.mak
 
 ifdef PEGASUS_HAS_SSL
@@ -57,6 +60,7 @@
   endif
 endif
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 tests:
--- pegasus-2.5/InterfaceArchive/v002001/tests/Makefile.make_install	2003-10-07 02:42:45.000000000 -0400
+++ pegasus-2.5/InterfaceArchive/v002001/tests/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -1,9 +1,11 @@
 ROOT = $(PEGASUS_ROOT)
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 DIRS = \
        Providers \
        Clients
 
+TEST=true
 include $(ROOT)/mak/recurse.mak
--- pegasus-2.5/InterfaceArchive/v002001/tests/Providers/InstanceProvider/Makefile.make_install	2003-10-07 02:42:45.000000000 -0400
+++ pegasus-2.5/InterfaceArchive/v002001/tests/Providers/InstanceProvider/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -2,7 +2,9 @@
 
 DIR = InterfaceArchive/$(VERSION)/tests/Providers/InstanceProvider
 
+TEST=true
 include ../../../version.mak
+TEST=true
 include $(ROOT)/mak/config.mak
 LIBRARY = SampleInstanceProvider
 
@@ -14,6 +16,7 @@
 	InstanceProviderMain.cpp \
 	InstanceProvider.cpp
 
+TEST=true
 include $(ROOT)/mak/library.mak
 
 ifdef PEGASUS_TEST_BACKWARD_COMPATIBILITY
--- pegasus-2.5/InterfaceArchive/v002001/tests/Providers/Makefile.make_install	2003-10-07 03:46:28.000000000 -0400
+++ pegasus-2.5/InterfaceArchive/v002001/tests/Providers/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -1,7 +1,9 @@
+TEST=true
 include $(PEGASUS_ROOT)/mak/config.mak
 
 DIRS = \
 	InstanceProvider \
 	MethodProvider 
 
+TEST=true
 include $(PEGASUS_ROOT)/mak/recurse.mak
--- pegasus-2.5/InterfaceArchive/v002001/tests/Providers/MethodProvider/Makefile.make_install	2003-10-07 02:42:45.000000000 -0400
+++ pegasus-2.5/InterfaceArchive/v002001/tests/Providers/MethodProvider/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -2,7 +2,9 @@
 
 DIR = InterfaceArchive/$(VERSION)/tests/Providers/MethodProvider
 
+TEST=true
 include ../../../version.mak
+TEST=true
 include $(ROOT)/mak/config.mak
 LIBRARY = SampleMethodProvider
 
@@ -14,6 +16,7 @@
 	MethodProviderMain.cpp \
 	MethodProvider.cpp
 
+TEST=true
 include $(ROOT)/mak/library.mak
 
 ifdef PEGASUS_TEST_BACKWARD_COMPATIBILITY
--- pegasus-2.5/InterfaceArchive/v002001/tests/Clients/Makefile.make_install	2003-10-07 02:42:45.000000000 -0400
+++ pegasus-2.5/InterfaceArchive/v002001/tests/Clients/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -1,9 +1,11 @@
 ROOT = $(PEGASUS_ROOT)
 
+TEST=true
 include $(ROOT)/mak/config.mak
 
 DIRS = \
    EnumInstances \
    InvokeMethod
 
+TEST=true
 include $(ROOT)/mak/recurse.mak
--- pegasus-2.5/InterfaceArchive/v002001/tests/Clients/EnumInstances/Makefile.make_install	2003-10-07 02:42:45.000000000 -0400
+++ pegasus-2.5/InterfaceArchive/v002001/tests/Clients/EnumInstances/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -4,8 +4,11 @@
 
 DIR = InterfaceArchive/$(VERSION)/tests/Clients/EnumInstances
 
+TEST=true
 include ../../../version.mak
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 EXTRA_INCLUDES = 
@@ -13,6 +16,7 @@
 PROGRAM = EnumInstances
 SOURCES = EnumInstances.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 ifdef PEGASUS_TEST_BACKWARD_COMPATIBILITY
--- pegasus-2.5/InterfaceArchive/v002001/tests/Clients/InvokeMethod/Makefile.make_install	2003-10-07 02:42:45.000000000 -0400
+++ pegasus-2.5/InterfaceArchive/v002001/tests/Clients/InvokeMethod/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -4,8 +4,11 @@
 
 DIR = InterfaceArchive/$(VERSION)/tests/Clients/InvokeMethod
 
+TEST=true
 include ../../../version.mak
+TEST=true
 include $(ROOT)/mak/config.mak
+TEST=true
 include ../libraries.mak
 
 EXTRA_INCLUDES = 
@@ -13,6 +16,7 @@
 PROGRAM = InvokeMethod
 SOURCES = InvokeMethod.cpp
 
+TEST=true
 include $(ROOT)/mak/program.mak
 
 ifdef PEGASUS_TEST_BACKWARD_COMPATIBILITY
--- pegasus-2.5/Schemas/Pegasus/Makefile.make_install	2005-05-12 11:27:26.000000000 -0400
+++ pegasus-2.5/Schemas/Pegasus/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -68,3 +68,19 @@
 
 xml:
 	$(MAKE) -f $(ROOT)/Schemas/Makefile xml
+
+install_repository: $(PEGASUS_HOME)/repository
+ifdef PEGASUS_INSTALL
+	mkdir -p $(PEGASUS_DESTDIR)/$(PEGASUS_REPOSITORY_DIR)
+	cp -rfp $(PEGASUS_HOME)/repository/* $(PEGASUS_DESTDIR)/$(PEGASUS_REPOSITORY_DIR)
+endif
+
+install:
+ifdef PEGASUS_INSTALL
+  ifdef PEGASUS_MOF_DIR
+	mkdir -p $(PEGASUS_DESTDIR)/$(PEGASUS_MOF_DIR)/Pegasus
+	/bin/cp -fp Internal/VER20/* InterOp/VER20/* ManagedSystem/VER20/* $(PEGASUS_DESTDIR)/$(PEGASUS_MOF_DIR)/Pegasus
+	chmod 444 $(PEGASUS_DESTDIR)/$(PEGASUS_MOF_DIR)/Pegasus/*
+	chown -R root:root $(PEGASUS_DESTDIR)/$(PEGASUS_MOF_DIR)/Pegasus >/dev/null 2>&1 || :;
+  endif
+endif
--- pegasus-2.5/Schemas/Makefile.make_install	2005-05-12 11:27:25.000000000 -0400
+++ pegasus-2.5/Schemas/Makefile	2005-10-03 12:32:47.000000000 -0400
@@ -92,3 +92,16 @@
 	@ $(ECHO) +++++ Creating XML for CIM Schema$(CIM_SCHEMA_VER).mof in file $(TMP_DIR)/CIM_Schema$(CIM_SCHEMA_VER).xml
 	$(CIMMOFCLI)  "-R$(TMP_DIR)" --xml "-I$(CIM_SCHEMA_DIR)" -nxml/cimv2 $(CIM_SCHEMA_DIR)/CIM_Schema$(CIM_SCHEMA_VER).mof > $(TMP_DIR)/CIM_Schema$(CIM_SCHEMA_VER).xml
 	@ $(RMREPOSITORY) $(TMP_DIR)/repository
+
+install:
+ifdef PEGASUS_INSTALL
+   ifdef PEGASUS_MOF_DIR 
+	mkdir -p $(PEGASUS_DESTDIR)/$(PEGASUS_MOF_DIR)
+	cp -rfp CIM* $(PEGASUS_DESTDIR)/$(PEGASUS_MOF_DIR)/
+	chown -R root:root $(PEGASUS_DESTDIR)/$(PEGASUS_MOF_DIR)/* >/dev/null 2>&1 || :;
+	chmod 0444 $(PEGASUS_DESTDIR)/$(PEGASUS_MOF_DIR)/CIM*/* >/dev/null 2>&1 || :;
+	chmod 0755 $(PEGASUS_DESTDIR)/$(PEGASUS_MOF_DIR)/CIM* || :;
+	make -SC Pegasus install 
+   endif
+endif
+