Changeset 1568
- Timestamp:
- Jan 2, 2011 10:05:27 AM (10 years ago)
- Location:
- trunk/Cbc
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Cbc/cbc.pc.in
r1566 r1568 1 1 prefix=@prefix@ 2 2 exec_prefix=@exec_prefix@ 3 libdir=@libdir@ /coin3 libdir=@libdir@ 4 4 includedir=@includedir@/coin 5 5 -
trunk/Cbc/osi-cbc.pc.in
r1566 r1568 1 1 prefix=@prefix@ 2 2 exec_prefix=@exec_prefix@ 3 libdir=@libdir@ /coin3 libdir=@libdir@ 4 4 includedir=@includedir@/coin 5 5 -
trunk/Cbc/src/Makefile.am
r1565 r1568 17 17 # Name of the library compiled in this directory. We want it to be installed 18 18 # in the 'lib' directory 19 coinlibdir = ${libdir}/coin 20 coinlib_LTLIBRARIES = libCbc.la libCbcSolver.la 19 lib_LTLIBRARIES = libCbc.la libCbcSolver.la 21 20 22 21 # List all source files for this library, including headers -
trunk/Cbc/src/Makefile.in
r1566 r1568 84 84 esac; 85 85 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; 86 am__installdirs = "$(DESTDIR)$( coinlibdir)" "$(DESTDIR)$(bindir)" \86 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ 87 87 "$(DESTDIR)$(includecoindir)" 88 coinlibLTLIBRARIES_INSTALL = $(INSTALL)89 LTLIBRARIES = $( coinlib_LTLIBRARIES)88 libLTLIBRARIES_INSTALL = $(INSTALL) 89 LTLIBRARIES = $(lib_LTLIBRARIES) 90 90 libCbc_la_LIBADD = 91 91 am_libCbc_la_OBJECTS = Cbc_C_Interface.lo CbcBranchAllDifferent.lo \ … … 512 512 # Name of the library compiled in this directory. We want it to be installed 513 513 # in the 'lib' directory 514 coinlibdir = ${libdir}/coin 515 coinlib_LTLIBRARIES = libCbc.la libCbcSolver.la 514 lib_LTLIBRARIES = libCbc.la libCbcSolver.la 516 515 517 516 # List all source files for this library, including headers … … 770 769 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) 771 770 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh 772 install- coinlibLTLIBRARIES: $(coinlib_LTLIBRARIES)771 install-libLTLIBRARIES: $(lib_LTLIBRARIES) 773 772 @$(NORMAL_INSTALL) 774 test -z "$( coinlibdir)" || $(mkdir_p) "$(DESTDIR)$(coinlibdir)"775 @list='$( coinlib_LTLIBRARIES)'; for p in $$list; do \773 test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" 774 @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ 776 775 if test -f $$p; then \ 777 776 f=$(am__strip_dir) \ 778 echo " $(LIBTOOL) --mode=install $( coinlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(coinlibdir)/$$f'"; \779 $(LIBTOOL) --mode=install $( coinlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(coinlibdir)/$$f"; \777 echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ 778 $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ 780 779 else :; fi; \ 781 780 done 782 781 783 uninstall- coinlibLTLIBRARIES:782 uninstall-libLTLIBRARIES: 784 783 @$(NORMAL_UNINSTALL) 785 @set -x; list='$( coinlib_LTLIBRARIES)'; for p in $$list; do \784 @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \ 786 785 p=$(am__strip_dir) \ 787 echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$( coinlibdir)/$$p'"; \788 $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$( coinlibdir)/$$p"; \786 echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ 787 $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ 789 788 done 790 789 791 clean- coinlibLTLIBRARIES:792 -test -z "$( coinlib_LTLIBRARIES)" || rm -f $(coinlib_LTLIBRARIES)793 @list='$( coinlib_LTLIBRARIES)'; for p in $$list; do \790 clean-libLTLIBRARIES: 791 -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) 792 @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ 794 793 dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ 795 794 test "$$dir" != "$$p" || dir=.; \ … … 798 797 done 799 798 libCbc.la: $(libCbc_la_OBJECTS) $(libCbc_la_DEPENDENCIES) 800 $(CXXLINK) -rpath $( coinlibdir) $(libCbc_la_LDFLAGS) $(libCbc_la_OBJECTS) $(libCbc_la_LIBADD) $(LIBS)799 $(CXXLINK) -rpath $(libdir) $(libCbc_la_LDFLAGS) $(libCbc_la_OBJECTS) $(libCbc_la_LIBADD) $(LIBS) 801 800 libCbcSolver.la: $(libCbcSolver_la_OBJECTS) $(libCbcSolver_la_DEPENDENCIES) 802 $(CXXLINK) -rpath $( coinlibdir) $(libCbcSolver_la_LDFLAGS) $(libCbcSolver_la_OBJECTS) $(libCbcSolver_la_LIBADD) $(LIBS)801 $(CXXLINK) -rpath $(libdir) $(libCbcSolver_la_LDFLAGS) $(libCbcSolver_la_OBJECTS) $(libCbcSolver_la_LIBADD) $(LIBS) 803 802 install-binPROGRAMS: $(bin_PROGRAMS) 804 803 @$(NORMAL_INSTALL) … … 1154 1153 check: check-recursive 1155 1154 all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) 1155 install-binPROGRAMS: install-libLTLIBRARIES 1156 1156 1157 installdirs: installdirs-recursive 1157 1158 installdirs-am: 1158 for dir in "$(DESTDIR)$( coinlibdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includecoindir)"; do \1159 for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includecoindir)"; do \ 1159 1160 test -z "$$dir" || $(mkdir_p) "$$dir"; \ 1160 1161 done … … 1185 1186 clean: clean-recursive 1186 1187 1187 clean-am: clean-binPROGRAMS clean- coinlibLTLIBRARIES clean-generic\1188 clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ 1188 1189 clean-libtool mostlyclean-am 1189 1190 … … 1204 1205 info-am: 1205 1206 1206 install-data-am: install-coinlibLTLIBRARIES install-includecoinHEADERS 1207 1208 install-exec-am: install-binPROGRAMS install-exec-local 1207 install-data-am: install-includecoinHEADERS 1208 1209 install-exec-am: install-binPROGRAMS install-exec-local \ 1210 install-libLTLIBRARIES 1209 1211 1210 1212 install-info: install-info-recursive … … 1232 1234 ps-am: 1233 1235 1234 uninstall-am: uninstall-binPROGRAMS uninstall- coinlibLTLIBRARIES \1235 uninstall-in cludecoinHEADERS uninstall-info-amuninstall-local1236 uninstall-am: uninstall-binPROGRAMS uninstall-includecoinHEADERS \ 1237 uninstall-info-am uninstall-libLTLIBRARIES uninstall-local 1236 1238 1237 1239 uninstall-info: uninstall-info-recursive 1238 1240 1239 1241 .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ 1240 clean clean-binPROGRAMS clean- coinlibLTLIBRARIES clean-generic\1242 clean clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ 1241 1243 clean-libtool clean-recursive ctags ctags-recursive distclean \ 1242 1244 distclean-compile distclean-generic distclean-libtool \ 1243 1245 distclean-recursive distclean-tags distdir dvi dvi-am html \ 1244 1246 html-am info info-am install install-am install-binPROGRAMS \ 1245 install-coinlibLTLIBRARIES install-data install-data-am \ 1246 install-exec install-exec-am install-exec-local \ 1247 install-includecoinHEADERS install-info install-info-am \ 1248 install-man install-strip installcheck installcheck-am \ 1249 installdirs installdirs-am maintainer-clean \ 1250 maintainer-clean-generic maintainer-clean-recursive \ 1251 mostlyclean mostlyclean-compile mostlyclean-generic \ 1252 mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ 1253 tags tags-recursive uninstall uninstall-am \ 1254 uninstall-binPROGRAMS uninstall-coinlibLTLIBRARIES \ 1255 uninstall-includecoinHEADERS uninstall-info-am uninstall-local 1247 install-data install-data-am install-exec install-exec-am \ 1248 install-exec-local install-includecoinHEADERS install-info \ 1249 install-info-am install-libLTLIBRARIES install-man \ 1250 install-strip installcheck installcheck-am installdirs \ 1251 installdirs-am maintainer-clean maintainer-clean-generic \ 1252 maintainer-clean-recursive mostlyclean mostlyclean-compile \ 1253 mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ 1254 pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ 1255 uninstall-binPROGRAMS uninstall-includecoinHEADERS \ 1256 uninstall-info-am uninstall-libLTLIBRARIES uninstall-local 1256 1257 1257 1258 -
trunk/Cbc/src/OsiCbc/Makefile.am
r1565 r1568 14 14 15 15 # Name of the library compiled in this directory. 16 coinlibdir = ${libdir}/coin 17 coinlib_LTLIBRARIES = libOsiCbc.la 16 lib_LTLIBRARIES = libOsiCbc.la 18 17 19 18 # List all source files for this library, including headers -
trunk/Cbc/src/OsiCbc/Makefile.in
r1566 r1568 71 71 esac; 72 72 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; 73 am__installdirs = "$(DESTDIR)$(coinlibdir)" \ 74 "$(DESTDIR)$(includecoindir)" 75 coinlibLTLIBRARIES_INSTALL = $(INSTALL) 76 LTLIBRARIES = $(coinlib_LTLIBRARIES) 73 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includecoindir)" 74 libLTLIBRARIES_INSTALL = $(INSTALL) 75 LTLIBRARIES = $(lib_LTLIBRARIES) 77 76 libOsiCbc_la_LIBADD = 78 77 am_libOsiCbc_la_OBJECTS = OsiCbcSolverInterface.lo … … 430 429 431 430 # Name of the library compiled in this directory. 432 coinlibdir = ${libdir}/coin 433 coinlib_LTLIBRARIES = libOsiCbc.la 431 lib_LTLIBRARIES = libOsiCbc.la 434 432 435 433 # List all source files for this library, including headers … … 495 493 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) 496 494 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh 497 install- coinlibLTLIBRARIES: $(coinlib_LTLIBRARIES)495 install-libLTLIBRARIES: $(lib_LTLIBRARIES) 498 496 @$(NORMAL_INSTALL) 499 test -z "$( coinlibdir)" || $(mkdir_p) "$(DESTDIR)$(coinlibdir)"500 @list='$( coinlib_LTLIBRARIES)'; for p in $$list; do \497 test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" 498 @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ 501 499 if test -f $$p; then \ 502 500 f=$(am__strip_dir) \ 503 echo " $(LIBTOOL) --mode=install $( coinlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(coinlibdir)/$$f'"; \504 $(LIBTOOL) --mode=install $( coinlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(coinlibdir)/$$f"; \501 echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ 502 $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ 505 503 else :; fi; \ 506 504 done 507 505 508 uninstall- coinlibLTLIBRARIES:506 uninstall-libLTLIBRARIES: 509 507 @$(NORMAL_UNINSTALL) 510 @set -x; list='$( coinlib_LTLIBRARIES)'; for p in $$list; do \508 @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \ 511 509 p=$(am__strip_dir) \ 512 echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$( coinlibdir)/$$p'"; \513 $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$( coinlibdir)/$$p"; \510 echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ 511 $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ 514 512 done 515 513 516 clean- coinlibLTLIBRARIES:517 -test -z "$( coinlib_LTLIBRARIES)" || rm -f $(coinlib_LTLIBRARIES)518 @list='$( coinlib_LTLIBRARIES)'; for p in $$list; do \514 clean-libLTLIBRARIES: 515 -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) 516 @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ 519 517 dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ 520 518 test "$$dir" != "$$p" || dir=.; \ … … 523 521 done 524 522 libOsiCbc.la: $(libOsiCbc_la_OBJECTS) $(libOsiCbc_la_DEPENDENCIES) 525 $(CXXLINK) -rpath $( coinlibdir) $(libOsiCbc_la_LDFLAGS) $(libOsiCbc_la_OBJECTS) $(libOsiCbc_la_LIBADD) $(LIBS)523 $(CXXLINK) -rpath $(libdir) $(libOsiCbc_la_LDFLAGS) $(libOsiCbc_la_OBJECTS) $(libOsiCbc_la_LIBADD) $(LIBS) 526 524 527 525 mostlyclean-compile: … … 660 658 all-am: Makefile $(LTLIBRARIES) $(HEADERS) 661 659 installdirs: 662 for dir in "$(DESTDIR)$( coinlibdir)" "$(DESTDIR)$(includecoindir)"; do \660 for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includecoindir)"; do \ 663 661 test -z "$$dir" || $(mkdir_p) "$$dir"; \ 664 662 done … … 689 687 clean: clean-am 690 688 691 clean-am: clean- coinlibLTLIBRARIES clean-genericclean-libtool \689 clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ 692 690 mostlyclean-am 693 691 … … 708 706 info-am: 709 707 710 install-data-am: install- coinlibLTLIBRARIES install-includecoinHEADERS711 712 install-exec-am: 708 install-data-am: install-includecoinHEADERS 709 710 install-exec-am: install-libLTLIBRARIES 713 711 714 712 install-info: install-info-am … … 736 734 ps-am: 737 735 738 uninstall-am: uninstall- coinlibLTLIBRARIES\739 uninstall- includecoinHEADERS uninstall-info-am740 741 .PHONY: CTAGS GTAGS all all-am check check-am clean \742 clean- coinlibLTLIBRARIES clean-generic clean-libtool ctags\743 distclean distclean-compile distclean-generic\744 distclean- libtool distclean-tags distdir dvi dvi-am html\745 html-am info info-am install install-am\746 install- coinlibLTLIBRARIES install-data install-data-am\747 install- exec install-exec-am install-includecoinHEADERS\748 install- info install-info-am install-man install-strip\749 installcheck installcheck-am installdirs maintainer-clean \750 m aintainer-clean-generic mostlyclean mostlyclean-compile\751 mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \752 tags uninstall uninstall-am uninstall-coinlibLTLIBRARIES\753 uninstall- includecoinHEADERS uninstall-info-am736 uninstall-am: uninstall-includecoinHEADERS uninstall-info-am \ 737 uninstall-libLTLIBRARIES 738 739 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ 740 clean-libLTLIBRARIES clean-libtool ctags distclean \ 741 distclean-compile distclean-generic distclean-libtool \ 742 distclean-tags distdir dvi dvi-am html html-am info info-am \ 743 install install-am install-data install-data-am install-exec \ 744 install-exec-am install-includecoinHEADERS install-info \ 745 install-info-am install-libLTLIBRARIES install-man \ 746 install-strip installcheck installcheck-am installdirs \ 747 maintainer-clean maintainer-clean-generic mostlyclean \ 748 mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ 749 pdf pdf-am ps ps-am tags uninstall uninstall-am \ 750 uninstall-includecoinHEADERS uninstall-info-am \ 751 uninstall-libLTLIBRARIES 754 752 755 753 # Tell versions [3.59,3.63) of GNU make to not export all variables.
Note: See TracChangeset
for help on using the changeset viewer.