- Timestamp:
- Jan 2, 2011 9:33:56 AM (10 years ago)
- Location:
- trunk/Clp
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Clp/clp.pc.in
r1657 r1659 1 1 prefix=@prefix@ 2 2 exec_prefix=@exec_prefix@ 3 libdir=@libdir@ /coin3 libdir=@libdir@ 4 4 includedir=@includedir@/coin 5 5 -
trunk/Clp/src/Makefile.am
r1655 r1659 18 18 19 19 # Name of the library compiled in this directory. We want it to be installed 20 # in the 'lib/coin' directory 21 coinlibdir = ${libdir}/coin 22 coinlib_LTLIBRARIES = libClp.la 20 # in the 'lib' directory 21 lib_LTLIBRARIES = libClp.la 23 22 24 23 # List all source files for this library, including headers … … 105 104 # library is found (in the lib install directory) when we are using dynamic 106 105 # libraries. 107 clp_LDFLAGS = -rpath $( coinlibdir)106 clp_LDFLAGS = -rpath $(libdir) 108 107 109 108 ######################################################################## -
trunk/Clp/src/Makefile.in
r1657 r1659 63 63 esac; 64 64 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; 65 am__installdirs = "$(DESTDIR)$( coinlibdir)" "$(DESTDIR)$(bindir)" \65 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ 66 66 "$(DESTDIR)$(includecoindir)" 67 coinlibLTLIBRARIES_INSTALL = $(INSTALL)68 LTLIBRARIES = $( coinlib_LTLIBRARIES)67 libLTLIBRARIES_INSTALL = $(INSTALL) 68 LTLIBRARIES = $(lib_LTLIBRARIES) 69 69 libClp_la_LIBADD = 70 70 am_libClp_la_OBJECTS = ClpCholeskyBase.lo ClpCholeskyDense.lo \ … … 342 342 343 343 # Name of the library compiled in this directory. We want it to be installed 344 # in the 'lib/coin' directory 345 coinlibdir = ${libdir}/coin 346 coinlib_LTLIBRARIES = libClp.la 344 # in the 'lib' directory 345 lib_LTLIBRARIES = libClp.la 347 346 348 347 # List all source files for this library, including headers … … 423 422 # library is found (in the lib install directory) when we are using dynamic 424 423 # libraries. 425 clp_LDFLAGS = -rpath $( coinlibdir)424 clp_LDFLAGS = -rpath $(libdir) 426 425 427 426 ######################################################################## … … 503 502 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) 504 503 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh 505 install- coinlibLTLIBRARIES: $(coinlib_LTLIBRARIES)504 install-libLTLIBRARIES: $(lib_LTLIBRARIES) 506 505 @$(NORMAL_INSTALL) 507 test -z "$( coinlibdir)" || $(mkdir_p) "$(DESTDIR)$(coinlibdir)"508 @list='$( coinlib_LTLIBRARIES)'; for p in $$list; do \506 test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" 507 @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ 509 508 if test -f $$p; then \ 510 509 f=$(am__strip_dir) \ 511 echo " $(LIBTOOL) --mode=install $( coinlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(coinlibdir)/$$f'"; \512 $(LIBTOOL) --mode=install $( coinlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(coinlibdir)/$$f"; \510 echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ 511 $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ 513 512 else :; fi; \ 514 513 done 515 514 516 uninstall- coinlibLTLIBRARIES:515 uninstall-libLTLIBRARIES: 517 516 @$(NORMAL_UNINSTALL) 518 @set -x; list='$( coinlib_LTLIBRARIES)'; for p in $$list; do \517 @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \ 519 518 p=$(am__strip_dir) \ 520 echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$( coinlibdir)/$$p'"; \521 $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$( coinlibdir)/$$p"; \522 done 523 524 clean- coinlibLTLIBRARIES:525 -test -z "$( coinlib_LTLIBRARIES)" || rm -f $(coinlib_LTLIBRARIES)526 @list='$( coinlib_LTLIBRARIES)'; for p in $$list; do \519 echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ 520 $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ 521 done 522 523 clean-libLTLIBRARIES: 524 -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) 525 @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ 527 526 dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ 528 527 test "$$dir" != "$$p" || dir=.; \ … … 531 530 done 532 531 libClp.la: $(libClp_la_OBJECTS) $(libClp_la_DEPENDENCIES) 533 $(CXXLINK) -rpath $( coinlibdir) $(libClp_la_LDFLAGS) $(libClp_la_OBJECTS) $(libClp_la_LIBADD) $(LIBS)532 $(CXXLINK) -rpath $(libdir) $(libClp_la_LDFLAGS) $(libClp_la_OBJECTS) $(libClp_la_LIBADD) $(LIBS) 534 533 install-binPROGRAMS: $(bin_PROGRAMS) 535 534 @$(NORMAL_INSTALL) … … 852 851 check: check-recursive 853 852 all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) 853 install-binPROGRAMS: install-libLTLIBRARIES 854 854 855 installdirs: installdirs-recursive 855 856 installdirs-am: 856 for dir in "$(DESTDIR)$( coinlibdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includecoindir)"; do \857 for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includecoindir)"; do \ 857 858 test -z "$$dir" || $(mkdir_p) "$$dir"; \ 858 859 done … … 883 884 clean: clean-recursive 884 885 885 clean-am: clean-binPROGRAMS clean- coinlibLTLIBRARIES clean-generic\886 clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ 886 887 clean-libtool mostlyclean-am 887 888 … … 902 903 info-am: 903 904 904 install-data-am: install-coinlibLTLIBRARIES install-includecoinHEADERS 905 906 install-exec-am: install-binPROGRAMS install-exec-local 905 install-data-am: install-includecoinHEADERS 906 907 install-exec-am: install-binPROGRAMS install-exec-local \ 908 install-libLTLIBRARIES 907 909 908 910 install-info: install-info-recursive … … 930 932 ps-am: 931 933 932 uninstall-am: uninstall-binPROGRAMS uninstall- coinlibLTLIBRARIES \933 uninstall-in cludecoinHEADERS uninstall-info-amuninstall-local934 uninstall-am: uninstall-binPROGRAMS uninstall-includecoinHEADERS \ 935 uninstall-info-am uninstall-libLTLIBRARIES uninstall-local 934 936 935 937 uninstall-info: uninstall-info-recursive 936 938 937 939 .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ 938 clean clean-binPROGRAMS clean- coinlibLTLIBRARIES clean-generic\940 clean clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ 939 941 clean-libtool clean-recursive ctags ctags-recursive distclean \ 940 942 distclean-compile distclean-generic distclean-libtool \ 941 943 distclean-recursive distclean-tags distdir dvi dvi-am html \ 942 944 html-am info info-am install install-am install-binPROGRAMS \ 943 install-coinlibLTLIBRARIES install-data install-data-am \ 944 install-exec install-exec-am install-exec-local \ 945 install-includecoinHEADERS install-info install-info-am \ 946 install-man install-strip installcheck installcheck-am \ 947 installdirs installdirs-am maintainer-clean \ 948 maintainer-clean-generic maintainer-clean-recursive \ 949 mostlyclean mostlyclean-compile mostlyclean-generic \ 950 mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ 951 tags tags-recursive uninstall uninstall-am \ 952 uninstall-binPROGRAMS uninstall-coinlibLTLIBRARIES \ 953 uninstall-includecoinHEADERS uninstall-info-am uninstall-local 945 install-data install-data-am install-exec install-exec-am \ 946 install-exec-local install-includecoinHEADERS install-info \ 947 install-info-am install-libLTLIBRARIES install-man \ 948 install-strip installcheck installcheck-am installdirs \ 949 installdirs-am maintainer-clean maintainer-clean-generic \ 950 maintainer-clean-recursive mostlyclean mostlyclean-compile \ 951 mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ 952 pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ 953 uninstall-binPROGRAMS uninstall-includecoinHEADERS \ 954 uninstall-info-am uninstall-libLTLIBRARIES uninstall-local 954 955 955 956 -
trunk/Clp/src/OsiClp/Makefile.am
r1655 r1659 14 14 15 15 # Name of the library compiled in this directory. 16 coinlibdir = ${libdir}/coin 17 coinlib_LTLIBRARIES = libOsiClp.la 16 lib_LTLIBRARIES = libOsiClp.la 18 17 19 18 # List all source files for this library, including headers -
trunk/Clp/src/OsiClp/Makefile.in
r1657 r1659 61 61 esac; 62 62 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; 63 am__installdirs = "$(DESTDIR)$(coinlibdir)" \ 64 "$(DESTDIR)$(includecoindir)" 65 coinlibLTLIBRARIES_INSTALL = $(INSTALL) 66 LTLIBRARIES = $(coinlib_LTLIBRARIES) 63 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includecoindir)" 64 libLTLIBRARIES_INSTALL = $(INSTALL) 65 LTLIBRARIES = $(lib_LTLIBRARIES) 67 66 libOsiClp_la_LIBADD = 68 67 am_libOsiClp_la_OBJECTS = OsiClpSolverInterface.lo … … 308 307 309 308 # Name of the library compiled in this directory. 310 coinlibdir = ${libdir}/coin 311 coinlib_LTLIBRARIES = libOsiClp.la 309 lib_LTLIBRARIES = libOsiClp.la 312 310 313 311 # List all source files for this library, including headers … … 370 368 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) 371 369 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh 372 install- coinlibLTLIBRARIES: $(coinlib_LTLIBRARIES)370 install-libLTLIBRARIES: $(lib_LTLIBRARIES) 373 371 @$(NORMAL_INSTALL) 374 test -z "$( coinlibdir)" || $(mkdir_p) "$(DESTDIR)$(coinlibdir)"375 @list='$( coinlib_LTLIBRARIES)'; for p in $$list; do \372 test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" 373 @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ 376 374 if test -f $$p; then \ 377 375 f=$(am__strip_dir) \ 378 echo " $(LIBTOOL) --mode=install $( coinlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(coinlibdir)/$$f'"; \379 $(LIBTOOL) --mode=install $( coinlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(coinlibdir)/$$f"; \376 echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ 377 $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ 380 378 else :; fi; \ 381 379 done 382 380 383 uninstall- coinlibLTLIBRARIES:381 uninstall-libLTLIBRARIES: 384 382 @$(NORMAL_UNINSTALL) 385 @set -x; list='$( coinlib_LTLIBRARIES)'; for p in $$list; do \383 @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \ 386 384 p=$(am__strip_dir) \ 387 echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$( coinlibdir)/$$p'"; \388 $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$( coinlibdir)/$$p"; \385 echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ 386 $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ 389 387 done 390 388 391 clean- coinlibLTLIBRARIES:392 -test -z "$( coinlib_LTLIBRARIES)" || rm -f $(coinlib_LTLIBRARIES)393 @list='$( coinlib_LTLIBRARIES)'; for p in $$list; do \389 clean-libLTLIBRARIES: 390 -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) 391 @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ 394 392 dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ 395 393 test "$$dir" != "$$p" || dir=.; \ … … 398 396 done 399 397 libOsiClp.la: $(libOsiClp_la_OBJECTS) $(libOsiClp_la_DEPENDENCIES) 400 $(CXXLINK) -rpath $( coinlibdir) $(libOsiClp_la_LDFLAGS) $(libOsiClp_la_OBJECTS) $(libOsiClp_la_LIBADD) $(LIBS)398 $(CXXLINK) -rpath $(libdir) $(libOsiClp_la_LDFLAGS) $(libOsiClp_la_OBJECTS) $(libOsiClp_la_LIBADD) $(LIBS) 401 399 402 400 mostlyclean-compile: … … 535 533 all-am: Makefile $(LTLIBRARIES) $(HEADERS) 536 534 installdirs: 537 for dir in "$(DESTDIR)$( coinlibdir)" "$(DESTDIR)$(includecoindir)"; do \535 for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includecoindir)"; do \ 538 536 test -z "$$dir" || $(mkdir_p) "$$dir"; \ 539 537 done … … 564 562 clean: clean-am 565 563 566 clean-am: clean- coinlibLTLIBRARIES clean-genericclean-libtool \564 clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ 567 565 mostlyclean-am 568 566 … … 583 581 info-am: 584 582 585 install-data-am: install- coinlibLTLIBRARIES install-includecoinHEADERS586 587 install-exec-am: 583 install-data-am: install-includecoinHEADERS 584 585 install-exec-am: install-libLTLIBRARIES 588 586 589 587 install-info: install-info-am … … 611 609 ps-am: 612 610 613 uninstall-am: uninstall- coinlibLTLIBRARIES\614 uninstall- includecoinHEADERS uninstall-info-am615 616 .PHONY: CTAGS GTAGS all all-am check check-am clean \617 clean- coinlibLTLIBRARIES clean-generic clean-libtool ctags\618 distclean distclean-compile distclean-generic\619 distclean- libtool distclean-tags distdir dvi dvi-am html\620 html-am info info-am install install-am\621 install- coinlibLTLIBRARIES install-data install-data-am\622 install- exec install-exec-am install-includecoinHEADERS\623 install- info install-info-am install-man install-strip\624 installcheck installcheck-am installdirs maintainer-clean \625 m aintainer-clean-generic mostlyclean mostlyclean-compile\626 mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \627 tags uninstall uninstall-am uninstall-coinlibLTLIBRARIES\628 uninstall- includecoinHEADERS uninstall-info-am611 uninstall-am: uninstall-includecoinHEADERS uninstall-info-am \ 612 uninstall-libLTLIBRARIES 613 614 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ 615 clean-libLTLIBRARIES clean-libtool ctags distclean \ 616 distclean-compile distclean-generic distclean-libtool \ 617 distclean-tags distdir dvi dvi-am html html-am info info-am \ 618 install install-am install-data install-data-am install-exec \ 619 install-exec-am install-includecoinHEADERS install-info \ 620 install-info-am install-libLTLIBRARIES install-man \ 621 install-strip installcheck installcheck-am installdirs \ 622 maintainer-clean maintainer-clean-generic mostlyclean \ 623 mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ 624 pdf pdf-am ps ps-am tags uninstall uninstall-am \ 625 uninstall-includecoinHEADERS uninstall-info-am \ 626 uninstall-libLTLIBRARIES 629 627 630 628 # Tell versions [3.59,3.63) of GNU make to not export all variables. -
trunk/Clp/src/OsiClp/osi-clp.pc.in
r1657 r1659 1 1 prefix=@prefix@ 2 2 exec_prefix=@exec_prefix@ 3 libdir=@libdir@ /coin3 libdir=@libdir@ 4 4 includedir=@includedir@/coin 5 5
Note: See TracChangeset
for help on using the changeset viewer.