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

Diff for /pegasus/Makefile between version 1.42.14.4 and 1.43

version 1.42.14.4, 2007/08/13 10:57:29 version 1.43, 2007/08/10 18:46:32
Line 44 
Line 44 
  
 # 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
 ifneq ($(PEGASUS_USE_DIRECTACCESS_FOR_LOCAL),true)  
 defaultrule: all setupdevserver defaultrule: all setupdevserver
 else  
 defaultrule: all dacim setupdevserver  
 endif  
  
 include $(ROOT)/mak/recurse.mak include $(ROOT)/mak/recurse.mak
  
Line 154 
Line 151 
 # build target: builds all source # build target: builds all source
 # #
 build: depend all setupdevserver build: depend all setupdevserver
 ifeq ($(PEGASUS_USE_DIRECTACCESS_FOR_LOCAL),true)  
         $(MAKE) --directory=$(PEGASUS_ROOT) dacim  
 endif  
   
  
 #------------------------ #------------------------
 # rebuild target is being deprecated instead use "make new build" # rebuild target is being deprecated instead use "make new build"
Line 254 
Line 247 
         - $(RMDIRHIER) $(PEGASUS_HOME)/lib         - $(RMDIRHIER) $(PEGASUS_HOME)/lib
         - $(RMDIRHIER) $(PEGASUS_HOME)/obj         - $(RMDIRHIER) $(PEGASUS_HOME)/obj
  
 dacim: FORCE  
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Pegasus/Client -f Makefile2 clean  
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Pegasus/Client -f Makefile2 depend  
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Pegasus/Client -f Makefile2  
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Pegasus/Repository clean  
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Pegasus/Repository -e PEGASUS_USE_DIRECTACCESS_FOR_LOCAL_DEPEND=true  
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Pegasus/ProviderManager2 clean  
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Pegasus/ProviderManager2 -e PEGASUS_USE_DIRECTACCESS_FOR_LOCAL_DEPEND=true  
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Pegasus/ProviderManagerService clean  
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Pegasus/ProviderManagerService -e PEGASUS_USE_DIRECTACCESS_FOR_LOCAL_DEPEND=true  
         $(MAKE) --directory src/Clients/cimconfig clean  
         $(MAKE) --directory src/Clients/cimconfig -e PEGASUS_USE_DIRECTACCESS_FOR_LOCAL_DEPEND=true  
         @$(ECHO) "PEGASUS built with direct access CIM. "  
   
 removedacim: rmv_dacim build  
   
 rmv_dacim: FORCE  
         @$(TOUCH) $(PEGASUS_ROOT)/src/Pegasus/Client/CIMClientRep.cpp  
  
 #--------------------- #---------------------
 # The repository Target removes and rebuilds the base repository. It # The repository Target removes and rebuilds the base repository. It
Line 296 
Line 271 
         @ $(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
         @ $(MAKE) "-SC" src/Pegasus/ControlProviders/QueryCapabilitiesProvider/tests repository         @ $(MAKE) "-SC" src/Pegasus/ControlProviders/QueryCapabilitiesProvider/tests repository
   endif
 ifeq ($(PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER), true) ifeq ($(PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER), true)
         @ $(MAKE) "-SC" src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests repository         @ $(MAKE) "-SC" src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests repository
 endif endif
Line 310 
Line 287 
         @ $(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
         @ $(MAKE) "-SC" src/Pegasus/ControlProviders/QueryCapabilitiesProvider/tests repositoryServer         @ $(MAKE) "-SC" src/Pegasus/ControlProviders/QueryCapabilitiesProvider/tests repositoryServer
   endif
 ifeq ($(PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER), true) ifeq ($(PEGASUS_ENABLE_JMPI_PROVIDER_MANAGER), true)
         @ $(MAKE) "-SC" src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests repositoryServer         @ $(MAKE) "-SC" src/Pegasus/ProviderManager2/JMPI/org/pegasus/jmpi/tests repositoryServer
 endif endif


Legend:
Removed from v.1.42.14.4  
changed lines
  Added in v.1.43

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2