(file) Return to library.mak CVS log (file) (dir) Up to [Pegasus] / pegasus / mak

Diff for /pegasus/mak/library.mak between version 1.6 and 1.12.4.1

version 1.6, 2001/04/29 18:36:16 version 1.12.4.1, 2004/03/15 18:10:54
Line 1 
Line 1 
   ifeq ($(PLATFORM_VERSION_SUPPORTED), yes)
     ifdef PLATFORM_COMPONENT_NAME
        DEFINES += -DPLATFORM_COMPONENT_NAME=\"$(PLATFORM_COMPONENT_NAME)\"
     else
        DEFINES += -DPLATFORM_COMPONENT_NAME=\"$(LIBRARY)\"
     endif
   endif
   
 INCLUDES = -I$(ROOT)/src $(EXTRA_INCLUDES) INCLUDES = -I$(ROOT)/src $(EXTRA_INCLUDES)
  
   include $(ROOT)/mak/common.mak
   
 ################################################################################ ################################################################################
 ## ##
 ## Build list of object names. ## Build list of object names.
Line 9 
Line 19 
 TMP_OBJECTS = $(foreach i,$(SOURCES),$(OBJ_DIR)/$i) TMP_OBJECTS = $(foreach i,$(SOURCES),$(OBJ_DIR)/$i)
  
 ifeq ($(OS_TYPE),windows) ifeq ($(OS_TYPE),windows)
 OBJECTS = $(TMP_OBJECTS:.cpp=.obj)  CPP_OBJECTS = $(TMP_OBJECTS:.cpp=.obj)
   OBJECTS = $(CPP_OBJECTS:.c=.obj)
 else else
 OBJECTS = $(TMP_OBJECTS:.cpp=.o)  CPP_OBJECTS = $(TMP_OBJECTS:.cpp=.o)
   OBJECTS = $(CPP_OBJECTS:.c=.o)
 endif endif
  
 ################################################################################ ################################################################################
Line 22 
Line 34 
  
 ifeq ($(OS_TYPE),windows) ifeq ($(OS_TYPE),windows)
 include $(ROOT)/mak/library-windows.mak include $(ROOT)/mak/library-windows.mak
 else  endif
   ifeq ($(OS_TYPE),unix)
 include $(ROOT)/mak/library-unix.mak include $(ROOT)/mak/library-unix.mak
 endif endif
   ifeq ($(OS_TYPE),nsk)
   include $(ROOT)/mak/library-nsk.mak
   endif
  
 ################################################################################ ################################################################################
 ## ##
Line 42 
Line 58 
  
 include $(ROOT)/mak/objects.mak include $(ROOT)/mak/objects.mak
  
 # include $(ROOT)/mak/headers.mak  
   
 include $(ROOT)/mak/depend.mak include $(ROOT)/mak/depend.mak
  
 include $(ROOT)/mak/build.mak include $(ROOT)/mak/build.mak
  
 include $(ROOT)/mak/headers.mak  
   
 include $(ROOT)/mak/docxx.mak include $(ROOT)/mak/docxx.mak
  
 include $(ROOT)/mak/sub.mak include $(ROOT)/mak/sub.mak
Line 59 
Line 71 
 include $(ROOT)/mak/misc.mak include $(ROOT)/mak/misc.mak
  
 tests: $(ERROR) tests: $(ERROR)
   
   #l10n
   messages: $(ERROR)
   
   poststarttests: $(ERROR)

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