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

Diff for /pegasus/mak/library-windows.mak between version 1.15 and 1.18

version 1.15, 2005/10/14 17:50:42 version 1.18, 2008/04/09 04:37:43
Line 1 
Line 1 
 #//%2005////////////////////////////////////////////////////////////////////////  #//%2006////////////////////////////////////////////////////////////////////////
 #// #//
 #// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development #// Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development
 #// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems. #// Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.
Line 8 
Line 8 
 #// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group. #// IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
 #// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.; #// Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;
 #// EMC Corporation; VERITAS Software Corporation; The Open Group. #// EMC Corporation; VERITAS Software Corporation; The Open Group.
   #// Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;
   #// EMC Corporation; Symantec Corporation; The Open Group.
 #// #//
 #// Permission is hereby granted, free of charge, to any person obtaining a copy #// Permission is hereby granted, free of charge, to any person obtaining a copy
 #// of this software and associated documentation files (the "Software"), to #// of this software and associated documentation files (the "Software"), to
Line 31 
Line 33 
 FULL_EXP = $(BIN_DIR)/$(LIBRARY)$(EXP) FULL_EXP = $(BIN_DIR)/$(LIBRARY)$(EXP)
 FULL_ILK = $(BIN_DIR)/$(LIBRARY)$(ILK) FULL_ILK = $(BIN_DIR)/$(LIBRARY)$(ILK)
 FULL_PDB = $(BIN_DIR)/$(LIBRARY)$(PDB) FULL_PDB = $(BIN_DIR)/$(LIBRARY)$(PDB)
   VERSION_RC = $(ROOT)/mak/version-windows.RC
   VERSION_RES = $(ROOT)/mak/version-windows.RES
  
 ## ##
 ## ws2_32.lib is needed to get the WINSOCK routines! ## ws2_32.lib is needed to get the WINSOCK routines!
Line 51 
Line 55 
 ## ##
 LINKFILE=$(LIB_DIR)/linkfile LINKFILE=$(LIB_DIR)/linkfile
  
   $(FULL_LIB): $(BIN_DIR)/target $(LIB_DIR)/target $(OBJ_DIR)/target $(OBJECTS) $(VERSION_RES) $(FULL_LIBRARIES) $(ERROR)
 ifdef SOURCES1 ifdef SOURCES1
 $(FULL_LIB): $(BIN_DIR)/target $(LIB_DIR)/target $(OBJ_DIR)/target $(OBJECTS) $(FULL_LIBRARIES) $(ERROR)  
         @ $(ECHO) "Creating $(LINKFILE)"         @ $(ECHO) "Creating $(LINKFILE)"
         @ $(RM) $(LINKFILE)         @ $(RM) $(LINKFILE)
         @ $(foreach i, $(OBJECTS), echo $(i) >> $(LINKFILE) $(NL) )         @ $(foreach i, $(OBJECTS), echo $(i) >> $(LINKFILE) $(NL) )
         link -nologo -dll $(LINK_FLAGS) $(EXTRA_LINK_FLAGS) -out:$(FULL_DLL) -implib:$(FULL_LIB) @$(LINKFILE) $(FULL_LIBRARIES) $(SYS_LIBS) $(EXTRA_LIBRARIES)          link -nologo -dll $(LINK_FLAGS) $(EXTRA_LINK_FLAGS) -out:$(FULL_DLL) -implib:$(FULL_LIB) @$(LINKFILE) $(VERSION_RES) $(FULL_LIBRARIES) $(SYS_LIBS) $(EXTRA_LIBRARIES)
 else else
         link -nologo -dll $(LINK_FLAGS) $(EXTRA_LINK_FLAGS) -out:$(FULL_DLL) -implib:$(FULL_LIB) $(OBJECTS) $(FULL_LIBRARIES) $(SYS_LIBS) $(EXTRA_LIBRARIES)          link -nologo -dll $(LINK_FLAGS) $(EXTRA_LINK_FLAGS) -out:$(FULL_DLL) -implib:$(FULL_LIB) $(OBJECTS) $(VERSION_RES) $(FULL_LIBRARIES) $(SYS_LIBS) $(EXTRA_LIBRARIES)
 endif endif
  
 FILES_TO_CLEAN = \ FILES_TO_CLEAN = \
     $(OBJECTS) $(FULL_LIB) $(FULL_DLL) $(FULL_EXP) $(FULL_ILK) $(FULL_PDB) $(OBJ_DIR)/vc60$(PDB) $(OBJ_DIR)/vc70$(PDB) depend.mak depend.mak.bak     $(OBJECTS) $(FULL_LIB) $(FULL_DLL) $(FULL_EXP) $(FULL_ILK) $(FULL_PDB) $(OBJ_DIR)/vc60$(PDB) $(OBJ_DIR)/vc70$(PDB) depend.mak depend.mak.bak
  
   $(VERSION_RES): $(VERSION_RC)
           @ $(RC) /fo $(VERSION_RES) $(VERSION_RC)
   
 clean-lib: $(ERROR) clean-lib: $(ERROR)
         mu rm $(FULL_LIB) $(FULL_DLL) $(FULL_EXP)         mu rm $(FULL_LIB) $(FULL_DLL) $(FULL_EXP)

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