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

Diff for /pegasus/mak/program.mak between version 1.5 and 1.18

version 1.5, 2001/04/12 07:25:20 version 1.18, 2001/07/06 21:47:00
Line 11 
Line 11 
 FULL_PROGRAM=$(BIN_DIR)/$(PROGRAM)$(EXE) FULL_PROGRAM=$(BIN_DIR)/$(PROGRAM)$(EXE)
  
 $(FULL_PROGRAM): $(OBJ_DIR)/target $(BIN_DIR)/target $(OBJECTS) $(LIBRARIES) $(ERROR) $(FULL_PROGRAM): $(OBJ_DIR)/target $(BIN_DIR)/target $(OBJECTS) $(LIBRARIES) $(ERROR)
         $(CXX) $(FLAGS) $(EXE_OUT)$(FULL_PROGRAM) $(OBJECTS) $(LIBRARIES)  ifeq ($(PEGASUS_SUPPORTS_DYNLIB),yes)
   ##
   ## build images with -l<name> syntax for needed shared libraries
   ## DYNAMIC_LIBRARIES is defined appropriately in libraries.mak and Makefile files
   ##
           $(LINK_WRAPPER) $(CXX) $(FLAGS) -L$(LIB_DIR) $(EXE_OUT)$(FULL_PROGRAM) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)
   else
           $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXE_OUT)$(FULL_PROGRAM) $(OBJECTS) $(LIBRARIES) $(SYS_LIBS)
   endif
         @ $(ECHO)         @ $(ECHO)
  
 include $(ROOT)/mak/objects.mak include $(ROOT)/mak/objects.mak
  
 # include $(ROOT)/mak/headers.mak  
   
 FILES_TO_CLEAN = $(OBJECTS) $(FULL_PROGRAM) FILES_TO_CLEAN = $(OBJECTS) $(FULL_PROGRAM)
  
 include $(ROOT)/mak/clean.mak include $(ROOT)/mak/clean.mak
Line 26 
Line 32 
  
 include $(ROOT)/mak/build.mak include $(ROOT)/mak/build.mak
  
 -include $(OBJ_DIR)/depend.mak  include $(ROOT)/mak/sub.mak
  
 include $(ROOT)/mak/variables.mak  -include $(OBJ_DIR)/depend.mak
  
 include $(ROOT)/mak/misc.mak include $(ROOT)/mak/misc.mak


Legend:
Removed from v.1.5  
changed lines
  Added in v.1.18

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2