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

Diff for /pegasus/Makefile between version 1.53 and 1.55

version 1.53, 2010/02/18 01:47:27 version 1.55, 2012/05/14 09:12:08
Line 50 
Line 50 
 # 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
  
 defaultrule: all setupdevserver  defaultrule: cimprovagt32 all setupdevserver
  
 include $(ROOT)/mak/recurse.mak include $(ROOT)/mak/recurse.mak
  
Line 154 
Line 154 
 #----------------------- #-----------------------
 # build target: builds all source # build target: builds all source
 # #
 build: depend all setupdevserver  build: cimprovagt32depend cimprovagt32 depend renameinterop all setupdevserver
  
 #------------------------ #------------------------
 # rebuild target is being deprecated instead use "make new build" # rebuild target is being deprecated instead use "make new build"
Line 177 
Line 177 
 # make new build # make new build
 # make new world # make new world
  
 new: clean repositoryclean  new: cimprovagt32clean clean repositoryclean
  
 #----------------------- #-----------------------
 # world targets: builds everything and dependent on which target may do testing # world targets: builds everything and dependent on which target may do testing
Line 186 
Line 186 
  
 world: build s_unittests servertests world: build s_unittests servertests
  
   ############################
   #
   # rules for building 32 bit provider agent
   #
   cimprovagt32depend: FORCE
   ifdef PEGASUS_PLATFORM_FOR_32BIT_PROVIDER_SUPPORT
           $(MAKE) --directory=$(ROOT) -f Makefile.cimprovagt32 depend
   endif
   cimprovagt32: FORCE
   ifdef PEGASUS_PLATFORM_FOR_32BIT_PROVIDER_SUPPORT
           $(MAKE) --directory=$(ROOT) -f Makefile.cimprovagt32
   endif
   
   cimprovagt32clean: FORCE
   ifdef PEGASUS_PLATFORM_FOR_32BIT_PROVIDER_SUPPORT
           $(MAKE) --directory=$(ROOT) -f Makefile.cimprovagt32 clean
   endif
  
 ############################ ############################
 # #
Line 236 
Line 253 
 buildmu: FORCE buildmu: FORCE
         $(MAKE) --directory=$(PEGASUS_ROOT)/src/utils/mu -f Makefile         $(MAKE) --directory=$(PEGASUS_ROOT)/src/utils/mu -f Makefile
  
   ##########################################################################
   #
   # renameinterop: This is with regard to PEP304, build time option.
   # There are many test cases and result files where namespace name
   # root/PG_InterOp is hardcoded. So this searches for root/PG_InterOp
   # and changes that to "interop" or "root/interop".
   #
   # This uses mu replace internally. The original files are all saved as
   # filename.save. These file can be restored by running
   # make -f Makefile.interop restore
   #
   renameinterop: buildmu
   ifeq ($(PEGASUS_INTEROP_NAMESPACE),root/interop)
           $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile.interop replace
   endif
   ifeq ($(PEGASUS_INTEROP_NAMESPACE),interop)
           $(MAKE) --directory=$(PEGASUS_ROOT) -f Makefile.interop replace
   endif
   
 #---------------------- #----------------------
 # setupdevserver and cleandevserver are used to setup and clear the # setupdevserver and cleandevserver are used to setup and clear the
 # server configuration files needed to run the server in a development # server configuration files needed to run the server in a development


Legend:
Removed from v.1.53  
changed lines
  Added in v.1.55

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2