(file) Return to Makefile CVS log (file) (dir) Up to [Pegasus] / pegasus

Diff for /pegasus/Makefile between version 1.43.2.3 and 1.48

version 1.43.2.3, 2007/09/26 16:05:10 version 1.48, 2008/09/02 17:37:16
Line 37 
Line 37 
 include $(ROOT)/mak/config.mak include $(ROOT)/mak/config.mak
  
 # This is a recurse make file # This is a recurse make file
 # Defines subdirectorys to go to recursively  # Defines subdirectories to go to recursively
  
 # DIRS = src cgi  DIRS = src
  
 ifeq ($(OS_TYPE),vxworks)  TEST_DIRS = test
     DIRS = \  
         src/Pegasus/Common \  
         src/Pegasus/Common/tests \  
         src/Pegasus/Config \  
         src/Pegasus/Query/QueryCommon \  
         src/Pegasus/WQL \  
         src/Pegasus/CQL \  
         src/Pegasus/Query/QueryExpression \  
         src/Pegasus/Security/UserManager \  
         src/Pegasus/Client \  
         src/Service \  
         src/Pegasus/Provider \  
         src/Pegasus/Repository \  
         src/Pegasus/Repository/tests \  
         src/Pegasus/Server/ProviderRegistrationManager \  
         src/Pegasus/ProviderManager2 \  
         src/Pegasus/ProviderManager2/Default \  
         src/Pegasus/ExportServer \  
         src/Pegasus/ProviderManagerService \  
         src/Pegasus/Security/Authentication \  
         src/Pegasus/HandlerService \  
         src/Pegasus/IndicationService \  
         src/Pegasus/ControlProviders/InteropProvider \  
         src/Pegasus/ControlProviders/Statistic \  
         src/Pegasus/ControlProviders/QueryCapabilitiesProvider \  
         src/Pegasus/ControlProviders/ProviderRegistrationProvider \  
         src/Pegasus/ControlProviders/NamespaceProvider \  
         src/Pegasus/ControlProviders/ConfigSettingProvider \  
         src/Pegasus/ControlProviders/UserAuthProvider \  
         src/Pegasus/Server \  
         src/Server \  
         src/Providers/ManagedSystem/ComputerSystem \  
         src/Providers/ManagedSystem/Process \  
         src/Providers/ManagedSystem/Processor \  
         src/Providers/ManagedSystem/IP \  
         src/Providers/ManagedSystem/ComputerSystem  
 else  
     DIRS = src test Schemas  
 endif  
  
 # Define the inclusion of the recurse.mak file to execute the next # Define the inclusion of the recurse.mak file to execute the next
 # level of makefiles defined by the DIRS variable # level of makefiles defined by the DIRS variable
  
 ifeq ($(OS_TYPE),vxworks)  
     defaultrule: all  
 else  
     defaultrule: all setupdevserver     defaultrule: all setupdevserver
 endif  
  
 include $(ROOT)/mak/recurse.mak include $(ROOT)/mak/recurse.mak
  
Line 130 
Line 87 
         $(USAGE)"repository          - builds the base repository. Does not remove other"         $(USAGE)"repository          - builds the base repository. Does not remove other"
         $(USAGE)"                      namespaces than the base namespaces."         $(USAGE)"                      namespaces than the base namespaces."
         $(USAGE)"testrepository      - builds items for the test suites into the repository"         $(USAGE)"testrepository      - builds items for the test suites into the repository"
         $(USAGE)"removetestrepository- removes test items from the repository"  
         $(USAGE)"repositoryclean     - removes the complete repository"         $(USAGE)"repositoryclean     - removes the complete repository"
         $(USAGE)"listplatforms       - List all valid platforms"         $(USAGE)"listplatforms       - List all valid platforms"
         $(USAGE)         $(USAGE)
Line 271 
Line 227 
 # buildmu target: build mu the make utility that among other things # buildmu target: build mu the make utility that among other things
 #                 includes depend #                 includes depend
 buildmu: FORCE buildmu: FORCE
         $(MKDIRHIER) $(BIN_DIR)  
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/utils/mu -f Makefile         $(MAKE) --directory=$(PEGASUS_ROOT)/src/utils/mu -f Makefile
  
 #---------------------- #----------------------
