Ignore:
Timestamp:
Apr 10, 2013 12:58:16 PM (6 years ago)
Author:
stefan
Message:

sync with trunk rev 1901

Location:
stable/2.8/Cbc
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/2.8/Cbc

  • stable/2.8/Cbc/examples/Makefile.in

    r1854 r1902  
    2121OBJS =  $(DRIVER).@OBJEXT@
    2222
    23 #       CbcCompareUser.@OBJEXT@ \
    24 #       CbcSolver2.@OBJEXT@ \
    25 #       CbcSolver3.@OBJEXT@ \
    26 #       ClpQuadInterface.@OBJEXT@ \
    27 #       CbcBranchFollow2.@OBJEXT@ \
    28 #       CbcBranchUser.@OBJEXT@ \
    29 #       CbcBranchLink.@OBJEXT@
     23# extra object files that are required by some examples (we just link them into each one)
     24EXTRAOBJS = \
     25        CbcCompareUser.@OBJEXT@ \
     26        CbcSolver2.@OBJEXT@ \
     27        CbcSolver3.@OBJEXT@ \
     28        CbcSolverLongThin.@OBJEXT@ \
     29        ClpQuadInterface.@OBJEXT@ \
     30        CbcBranchFollow2.@OBJEXT@ \
     31        CbcBranchUser.@OBJEXT@ \
     32        CbcBranchLink.@OBJEXT@
    3033
    3134# CHANGEME: Additional libraries
     35# e.g., for driver2, put -lOsiCbc here
    3236ADDLIBS =
    3337
     
    8993  INCL = @CBCLIB_CFLAGS_INSTALLED@
    9094endif
    91 INCL += $(ADDINCFLAGS)
     95INCL += -I@srcdir@ $(ADDINCFLAGS)
    9296
    9397# Linker flags
     
    106110
    107111# Here we list all possible generated objects or executables to delete them
    108 CLEANFILES = \
     112CLEANFILES = $(EXTRAOBJS) \
     113        allCuts.@OBJEXT@ allCuts@EXEEXT@ \
     114        barrier.@OBJEXT@ barrier@EXEEXT@ \
     115        cbc_driverC_sos.@OBJEXT@ cbc_driverC_sos@EXEEXT@ \
    109116        crew.@OBJEXT@ crew@EXEEXT@ \
    110         barrier.@OBJEXT@ barrier@EXEEXT@ \
     117        driver.@OBJEXT@ driver@EXEEXT@ \
    111118        driver2.@OBJEXT@ driver2@EXEEXT@ \
    112         driver.@OBJEXT@ driver@EXEEXT@ \
    113         dynamic.@OBJEXT@ dynamic@EXEEXT@ \
     119        driver3.@OBJEXT@ driver3@EXEEXT@ \
     120        driver4.@OBJEXT@ driver4@EXEEXT@ \
    114121        fast0507b.@OBJEXT@ fast0507b@EXEEXT@ \
    115122        fast0507.@OBJEXT@ fast0507@EXEEXT@ \
    116123        gear.@OBJEXT@ gear@EXEEXT@ \
    117124        hotstart.@OBJEXT@ hotstart@EXEEXT@ \
     125        interrupt.@OBJEXT@ interrupt@EXEEXT@ \
    118126        link.@OBJEXT@ link@EXEEXT@ \
    119127        longthin.@OBJEXT@ longthin@EXEEXT@ \
    120128        lotsize.@OBJEXT@ lotsize@EXEEXT@ \
    121129        minimum.@OBJEXT@ minimum@EXEEXT@ \
     130        modify.@OBJEXT@ modify@EXEEXT@ \
    122131        nway.@OBJEXT@ nway@EXEEXT@ \
    123132        qmip.@OBJEXT@ qmip@EXEEXT@ \
     
    129138        sample4.@OBJEXT@ sample4@EXEEXT@ \
    130139        sample5.@OBJEXT@ sample5@EXEEXT@ \
     140        simpleBAB.@OBJEXT@ simpleBAB@EXEEXT@ \
    131141        sos.@OBJEXT@ sos@EXEEXT@ \
    132142        sudoku.@OBJEXT@ sudoku@EXEEXT@
     
    136146.SUFFIXES: .cpp .c .o .obj
    137147
    138 $(EXE): $(OBJS)
     148$(EXE): $(OBJS) $(EXTRAOBJS)
    139149        bla=;\
    140         for file in $(OBJS); do bla="$$bla `$(CYGPATH_W) $$file`"; done; \
     150        for file in $(OBJS) $(EXTRAOBJS); do bla="$$bla `$(CYGPATH_W) $$file`"; done; \
    141151        $(CXX) $(CXXLINKFLAGS) $(CXXFLAGS) -o $@ $$bla $(LIBS) $(ADDLIBS)
    142152
Note: See TracChangeset for help on using the changeset viewer.