Changeset 1559 for trunk/Clp/Makefile.in
- Timestamp:
- Jun 5, 2010 3:42:36 PM (11 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:externals
-
old new 1 BuildTools https://projects.coin-or.org/svn/BuildTools/stable/0.6 2 ThirdParty/Blas https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.0 3 ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.0 4 Data/Netlib https://projects.coin-or.org/svn/Data/stable/1.0/Netlib 5 Data/Sample https://projects.coin-or.org/svn/Data/stable/1.0/Sample 6 CoinUtils https://projects.coin-or.org/svn/CoinUtils/stable/2.6/CoinUtils 7 1 BuildTools https://projects.coin-or.org/svn/BuildTools/trunk 2 ThirdParty/Blas https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/trunk 3 ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/trunk 4 #Data/Netlib https://projects.coin-or.org/svn/Data/trunk/Netlib 5 Data/Sample https://projects.coin-or.org/svn/Data/trunk/Sample 6 CoinUtils https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
-
- Property svn:mergeinfo changed
/branches/split (added) merged: 1522,1527-1531,1542-1550,1558
- Property svn:externals
-
trunk/Clp/Makefile.in
r1162 r1559 30 30 # Documentation installation # 31 31 ######################################################################## 32 32 33 srcdir = @srcdir@ 33 34 top_srcdir = @top_srcdir@ … … 62 63 $(srcdir)/../ltmain.sh $(srcdir)/../missing \ 63 64 $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ 64 $(srcdir)/clp_addlibs.txt.in $(top_srcdir)/configure \ 65 $(top_srcdir)/examples/Makefile.in \ 66 $(top_srcdir)/inc/config_clp.h.in AUTHORS 65 $(srcdir)/clp-uninstalled.pc.in $(srcdir)/clp.pc.in \ 66 $(top_srcdir)/configure $(top_srcdir)/examples/Makefile.in \ 67 $(top_srcdir)/inc/config_clp.h.in \ 68 $(top_srcdir)/src/OsiClp/osi-clp-uninstalled.pc.in AUTHORS 67 69 @HAVE_EXTERNALS_TRUE@am__append_2 = Externals 68 70 @HAVE_EXTERNALS_TRUE@am__append_3 = .Externals-stamp … … 77 79 mkinstalldirs = $(install_sh) -d 78 80 CONFIG_HEADER = $(top_builddir)/inc/config_clp.h 79 CONFIG_CLEAN_FILES = examples/Makefile clp_addlibs.txt 81 CONFIG_CLEAN_FILES = examples/Makefile clp.pc clp-uninstalled.pc \ 82 osi-clp-uninstalled.pc 80 83 SOURCES = 81 84 DIST_SOURCES = … … 86 89 pdf-recursive ps-recursive uninstall-info-recursive \ 87 90 uninstall-recursive 91 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; 92 am__vpath_adj = case $$p in \ 93 $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ 94 *) f=$$p;; \ 95 esac; 96 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; 97 am__installdirs = "$(DESTDIR)$(addlibsdir)" \ 98 "$(DESTDIR)$(pkgconfiglibdir)" 99 addlibsDATA_INSTALL = $(INSTALL_DATA) 100 pkgconfiglibDATA_INSTALL = $(INSTALL_DATA) 101 DATA = $(addlibs_DATA) $(pkgconfiglib_DATA) 88 102 ETAGS = etags 89 103 CTAGS = ctags … … 100 114 distuninstallcheck_listfiles = find . -type f -print 101 115 distcleancheck_listfiles = find . -type f -print 116 ABSBUILDDIR = @ABSBUILDDIR@ 102 117 ACLOCAL = @ACLOCAL@ 103 118 ADDLIBS = @ADDLIBS@ … … 120 135 CDEFS = @CDEFS@ 121 136 CFLAGS = @CFLAGS@ 122 CLPDOCDIR = @CLPDOCDIR@ 123 CLPOBJDIR = @CLPOBJDIR@ 124 CLPSRCDIR = @CLPSRCDIR@ 125 COINUTILSDOCDIR = @COINUTILSDOCDIR@ 126 COINUTILSOBJDIR = @COINUTILSOBJDIR@ 127 COINUTILSSRCDIR = @COINUTILSSRCDIR@ 128 COIN_HAS_CLP_FALSE = @COIN_HAS_CLP_FALSE@ 129 COIN_HAS_CLP_TRUE = @COIN_HAS_CLP_TRUE@ 137 COINUTILS_CFLAGS = @COINUTILS_CFLAGS@ 138 COINUTILS_DATA = @COINUTILS_DATA@ 139 COINUTILS_LIBS = @COINUTILS_LIBS@ 130 140 COIN_HAS_COINUTILS_FALSE = @COIN_HAS_COINUTILS_FALSE@ 131 141 COIN_HAS_COINUTILS_TRUE = @COIN_HAS_COINUTILS_TRUE@ 142 COIN_HAS_NETLIB_FALSE = @COIN_HAS_NETLIB_FALSE@ 143 COIN_HAS_NETLIB_TRUE = @COIN_HAS_NETLIB_TRUE@ 144 COIN_HAS_OSITESTS_FALSE = @COIN_HAS_OSITESTS_FALSE@ 145 COIN_HAS_OSITESTS_TRUE = @COIN_HAS_OSITESTS_TRUE@ 146 COIN_HAS_OSI_FALSE = @COIN_HAS_OSI_FALSE@ 147 COIN_HAS_OSI_TRUE = @COIN_HAS_OSI_TRUE@ 148 COIN_HAS_PKGCONFIG_FALSE = @COIN_HAS_PKGCONFIG_FALSE@ 149 COIN_HAS_PKGCONFIG_TRUE = @COIN_HAS_PKGCONFIG_TRUE@ 150 COIN_HAS_SAMPLE_FALSE = @COIN_HAS_SAMPLE_FALSE@ 151 COIN_HAS_SAMPLE_TRUE = @COIN_HAS_SAMPLE_TRUE@ 152 COIN_PKG_CONFIG_PATH = @COIN_PKG_CONFIG_PATH@ 132 153 CPP = @CPP@ 133 154 CPPFLAGS = @CPPFLAGS@ … … 172 193 MPICC = @MPICC@ 173 194 MPICXX = @MPICXX@ 195 NETLIB_CFLAGS = @NETLIB_CFLAGS@ 196 NETLIB_DATA = @NETLIB_DATA@ 197 NETLIB_LIBS = @NETLIB_LIBS@ 174 198 OBJEXT = @OBJEXT@ 175 199 OPT_CFLAGS = @OPT_CFLAGS@ 176 200 OPT_CXXFLAGS = @OPT_CXXFLAGS@ 201 OSITESTS_CFLAGS = @OSITESTS_CFLAGS@ 202 OSITESTS_DATA = @OSITESTS_DATA@ 203 OSITESTS_LIBS = @OSITESTS_LIBS@ 204 OSI_CFLAGS = @OSI_CFLAGS@ 205 OSI_DATA = @OSI_DATA@ 206 OSI_LIBS = @OSI_LIBS@ 177 207 PACKAGE = @PACKAGE@ 178 208 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ … … 182 212 PACKAGE_VERSION = @PACKAGE_VERSION@ 183 213 PATH_SEPARATOR = @PATH_SEPARATOR@ 214 PKG_CONFIG = @PKG_CONFIG@ 184 215 RANLIB = @RANLIB@ 216 REQUIREDPACKAGES = @REQUIREDPACKAGES@ 185 217 RPATH_FLAGS = @RPATH_FLAGS@ 218 SAMPLE_CFLAGS = @SAMPLE_CFLAGS@ 219 SAMPLE_DATA = @SAMPLE_DATA@ 220 SAMPLE_LIBS = @SAMPLE_LIBS@ 186 221 SET_MAKE = @SET_MAKE@ 187 222 SHELL = @SHELL@ … … 189 224 VERSION = @VERSION@ 190 225 VPATH_DISTCLEANFILES = @VPATH_DISTCLEANFILES@ 226 _SVN_REV = @_SVN_REV@ 191 227 abs_bin_dir = @abs_bin_dir@ 192 228 abs_include_dir = @abs_include_dir@ … … 201 237 ac_ct_STRIP = @ac_ct_STRIP@ 202 238 ac_cxx_preproc_warn_flag = @ac_cxx_preproc_warn_flag@ 239 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ 203 240 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ 204 241 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ … … 221 258 have_automake = @have_automake@ 222 259 have_svn = @have_svn@ 260 have_svnversion = @have_svnversion@ 223 261 host = @host@ 224 262 host_alias = @host_alias@ … … 276 314 # Installation of the addlibs file # 277 315 ######################################################################## 278 addlibsfile = clp_addlibs.txt 279 addlibsdir = $(prefix)/share/doc/coin/$(PACKAGE_NAME)/ 316 @COIN_HAS_PKGCONFIG_TRUE@addlibsdir = $(datadir)/coin/doc/Clp 317 @COIN_HAS_PKGCONFIG_TRUE@addlibs_DATA = clp_addlibs.txt 318 pkgconfiglibdir = $(libdir)/pkgconfig 319 pkgconfiglib_DATA = clp.pc 280 320 281 321 ######################################################################## 282 322 # Maintainer Stuff # 283 323 ######################################################################## 324 CLEANFILES = clp_addlibs.txt 284 325 285 326 # Files that are generated and should be cleaned with make distclean 286 327 DISTCLEANFILES = $(am__append_3) $(VPATH_DISTCLEANFILES) 287 328 DocFiles = README AUTHORS LICENSE 288 DocInstallDir = $( prefix)/share/doc/coin/$(PACKAGE_NAME)329 DocInstallDir = $(datadir)/coin/doc/$(PACKAGE_NAME) 289 330 all: all-recursive 290 331 … … 342 383 examples/Makefile: $(top_builddir)/config.status $(top_srcdir)/examples/Makefile.in 343 384 cd $(top_builddir) && $(SHELL) ./config.status $@ 344 clp_addlibs.txt: $(top_builddir)/config.status $(srcdir)/clp_addlibs.txt.in 385 clp.pc: $(top_builddir)/config.status $(srcdir)/clp.pc.in 386 cd $(top_builddir) && $(SHELL) ./config.status $@ 387 clp-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/clp-uninstalled.pc.in 388 cd $(top_builddir) && $(SHELL) ./config.status $@ 389 osi-clp-uninstalled.pc: $(top_builddir)/config.status $(top_srcdir)/src/OsiClp/osi-clp-uninstalled.pc.in 345 390 cd $(top_builddir) && $(SHELL) ./config.status $@ 346 391 … … 354 399 -rm -f libtool 355 400 uninstall-info-am: 401 install-addlibsDATA: $(addlibs_DATA) 402 @$(NORMAL_INSTALL) 403 test -z "$(addlibsdir)" || $(mkdir_p) "$(DESTDIR)$(addlibsdir)" 404 @list='$(addlibs_DATA)'; for p in $$list; do \ 405 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ 406 f=$(am__strip_dir) \ 407 echo " $(addlibsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(addlibsdir)/$$f'"; \ 408 $(addlibsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(addlibsdir)/$$f"; \ 409 done 410 411 uninstall-addlibsDATA: 412 @$(NORMAL_UNINSTALL) 413 @list='$(addlibs_DATA)'; for p in $$list; do \ 414 f=$(am__strip_dir) \ 415 echo " rm -f '$(DESTDIR)$(addlibsdir)/$$f'"; \ 416 rm -f "$(DESTDIR)$(addlibsdir)/$$f"; \ 417 done 418 install-pkgconfiglibDATA: $(pkgconfiglib_DATA) 419 @$(NORMAL_INSTALL) 420 test -z "$(pkgconfiglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfiglibdir)" 421 @list='$(pkgconfiglib_DATA)'; for p in $$list; do \ 422 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ 423 f=$(am__strip_dir) \ 424 echo " $(pkgconfiglibDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfiglibdir)/$$f'"; \ 425 $(pkgconfiglibDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfiglibdir)/$$f"; \ 426 done 427 428 uninstall-pkgconfiglibDATA: 429 @$(NORMAL_UNINSTALL) 430 @list='$(pkgconfiglib_DATA)'; for p in $$list; do \ 431 f=$(am__strip_dir) \ 432 echo " rm -f '$(DESTDIR)$(pkgconfiglibdir)/$$f'"; \ 433 rm -f "$(DESTDIR)$(pkgconfiglibdir)/$$f"; \ 434 done 356 435 357 436 # This directory's subdirectories are mostly independent; you can cd … … 490 569 $(am__remove_distdir) 491 570 mkdir $(distdir) 492 $(mkdir_p) $(distdir)/. $(distdir)/.. $(distdir)/../BuildTools $(distdir)/doc $(distdir)/doc/Howto $(distdir)/examples $(distdir)/inc 571 $(mkdir_p) $(distdir)/. $(distdir)/.. $(distdir)/../BuildTools $(distdir)/doc $(distdir)/doc/Howto $(distdir)/examples $(distdir)/inc $(distdir)/src/OsiClp 493 572 @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ 494 573 topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ … … 631 710 check-am: all-am 632 711 check: check-recursive 633 all-am: Makefile 712 all-am: Makefile $(DATA) 634 713 installdirs: installdirs-recursive 635 714 installdirs-am: 715 for dir in "$(DESTDIR)$(addlibsdir)" "$(DESTDIR)$(pkgconfiglibdir)"; do \ 716 test -z "$$dir" || $(mkdir_p) "$$dir"; \ 717 done 636 718 install: install-recursive 637 719 install-exec: install-exec-recursive … … 651 733 652 734 clean-generic: 735 -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) 653 736 654 737 distclean-generic: … … 679 762 info-am: 680 763 681 install-data-am: 764 install-data-am: install-addlibsDATA install-pkgconfiglibDATA 682 765 683 766 install-exec-am: install-exec-local … … 707 790 ps-am: 708 791 709 uninstall-am: uninstall-info-am uninstall-local 792 uninstall-am: uninstall-addlibsDATA uninstall-info-am uninstall-local \ 793 uninstall-pkgconfiglibDATA 710 794 711 795 uninstall-info: uninstall-info-recursive … … 718 802 distclean-local distclean-recursive distclean-tags \ 719 803 distcleancheck distdir distuninstallcheck dvi dvi-am html \ 720 html-am info info-am install install-a m install-data\721 install-data -am install-exec install-exec-am \804 html-am info info-am install install-addlibsDATA install-am \ 805 install-data install-data-am install-exec install-exec-am \ 722 806 install-exec-local install-info install-info-am install-man \ 723 install-strip installcheck installcheck-am installdirs \ 724 installdirs-am maintainer-clean maintainer-clean-generic \ 725 maintainer-clean-recursive mostlyclean mostlyclean-generic \ 726 mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ 727 tags tags-recursive uninstall uninstall-am uninstall-info-am \ 728 uninstall-local 807 install-pkgconfiglibDATA install-strip installcheck \ 808 installcheck-am installdirs installdirs-am maintainer-clean \ 809 maintainer-clean-generic maintainer-clean-recursive \ 810 mostlyclean mostlyclean-generic mostlyclean-libtool \ 811 mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ 812 uninstall uninstall-addlibsDATA uninstall-am uninstall-info-am \ 813 uninstall-local uninstall-pkgconfiglibDATA 729 814 730 815 … … 744 829 if test -r test/Makefile; then cd test; $(MAKE) distclean; fi 745 830 831 install-exec-local: install-doc 832 833 uninstall-local: uninstall-doc 834 746 835 .PHONY: test unitTest 747 836 748 install-exec-local: install-doc 749 $(install_sh_DATA) $(addlibsfile) $(DESTDIR)$(addlibsdir)/$(addlibsfile) 750 751 uninstall-local: uninstall-doc 752 rm -f $(DESTDIR)$(addlibsdir)/$(addlibsfile) 837 @COIN_HAS_PKGCONFIG_TRUE@clp_addlibs.txt : clp.pc 838 @COIN_HAS_PKGCONFIG_TRUE@ PKG_CONFIG_PATH=.:@COIN_PKG_CONFIG_PATH@ $(PKG_CONFIG) --libs clp > clp_addlibs.txt 753 839 754 840 install-doc: $(DocFiles)
Note: See TracChangeset
for help on using the changeset viewer.