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

Diff for /pegasus/Makefile between version 1.42.14.2 and 1.43.2.8

version 1.42.14.2, 2007/07/16 14:59:09 version 1.43.2.8, 2007/10/09 21:41:39
Line 40 
Line 40 
 # Defines subdirectorys to go to recursively # Defines subdirectorys to go to recursively
  
 # DIRS = src cgi # DIRS = src cgi
   
   ifeq ($(OS_TYPE),vxworks)
       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/Service \
           src/Pegasus/Provider \
           src/Pegasus/Repository \
           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
   else
 DIRS = src test Schemas 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
 ifneq ($(PEGASUS_USE_DIRECTACCESS_FOR_LOCAL),true)  
 defaultrule: all setupdevserver  ifeq ($(OS_TYPE),vxworks)
       defaultrule: all
 else else
 defaultrule: all dacim setupdevserver      defaultrule: all setupdevserver
 endif endif
  
 include $(ROOT)/mak/recurse.mak include $(ROOT)/mak/recurse.mak
Line 250 
Line 284 
         - $(RMDIRHIER) $(PEGASUS_HOME)/lib         - $(RMDIRHIER) $(PEGASUS_HOME)/lib
         - $(RMDIRHIER) $(PEGASUS_HOME)/obj         - $(RMDIRHIER) $(PEGASUS_HOME)/obj
  
 dacim: FORCE  
         @$(TOUCH) $(PEGASUS_ROOT)/src/Pegasus/Client/CIMClient.cpp  
         @$(TOUCH) $(PEGASUS_ROOT)/src/Pegasus/Client/CIMClientRep.cpp  
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Pegasus/Client -f Makefile2  
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/Pegasus/Client/tests/DirectAccessCIM  
         @$(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 285 
Line 308 
         @ $(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 299 
Line 324 
         @ $(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.2  
changed lines
  Added in v.1.43.2.8
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2