Changeset 1464 for trunk/Cbc/Makefile.in


Ignore:
Timestamp:
Jun 7, 2010 8:27:42 AM (9 years ago)
Author:
stefan
Message:

merge split branch into trunk; fix some examples

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk

    • Property svn:externals
      •  

        old new  
        1 BuildTools        https://projects.coin-or.org/svn/BuildTools/stable/0.5
        2 ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.0
        3 ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.0
        4 ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.0
        5 ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.5
        6 Data/Sample       https://projects.coin-or.org/svn/Data/stable/1.0/Sample
        7 CoinUtils         https://projects.coin-or.org/svn/CoinUtils/stable/2.6/CoinUtils
        8 Cgl               https://projects.coin-or.org/svn/Cgl/stable/0.55/Cgl
        9 Clp               https://projects.coin-or.org/svn/Clp/stable/1.12/Clp
        10 Osi               https://projects.coin-or.org/svn/Osi/stable/0.103/Osi
        11 Vol               https://projects.coin-or.org/svn/Vol/stable/1.1/Vol
         1BuildTools        https://projects.coin-or.org/svn/BuildTools/trunk
         2ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/trunk
         3ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/trunk
         4ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/trunk
         5ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/trunk
         6Data/Sample       https://projects.coin-or.org/svn/Data/trunk/Sample
         7#Data/miplib3      https://projects.coin-or.org/svn/Data/trunk/miplib3
         8CoinUtils         https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
         9Cgl               https://projects.coin-or.org/svn/Cgl/trunk/Cgl
         10Clp               https://projects.coin-or.org/svn/Clp/trunk/Clp
         11Osi               https://projects.coin-or.org/svn/Osi/trunk/Osi
         12#Vol               https://projects.coin-or.org/svn/Vol/trunk/Vol
    • Property svn:mergeinfo changed
      /branches/split (added)merged: 1437-1439,​1444-1448,​1463
  • trunk/Cbc

  • trunk/Cbc/Makefile.in

    r1204 r1464  
    3030#                    Documentation installation                        #
    3131########################################################################
     32
    3233srcdir = @srcdir@
    3334top_srcdir = @top_srcdir@
     
    6263        $(srcdir)/../ltmain.sh $(srcdir)/../missing \
    6364        $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
    64         $(srcdir)/cbc_addlibs.txt.in $(top_srcdir)/configure \
    65         $(top_srcdir)/examples/Makefile.in \
     65        $(srcdir)/cbc-uninstalled.pc.in $(srcdir)/cbc.pc.in \
     66        $(srcdir)/osi-cbc-uninstalled.pc.in $(srcdir)/osi-cbc.pc.in \
     67        $(top_srcdir)/configure $(top_srcdir)/examples/Makefile.in \
    6668        $(top_srcdir)/inc/config_cbc.h.in AUTHORS INSTALL
    6769@HAVE_EXTERNALS_TRUE@am__append_2 = Externals
     
    7779mkinstalldirs = $(install_sh) -d
    7880CONFIG_HEADER = $(top_builddir)/inc/config_cbc.h
    79 CONFIG_CLEAN_FILES = examples/Makefile cbc_addlibs.txt
     81CONFIG_CLEAN_FILES = examples/Makefile cbc.pc cbc-uninstalled.pc \
     82        osi-cbc.pc osi-cbc-uninstalled.pc
    8083SOURCES =
    8184DIST_SOURCES =
     
    8689        pdf-recursive ps-recursive uninstall-info-recursive \
    8790        uninstall-recursive
     91am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
     92am__vpath_adj = case $$p in \
     93    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     94    *) f=$$p;; \
     95  esac;
     96am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
     97am__installdirs = "$(DESTDIR)$(addlibsdir)" \
     98        "$(DESTDIR)$(pkgconfiglibdir)"
     99addlibsDATA_INSTALL = $(INSTALL_DATA)
     100pkgconfiglibDATA_INSTALL = $(INSTALL_DATA)
     101DATA = $(addlibs_DATA) $(pkgconfiglib_DATA)
    88102ETAGS = etags
    89103CTAGS = ctags
     
    100114distuninstallcheck_listfiles = find . -type f -print
    101115distcleancheck_listfiles = find . -type f -print
     116ABSBUILDDIR = @ABSBUILDDIR@
    102117ACLOCAL = @ACLOCAL@
    103118ADDLIBS = @ADDLIBS@
     
    110125AMTAR = @AMTAR@
    111126AR = @AR@
    112 ASLLIB = @ASLLIB@
    113 ASL_CPPFLAGS = @ASL_CPPFLAGS@
     127ASL_CFLAGS = @ASL_CFLAGS@
     128ASL_DATA = @ASL_DATA@
     129ASL_LIBS = @ASL_LIBS@
    114130AUTOCONF = @AUTOCONF@
    115131AUTOHEADER = @AUTOHEADER@
     
    118134AWK = @AWK@
    119135BUILDTOOLSDIR = @BUILDTOOLSDIR@
    120 CBCDOCDIR = @CBCDOCDIR@
    121 CBCOBJDIR = @CBCOBJDIR@
    122 CBCSRCDIR = @CBCSRCDIR@
    123136CBC_BUILD_CBC_GENERIC_FALSE = @CBC_BUILD_CBC_GENERIC_FALSE@
    124137CBC_BUILD_CBC_GENERIC_TRUE = @CBC_BUILD_CBC_GENERIC_TRUE@
     138CBC_SVN_REV = @CBC_SVN_REV@
    125139CC = @CC@
    126140CCDEPMODE = @CCDEPMODE@
    127141CDEFS = @CDEFS@
    128142CFLAGS = @CFLAGS@
    129 CGLDOCDIR = @CGLDOCDIR@
    130 CGLOBJDIR = @CGLOBJDIR@
    131 CGLSRCDIR = @CGLSRCDIR@
    132 CLPDOCDIR = @CLPDOCDIR@
    133 CLPOBJDIR = @CLPOBJDIR@
    134 CLPSRCDIR = @CLPSRCDIR@
    135 COINUTILSDOCDIR = @COINUTILSDOCDIR@
    136 COINUTILSOBJDIR = @COINUTILSOBJDIR@
    137 COINUTILSSRCDIR = @COINUTILSSRCDIR@
    138 COIN_BUILD_GLPK_FALSE = @COIN_BUILD_GLPK_FALSE@
    139 COIN_BUILD_GLPK_TRUE = @COIN_BUILD_GLPK_TRUE@
     143CLP_CFLAGS = @CLP_CFLAGS@
     144CLP_DATA = @CLP_DATA@
     145CLP_LIBS = @CLP_LIBS@
     146COINDEPEND_CFLAGS = @COINDEPEND_CFLAGS@
     147COINDEPEND_DATA = @COINDEPEND_DATA@
     148COINDEPEND_LIBS = @COINDEPEND_LIBS@
    140149COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
    141150COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
    142 COIN_HAS_CBC_FALSE = @COIN_HAS_CBC_FALSE@
    143 COIN_HAS_CBC_TRUE = @COIN_HAS_CBC_TRUE@
    144 COIN_HAS_CGL_FALSE = @COIN_HAS_CGL_FALSE@
    145 COIN_HAS_CGL_TRUE = @COIN_HAS_CGL_TRUE@
    146151COIN_HAS_CLP_FALSE = @COIN_HAS_CLP_FALSE@
    147152COIN_HAS_CLP_TRUE = @COIN_HAS_CLP_TRUE@
    148 COIN_HAS_COINUTILS_FALSE = @COIN_HAS_COINUTILS_FALSE@
    149 COIN_HAS_COINUTILS_TRUE = @COIN_HAS_COINUTILS_TRUE@
     153COIN_HAS_COINDEPEND_FALSE = @COIN_HAS_COINDEPEND_FALSE@
     154COIN_HAS_COINDEPEND_TRUE = @COIN_HAS_COINDEPEND_TRUE@
    150155COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
    151156COIN_HAS_CPX_TRUE = @COIN_HAS_CPX_TRUE@
    152157COIN_HAS_DYLP_FALSE = @COIN_HAS_DYLP_FALSE@
    153158COIN_HAS_DYLP_TRUE = @COIN_HAS_DYLP_TRUE@
    154 COIN_HAS_FMP_FALSE = @COIN_HAS_FMP_FALSE@
    155 COIN_HAS_FMP_TRUE = @COIN_HAS_FMP_TRUE@
    156159COIN_HAS_GLPK_FALSE = @COIN_HAS_GLPK_FALSE@
    157160COIN_HAS_GLPK_TRUE = @COIN_HAS_GLPK_TRUE@
     161COIN_HAS_GRB_FALSE = @COIN_HAS_GRB_FALSE@
     162COIN_HAS_GRB_TRUE = @COIN_HAS_GRB_TRUE@
     163COIN_HAS_MIPLIB3_FALSE = @COIN_HAS_MIPLIB3_FALSE@
     164COIN_HAS_MIPLIB3_TRUE = @COIN_HAS_MIPLIB3_TRUE@
    158165COIN_HAS_MSK_FALSE = @COIN_HAS_MSK_FALSE@
    159166COIN_HAS_MSK_TRUE = @COIN_HAS_MSK_TRUE@
    160 COIN_HAS_OSI_FALSE = @COIN_HAS_OSI_FALSE@
    161 COIN_HAS_OSI_TRUE = @COIN_HAS_OSI_TRUE@
    162 COIN_HAS_OSL_FALSE = @COIN_HAS_OSL_FALSE@
    163 COIN_HAS_OSL_TRUE = @COIN_HAS_OSL_TRUE@
    164 COIN_HAS_SPX_FALSE = @COIN_HAS_SPX_FALSE@
    165 COIN_HAS_SPX_TRUE = @COIN_HAS_SPX_TRUE@
    166 COIN_HAS_SYMPHONY_FALSE = @COIN_HAS_SYMPHONY_FALSE@
    167 COIN_HAS_SYMPHONY_TRUE = @COIN_HAS_SYMPHONY_TRUE@
     167COIN_HAS_NETLIB_FALSE = @COIN_HAS_NETLIB_FALSE@
     168COIN_HAS_NETLIB_TRUE = @COIN_HAS_NETLIB_TRUE@
     169COIN_HAS_OSITESTS_FALSE = @COIN_HAS_OSITESTS_FALSE@
     170COIN_HAS_OSITESTS_TRUE = @COIN_HAS_OSITESTS_TRUE@
     171COIN_HAS_PKGCONFIG_FALSE = @COIN_HAS_PKGCONFIG_FALSE@
     172COIN_HAS_PKGCONFIG_TRUE = @COIN_HAS_PKGCONFIG_TRUE@
     173COIN_HAS_SAMPLE_FALSE = @COIN_HAS_SAMPLE_FALSE@
     174COIN_HAS_SAMPLE_TRUE = @COIN_HAS_SAMPLE_TRUE@
    168175COIN_HAS_VOL_FALSE = @COIN_HAS_VOL_FALSE@
    169176COIN_HAS_VOL_TRUE = @COIN_HAS_VOL_TRUE@
    170177COIN_HAS_XPR_FALSE = @COIN_HAS_XPR_FALSE@
    171178COIN_HAS_XPR_TRUE = @COIN_HAS_XPR_TRUE@
     179COIN_PKG_CONFIG_PATH = @COIN_PKG_CONFIG_PATH@
    172180CPP = @CPP@
    173181CPPFLAGS = @CPPFLAGS@
    174 CPXDOCDIR = @CPXDOCDIR@
    175 CPXINCDIR = @CPXINCDIR@
    176 CPXLIB = @CPXLIB@
    177 CPXOBJDIR = @CPXOBJDIR@
    178 CPXSRCDIR = @CPXSRCDIR@
     182CPX_CFLAGS = @CPX_CFLAGS@
     183CPX_DATA = @CPX_DATA@
     184CPX_LIBS = @CPX_LIBS@
    179185CXX = @CXX@
    180186CXXCPP = @CXXCPP@
     
    187193DEFS = @DEFS@
    188194DEPDIR = @DEPDIR@
    189 DYLPDOCDIR = @DYLPDOCDIR@
    190 DYLPOBJDIR = @DYLPOBJDIR@
    191 DYLPSRCDIR = @DYLPSRCDIR@
     195DYLP_CFLAGS = @DYLP_CFLAGS@
     196DYLP_DATA = @DYLP_DATA@
     197DYLP_LIBS = @DYLP_LIBS@
    192198ECHO = @ECHO@
    193199ECHO_C = @ECHO_C@
     
    199205FADDLIBS = @FADDLIBS@
    200206FFLAGS = @FFLAGS@
    201 FMPINCDIR = @FMPINCDIR@
    202 FMPLIB = @FMPLIB@
    203 GLPKINCDIR = @GLPKINCDIR@
    204 GLPKLIB = @GLPKLIB@
    205 GLPKOBJDIR = @GLPKOBJDIR@
     207GLPK_CFLAGS = @GLPK_CFLAGS@
     208GLPK_DATA = @GLPK_DATA@
     209GLPK_LIBS = @GLPK_LIBS@
     210GRB_CFLAGS = @GRB_CFLAGS@
     211GRB_DATA = @GRB_DATA@
     212GRB_LIBS = @GRB_LIBS@
    206213HAVE_EXTERNALS_FALSE = @HAVE_EXTERNALS_FALSE@
    207214HAVE_EXTERNALS_TRUE = @HAVE_EXTERNALS_TRUE@
     
    223230MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
    224231MAKEINFO = @MAKEINFO@
     232MIPLIB3_CFLAGS = @MIPLIB3_CFLAGS@
     233MIPLIB3_DATA = @MIPLIB3_DATA@
     234MIPLIB3_LIBS = @MIPLIB3_LIBS@
    225235MPICC = @MPICC@
    226236MPICXX = @MPICXX@
    227 MSKINCDIR = @MSKINCDIR@
    228 MSKLIB = @MSKLIB@
     237MSK_CFLAGS = @MSK_CFLAGS@
     238MSK_DATA = @MSK_DATA@
     239MSK_LIBS = @MSK_LIBS@
     240NETLIB_CFLAGS = @NETLIB_CFLAGS@
     241NETLIB_DATA = @NETLIB_DATA@
     242NETLIB_LIBS = @NETLIB_LIBS@
    229243OBJEXT = @OBJEXT@
    230244OPT_CFLAGS = @OPT_CFLAGS@
    231245OPT_CXXFLAGS = @OPT_CXXFLAGS@
    232 OSIDOCDIR = @OSIDOCDIR@
    233 OSIOBJDIR = @OSIOBJDIR@
    234 OSISRCDIR = @OSISRCDIR@
    235 OSLINCDIR = @OSLINCDIR@
    236 OSLLIB = @OSLLIB@
     246OSICBC_DFLT_SOLVER_CLP_FALSE = @OSICBC_DFLT_SOLVER_CLP_FALSE@
     247OSICBC_DFLT_SOLVER_CLP_TRUE = @OSICBC_DFLT_SOLVER_CLP_TRUE@
     248OSICBC_DFLT_SOLVER_CPX_FALSE = @OSICBC_DFLT_SOLVER_CPX_FALSE@
     249OSICBC_DFLT_SOLVER_CPX_TRUE = @OSICBC_DFLT_SOLVER_CPX_TRUE@
     250OSICBC_DFLT_SOLVER_DYLP_FALSE = @OSICBC_DFLT_SOLVER_DYLP_FALSE@
     251OSICBC_DFLT_SOLVER_DYLP_TRUE = @OSICBC_DFLT_SOLVER_DYLP_TRUE@
     252OSICBC_DFLT_SOLVER_GLPK_FALSE = @OSICBC_DFLT_SOLVER_GLPK_FALSE@
     253OSICBC_DFLT_SOLVER_GLPK_TRUE = @OSICBC_DFLT_SOLVER_GLPK_TRUE@
     254OSICBC_DFLT_SOLVER_GRB_FALSE = @OSICBC_DFLT_SOLVER_GRB_FALSE@
     255OSICBC_DFLT_SOLVER_GRB_TRUE = @OSICBC_DFLT_SOLVER_GRB_TRUE@
     256OSICBC_DFLT_SOLVER_MSK_FALSE = @OSICBC_DFLT_SOLVER_MSK_FALSE@
     257OSICBC_DFLT_SOLVER_MSK_TRUE = @OSICBC_DFLT_SOLVER_MSK_TRUE@
     258OSICBC_DFLT_SOLVER_SYM_FALSE = @OSICBC_DFLT_SOLVER_SYM_FALSE@
     259OSICBC_DFLT_SOLVER_SYM_TRUE = @OSICBC_DFLT_SOLVER_SYM_TRUE@
     260OSICBC_DFLT_SOLVER_VOL_FALSE = @OSICBC_DFLT_SOLVER_VOL_FALSE@
     261OSICBC_DFLT_SOLVER_VOL_TRUE = @OSICBC_DFLT_SOLVER_VOL_TRUE@
     262OSICBC_DFLT_SOLVER_XPR_FALSE = @OSICBC_DFLT_SOLVER_XPR_FALSE@
     263OSICBC_DFLT_SOLVER_XPR_TRUE = @OSICBC_DFLT_SOLVER_XPR_TRUE@
     264OSITESTS_CFLAGS = @OSITESTS_CFLAGS@
     265OSITESTS_DATA = @OSITESTS_DATA@
     266OSITESTS_LIBS = @OSITESTS_LIBS@
    237267PACKAGE = @PACKAGE@
    238268PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
     
    242272PACKAGE_VERSION = @PACKAGE_VERSION@
    243273PATH_SEPARATOR = @PATH_SEPARATOR@
     274PKG_CONFIG = @PKG_CONFIG@
    244275RANLIB = @RANLIB@
     276REQUIREDPACKAGES = @REQUIREDPACKAGES@
    245277RPATH_FLAGS = @RPATH_FLAGS@
     278SAMPLE_CFLAGS = @SAMPLE_CFLAGS@
     279SAMPLE_DATA = @SAMPLE_DATA@
     280SAMPLE_LIBS = @SAMPLE_LIBS@
    246281SET_MAKE = @SET_MAKE@
    247282SHELL = @SHELL@
    248 SPXINCDIR = @SPXINCDIR@
    249 SPXLIB = @SPXLIB@
    250283STRIP = @STRIP@
    251 SYMPHONYDOCDIR = @SYMPHONYDOCDIR@
    252 SYMPHONYOBJDIR = @SYMPHONYOBJDIR@
    253 SYMPHONYSRCDIR = @SYMPHONYSRCDIR@
    254284VERSION = @VERSION@
    255 VOLDOCDIR = @VOLDOCDIR@
    256 VOLOBJDIR = @VOLOBJDIR@
    257 VOLSRCDIR = @VOLSRCDIR@
     285VOL_CFLAGS = @VOL_CFLAGS@
     286VOL_DATA = @VOL_DATA@
     287VOL_LIBS = @VOL_LIBS@
    258288VPATH_DISTCLEANFILES = @VPATH_DISTCLEANFILES@
    259 XPRINCDIR = @XPRINCDIR@
    260 XPRLIB = @XPRLIB@
     289XPR_CFLAGS = @XPR_CFLAGS@
     290XPR_DATA = @XPR_DATA@
     291XPR_LIBS = @XPR_LIBS@
    261292abs_bin_dir = @abs_bin_dir@
    262293abs_include_dir = @abs_include_dir@
     
    271302ac_ct_STRIP = @ac_ct_STRIP@
    272303ac_cxx_preproc_warn_flag = @ac_cxx_preproc_warn_flag@
     304ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
    273305am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
    274306am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
     
    291323have_automake = @have_automake@
    292324have_svn = @have_svn@
     325have_svnversion = @have_svnversion@
    293326host = @host@
    294327host_alias = @host_alias@
     
    353386#                  Installation of the addlibs file                    #
    354387########################################################################
    355 addlibsfile = cbc_addlibs.txt
    356 addlibsdir = $(prefix)/share/doc/coin/$(PACKAGE_NAME)/
     388@COIN_HAS_PKGCONFIG_TRUE@addlibsdir = $(datadir)/coin/doc/Cbc
     389@COIN_HAS_PKGCONFIG_TRUE@addlibs_DATA = cbc_addlibs.txt
     390pkgconfiglibdir = $(libdir)/pkgconfig
     391pkgconfiglib_DATA = cbc.pc osi-cbc.pc
    357392
    358393########################################################################
    359394#                         Maintainer Stuff                             #
    360395########################################################################
     396CLEANFILES = cbc_addlibs.txt
    361397
    362398# Files that are generated and should be cleaned with make distclean
    363399DISTCLEANFILES = $(am__append_3) $(VPATH_DISTCLEANFILES)
    364400DocFiles = README AUTHORS LICENSE
    365 DocInstallDir = $(prefix)/share/doc/coin/$(PACKAGE_NAME)
     401DocInstallDir = $(datadir)/coin/doc/$(PACKAGE_NAME)
    366402all: all-recursive
    367403
     
    419455examples/Makefile: $(top_builddir)/config.status $(top_srcdir)/examples/Makefile.in
    420456        cd $(top_builddir) && $(SHELL) ./config.status $@
    421 cbc_addlibs.txt: $(top_builddir)/config.status $(srcdir)/cbc_addlibs.txt.in
     457cbc.pc: $(top_builddir)/config.status $(srcdir)/cbc.pc.in
     458        cd $(top_builddir) && $(SHELL) ./config.status $@
     459cbc-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/cbc-uninstalled.pc.in
     460        cd $(top_builddir) && $(SHELL) ./config.status $@
     461osi-cbc.pc: $(top_builddir)/config.status $(srcdir)/osi-cbc.pc.in
     462        cd $(top_builddir) && $(SHELL) ./config.status $@
     463osi-cbc-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/osi-cbc-uninstalled.pc.in
    422464        cd $(top_builddir) && $(SHELL) ./config.status $@
    423465
     
    431473        -rm -f libtool
    432474uninstall-info-am:
     475install-addlibsDATA: $(addlibs_DATA)
     476        @$(NORMAL_INSTALL)
     477        test -z "$(addlibsdir)" || $(mkdir_p) "$(DESTDIR)$(addlibsdir)"
     478        @list='$(addlibs_DATA)'; for p in $$list; do \
     479          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
     480          f=$(am__strip_dir) \
     481          echo " $(addlibsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(addlibsdir)/$$f'"; \
     482          $(addlibsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(addlibsdir)/$$f"; \
     483        done
     484
     485uninstall-addlibsDATA:
     486        @$(NORMAL_UNINSTALL)
     487        @list='$(addlibs_DATA)'; for p in $$list; do \
     488          f=$(am__strip_dir) \
     489          echo " rm -f '$(DESTDIR)$(addlibsdir)/$$f'"; \
     490          rm -f "$(DESTDIR)$(addlibsdir)/$$f"; \
     491        done
     492install-pkgconfiglibDATA: $(pkgconfiglib_DATA)
     493        @$(NORMAL_INSTALL)
     494        test -z "$(pkgconfiglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfiglibdir)"
     495        @list='$(pkgconfiglib_DATA)'; for p in $$list; do \
     496          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
     497          f=$(am__strip_dir) \
     498          echo " $(pkgconfiglibDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfiglibdir)/$$f'"; \
     499          $(pkgconfiglibDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfiglibdir)/$$f"; \
     500        done
     501
     502uninstall-pkgconfiglibDATA:
     503        @$(NORMAL_UNINSTALL)
     504        @list='$(pkgconfiglib_DATA)'; for p in $$list; do \
     505          f=$(am__strip_dir) \
     506          echo " rm -f '$(DESTDIR)$(pkgconfiglibdir)/$$f'"; \
     507          rm -f "$(DESTDIR)$(pkgconfiglibdir)/$$f"; \
     508        done
    433509
    434510# This directory's subdirectories are mostly independent; you can cd
     
    708784check-am: all-am
    709785check: check-recursive
    710 all-am: Makefile
     786all-am: Makefile $(DATA)
    711787installdirs: installdirs-recursive
    712788installdirs-am:
     789        for dir in "$(DESTDIR)$(addlibsdir)" "$(DESTDIR)$(pkgconfiglibdir)"; do \
     790          test -z "$$dir" || $(mkdir_p) "$$dir"; \
     791        done
    713792install: install-recursive
    714793install-exec: install-exec-recursive
     
    728807
    729808clean-generic:
     809        -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
    730810
    731811distclean-generic:
     
    756836info-am:
    757837
    758 install-data-am:
     838install-data-am: install-addlibsDATA install-pkgconfiglibDATA
    759839
    760840install-exec-am: install-exec-local
     
    784864ps-am:
    785865
    786 uninstall-am: uninstall-info-am uninstall-local
     866uninstall-am: uninstall-addlibsDATA uninstall-info-am uninstall-local \
     867        uninstall-pkgconfiglibDATA
    787868
    788869uninstall-info: uninstall-info-recursive
     
    795876        distclean-local distclean-recursive distclean-tags \
    796877        distcleancheck distdir distuninstallcheck dvi dvi-am html \
    797         html-am info info-am install install-am install-data \
    798         install-data-am install-exec install-exec-am \
     878        html-am info info-am install install-addlibsDATA install-am \
     879        install-data install-data-am install-exec install-exec-am \
    799880        install-exec-local install-info install-info-am install-man \
    800         install-strip installcheck installcheck-am installdirs \
    801         installdirs-am maintainer-clean maintainer-clean-generic \
    802         maintainer-clean-recursive mostlyclean mostlyclean-generic \
    803         mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
    804         tags tags-recursive uninstall uninstall-am uninstall-info-am \
    805         uninstall-local
     881        install-pkgconfiglibDATA install-strip installcheck \
     882        installcheck-am installdirs installdirs-am maintainer-clean \
     883        maintainer-clean-generic maintainer-clean-recursive \
     884        mostlyclean mostlyclean-generic mostlyclean-libtool \
     885        mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
     886        uninstall uninstall-addlibsDATA uninstall-am uninstall-info-am \
     887        uninstall-local uninstall-pkgconfiglibDATA
    806888
    807889
     
    821903        if test -r test/Makefile; then cd test; $(MAKE) distclean; fi
    822904
     905install-exec-local: install-doc
     906
     907uninstall-local: uninstall-doc
     908
    823909.PHONY: test unitTest
    824910
    825 install-exec-local: install-doc
    826         $(install_sh_DATA) $(addlibsfile) $(DESTDIR)$(addlibsdir)/$(addlibsfile)
    827 
    828 uninstall-local: uninstall-doc
    829         rm -f $(DESTDIR)$(addlibsdir)/$(addlibsfile)
     911@COIN_HAS_PKGCONFIG_TRUE@cbc_addlibs.txt : cbc.pc
     912@COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=.:@COIN_PKG_CONFIG_PATH@ $(PKG_CONFIG) --libs cbc > cbc_addlibs.txt
    830913
    831914install-doc: $(DocFiles)
Note: See TracChangeset for help on using the changeset viewer.