Ignore:
Timestamp:
Dec 16, 2013 11:30:10 AM (6 years ago)
Author:
tkr
Message:

Merging r1996 from trunk

Location:
stable/1.15/Clp
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/1.15/Clp

  • stable/1.15/Clp/Makefile.in

    r2009 r2010  
    5454host_triplet = @host@
    5555
     56# Don't do src/OsiClp recursively, since src/OsiClp/libOsiClp depends on src/libClp
     57@COIN_HAS_OSI_TRUE@am__append_1 = src/OsiClp
     58
    5659# We don't want to compile the test subdirectory, unless the test target is
    5760# specified.  But we need to list it as subdirectory to make sure that it is
    5861# included in the tarball
    59 @ALWAYS_FALSE@am__append_1 = test
    60 @COIN_HAS_OSI_TRUE@am__append_2 = osi-clp.pc
     62@ALWAYS_FALSE@am__append_2 = test
     63@COIN_HAS_OSI_TRUE@am__append_3 = osi-clp.pc
    6164DIST_COMMON = README $(am__configure_deps) \
    6265        $(srcdir)/BuildTools/Makemain.inc $(srcdir)/Makefile.am \
     
    6871        $(top_srcdir)/src/OsiClp/osi-clp.pc.in AUTHORS config.guess \
    6972        config.sub depcomp install-sh ltmain.sh missing
    70 @HAVE_EXTERNALS_TRUE@am__append_3 = Dependencies
    71 @HAVE_EXTERNALS_TRUE@am__append_4 = .Dependencies-stamp
     73@HAVE_EXTERNALS_TRUE@am__append_4 = Dependencies
     74@HAVE_EXTERNALS_TRUE@am__append_5 = .Dependencies-stamp
    7275subdir = .
    7376ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    102105ETAGS = etags
    103106CTAGS = ctags
    104 DIST_SUBDIRS = src test
     107DIST_SUBDIRS = src src/OsiClp test
    105108DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    106109distdir = $(PACKAGE)-$(VERSION)
     
    373376#                          Subdirectories                              #
    374377########################################################################
    375 SUBDIRS = src $(am__append_1)
     378SUBDIRS = src $(am__append_1) $(am__append_2)
    376379
    377380########################################################################
     
    397400        examples/testBasis.cpp examples/testGub2.cpp \
    398401        examples/testGub.cpp examples/testQP.cpp \
    399         examples/useVolume.cpp $(am__append_3)
     402        examples/useVolume.cpp $(am__append_4)
    400403
    401404########################################################################
     
    403406########################################################################
    404407pkgconfiglibdir = $(libdir)/pkgconfig
    405 pkgconfiglib_DATA = clp.pc $(am__append_2)
     408pkgconfiglib_DATA = clp.pc $(am__append_3)
    406409addlibsdir = $(DESTDIR)$(datadir)/coin/doc/Clp
    407410
     
    412415
    413416# Files that are generated and should be cleaned with make distclean
    414 DISTCLEANFILES = $(am__append_4) $(VPATH_DISTCLEANFILES)
     417DISTCLEANFILES = $(am__append_5) $(VPATH_DISTCLEANFILES)
    415418DocFiles = README AUTHORS LICENSE
    416419DocInstallDir = $(datadir)/coin/doc/$(PACKAGE_NAME)
Note: See TracChangeset for help on using the changeset viewer.