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

Diff for /pegasus/mak/program.mak between version 1.21 and 1.22

version 1.21, 2001/07/17 00:21:58 version 1.22, 2001/07/17 06:06:51
Line 2 
Line 2 
  
 TMP_OBJECTS = $(foreach i,$(SOURCES),$(OBJ_DIR)/$i) TMP_OBJECTS = $(foreach i,$(SOURCES),$(OBJ_DIR)/$i)
  
   FULL_PROGRAM=$(BIN_DIR)/$(PROGRAM)$(EXE)
   
 ifeq ($(OS_TYPE),windows) ifeq ($(OS_TYPE),windows)
 OBJECTS = $(TMP_OBJECTS:.cpp=.obj) OBJECTS = $(TMP_OBJECTS:.cpp=.obj)
   EXE_OUTPUT = $(EXE_OUT)$(FULL_PROGRAM)
 else else
 OBJECTS = $(TMP_OBJECTS:.cpp=.o) OBJECTS = $(TMP_OBJECTS:.cpp=.o)
   EXE_OUTPUT = $(EXE_OUT) $(FULL_PROGRAM)
 endif endif
  
 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)
 ifeq ($(PEGASUS_SUPPORTS_DYNLIB),yes) ifeq ($(PEGASUS_SUPPORTS_DYNLIB),yes)
  
Line 18 
Line 20 
 ## DYNAMIC_LIBRARIES is defined appropriately in libraries.mak and Makefile ## DYNAMIC_LIBRARIES is defined appropriately in libraries.mak and Makefile
 ## files ## files
 ## ##
         $(LINK_WRAPPER) $(CXX) $(FLAGS) -L$(LIB_DIR) $(EXE_OUT)$(FULL_PROGRAM) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)          $(LINK_WRAPPER) $(CXX) $(FLAGS) -L$(LIB_DIR) $(EXE_OUTPUT) $(OBJECTS) $(DYNAMIC_LIBRARIES) $(SYS_LIBS)
         $(TOUCH) $(FULL_PROGRAM)         $(TOUCH) $(FULL_PROGRAM)
         @ $(ECHO)         @ $(ECHO)
 else else
         $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXE_OUT) $(FULL_PROGRAM) $(OBJECTS) $(LIBRARIES) $(SYS_LIBS)          $(LINK_WRAPPER) $(CXX) $(FLAGS) $(EXE_OUTPUT) $(OBJECTS) $(LIBRARIES) $(SYS_LIBS)
 endif endif
         $(TOUCH) $(FULL_PROGRAM)         $(TOUCH) $(FULL_PROGRAM)
         @ $(ECHO)         @ $(ECHO)


Legend:
Removed from v.1.21  
changed lines
  Added in v.1.22

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2