Line 293 
Line 248 
  
  
 #--------------------- #---------------------
 # The repository Target removes and rebuilds the base repository. It  # The repository target removes the entire repository and rebuilds the Pegasus
 # does not remove all possible namespaces.  See  # namespaces.  The repositoryServer target does not remove the repository
 # Schemas/Pegasus/Makefile for details. The repository clean has the  # before building the Pegasus namespaces.  (The repositoryServer target in
 # same limitation  # TestMakefile *does* remove the repository first.)
  
 # Note: Arguments must be quoted to preserve upper case characters in VMS. # Note: Arguments must be quoted to preserve upper case characters in VMS.
 repository: FORCE  repository: repositoryclean
         @ $(MAKE) "-SC" Schemas/Pegasus repository         @ $(MAKE) "-SC" Schemas/Pegasus repository
  
 repositoryclean: FORCE repositoryclean: FORCE
Line 308 
Line 263 
 repositoryServer: FORCE repositoryServer: FORCE
         @ $(MAKE) "-SC" Schemas/Pegasus repositoryServer         @ $(MAKE) "-SC" Schemas/Pegasus repositoryServer
  
   #---------------------
   # The testrepository and testrepositoryServer targets build the Pegasus test
   # namespaces.  A pre-existing repository is not removed.
   
 testrepository: FORCE testrepository: FORCE
         @ $(MAKE) "-SC" src/Providers/sample/Load repository         @ $(MAKE) "-SC" src/Providers/sample/Load repository
         @ $(MAKE) "-SC" test/wetest repository         @ $(MAKE) "-SC" test/wetest repository
Line 315 
Line 274 
         @ $(MAKE) "-SC" src/Pegasus/CQL/CQLCLI repository         @ $(MAKE) "-SC" src/Pegasus/CQL/CQLCLI repository
         @ $(MAKE) "-SC" src/Pegasus/Query/QueryExpression/tests repository         @ $(MAKE) "-SC" src/Pegasus/Query/QueryExpression/tests repository
         @ $(MAKE) "-SC" src/Providers/TestProviders/Load repository         @ $(MAKE) "-SC" src/Providers/TestProviders/Load repository
 ifndef PEGASUS_DISABLE_CQL  ifeq ($(PEGASUS_ENABLE_CQL),true)
         @ $(MAKE) "-SC" src/Pegasus/ControlProviders/QueryCapabilitiesProvider/tests repository         @ $(MAKE) "-SC" src/Pegasus/ControlProviders/QueryCapabilitiesProvider/tests repository
 endif endif
 ifeq ($(PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER), true) ifeq ($(PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER), true)
Line 331 
Line 290 
         @ $(MAKE) "-SC" src/Pegasus/CQL/CQLCLI repositoryServer         @ $(MAKE) "-SC" src/Pegasus/CQL/CQLCLI repositoryServer
         @ $(MAKE) "-SC" src/Pegasus/Query/QueryExpression/tests repositoryServer         @ $(MAKE) "-SC" src/Pegasus/Query/QueryExpression/tests repositoryServer
         @ $(MAKE) "-SC" src/Providers/TestProviders/Load repositoryServer         @ $(MAKE) "-SC" src/Providers/TestProviders/Load repositoryServer
 ifndef PEGASUS_DISABLE_CQL  ifeq ($(PEGASUS_ENABLE_CQL),true)
         @ $(MAKE) "-SC" src/Pegasus/ControlProviders/QueryCapabilitiesProvider/tests repositoryServer         @ $(MAKE) "-SC" src/Pegasus/ControlProviders/QueryCapabilitiesProvider/tests repositoryServer
 endif endif
 ifeq ($(PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER), true) ifeq ($(PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER), true)
Line 340 
Line 299 
         @ $(MAKE) --directory=$(PEGASUS_ROOT)/src/Clients/cimsub/tests/testscript \         @ $(MAKE) --directory=$(PEGASUS_ROOT)/src/Clients/cimsub/tests/testscript \
             -f Makefile repositoryServer             -f Makefile repositoryServer
  
 removetestrepository: FORCE  
         @ $(MAKE) "-SC" src/Providers/sample/Load removerepository  
         @ $(MAKE) "-SC" test/wetest removerepository  
         @ $(MAKE) "-SC" src/Clients/benchmarkTest/Load removerepository  
         @ $(MAKE) "-SC" src/Providers/TestProviders/Load removerepository  
         @ $(MAKE) "-SC" src/Clients/cimsub/tests/testscript removerepository  
   
 config: config:
         @ $(ROOT)/SetConfig_EnvVar         @ $(ROOT)/SetConfig_EnvVar
  

Legend:
Removed from v.1.43.2.3  
changed lines
  Added in v.1.48
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2