Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • stable/2.8/Cbc/Makefile.in

    r1975 r1993  
    100100ETAGS = etags
    101101CTAGS = ctags
    102 DIST_SUBDIRS = src test
     102DIST_SUBDIRS = src src/OsiCbc test
    103103DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    104104distdir = $(PACKAGE)-$(VERSION)
     
    439439#                          Subdirectories                              #
    440440########################################################################
    441 SUBDIRS = src $(am__append_1)
     441
     442# Don't do src/OsiCbc recursively, since src/OsiCbc/libOsiCbc depends on src/libCbc
     443SUBDIRS = src src/OsiCbc $(am__append_1)
    442444
    443445########################################################################
     
    982984@COIN_HAS_PKGCONFIG_TRUE@       $(PKG_CONFIG) --libs cbc > $(addlibsdir)/cbc_addlibs.txt
    983985@COIN_CXX_IS_CL_TRUE@@COIN_HAS_PKGCONFIG_FALSE@ echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libCbc.lib @CBCLIB_LIBS_INSTALLED@" > $(addlibsdir)/cbc_addlibs.txt
    984 @COIN_CXX_IS_CL_FALSE@@COIN_HAS_PKGCONFIG_FALSE@        echo -L@abs_lib_dir@ -lCbc @CBCLIB_LIBS_INSTALLED@ > $(addlibsdir)/cbc_addlibs.txt
     986@COIN_CXX_IS_CL_FALSE@@COIN_HAS_PKGCONFIG_FALSE@        echo -L@abs_lib_dir@ -lCbcSolver -lCbc @CBCLIB_LIBS_INSTALLED@ > $(addlibsdir)/cbc_addlibs.txt
    985987
    986988uninstall-hook:
Note: See TracChangeset for help on using the changeset viewer.