Changeset 1559 for trunk/Clp/Makefile.in


Ignore:
Timestamp:
Jun 5, 2010 3:42:36 PM (11 years ago)
Author:
stefan
Message:

merge split branch into trunk

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 
         1BuildTools    https://projects.coin-or.org/svn/BuildTools/trunk
         2ThirdParty/Blas https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/trunk
         3ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/trunk
         4#Data/Netlib   https://projects.coin-or.org/svn/Data/trunk/Netlib
         5Data/Sample   https://projects.coin-or.org/svn/Data/trunk/Sample
         6CoinUtils     https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
    • Property svn:mergeinfo changed
      /branches/split (added)merged: 1522,​1527-1531,​1542-1550,​1558

  • trunk/Clp/Makefile.in

    r1162 r1559  
    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)/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
    6769@HAVE_EXTERNALS_TRUE@am__append_2 = Externals
    6870@HAVE_EXTERNALS_TRUE@am__append_3 = .Externals-stamp
    … …  
    7779mkinstalldirs = $(install_sh) -d
    7880CONFIG_HEADER = $(top_builddir)/inc/config_clp.h
    79 CONFIG_CLEAN_FILES = examples/Makefile clp_addlibs.txt
     81CONFIG_CLEAN_FILES = examples/Makefile clp.pc clp-uninstalled.pc \
     82        osi-clp-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@
    … …  
    120135CDEFS = @CDEFS@
    121136CFLAGS = @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@
     137COINUTILS_CFLAGS = @COINUTILS_CFLAGS@
     138COINUTILS_DATA = @COINUTILS_DATA@
     139COINUTILS_LIBS = @COINUTILS_LIBS@
    130140COIN_HAS_COINUTILS_FALSE = @COIN_HAS_COINUTILS_FALSE@
    131141COIN_HAS_COINUTILS_TRUE = @COIN_HAS_COINUTILS_TRUE@
     142COIN_HAS_NETLIB_FALSE = @COIN_HAS_NETLIB_FALSE@
     143COIN_HAS_NETLIB_TRUE = @COIN_HAS_NETLIB_TRUE@
     144COIN_HAS_OSITESTS_FALSE = @COIN_HAS_OSITESTS_FALSE@
     145COIN_HAS_OSITESTS_TRUE = @COIN_HAS_OSITESTS_TRUE@
     146COIN_HAS_OSI_FALSE = @COIN_HAS_OSI_FALSE@
     147COIN_HAS_OSI_TRUE = @COIN_HAS_OSI_TRUE@
     148COIN_HAS_PKGCONFIG_FALSE = @COIN_HAS_PKGCONFIG_FALSE@
     149COIN_HAS_PKGCONFIG_TRUE = @COIN_HAS_PKGCONFIG_TRUE@
     150COIN_HAS_SAMPLE_FALSE = @COIN_HAS_SAMPLE_FALSE@
     151COIN_HAS_SAMPLE_TRUE = @COIN_HAS_SAMPLE_TRUE@
     152COIN_PKG_CONFIG_PATH = @COIN_PKG_CONFIG_PATH@
    132153CPP = @CPP@
    133154CPPFLAGS = @CPPFLAGS@
    … …  
    172193MPICC = @MPICC@
    173194MPICXX = @MPICXX@
     195NETLIB_CFLAGS = @NETLIB_CFLAGS@
     196NETLIB_DATA = @NETLIB_DATA@
     197NETLIB_LIBS = @NETLIB_LIBS@
    174198OBJEXT = @OBJEXT@
    175199OPT_CFLAGS = @OPT_CFLAGS@
    176200OPT_CXXFLAGS = @OPT_CXXFLAGS@
     201OSITESTS_CFLAGS = @OSITESTS_CFLAGS@
     202OSITESTS_DATA = @OSITESTS_DATA@
     203OSITESTS_LIBS = @OSITESTS_LIBS@
     204OSI_CFLAGS = @OSI_CFLAGS@
     205OSI_DATA = @OSI_DATA@
     206OSI_LIBS = @OSI_LIBS@
    177207PACKAGE = @PACKAGE@
    178208PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
    … …  
    182212PACKAGE_VERSION = @PACKAGE_VERSION@
    183213PATH_SEPARATOR = @PATH_SEPARATOR@
     214PKG_CONFIG = @PKG_CONFIG@
    184215RANLIB = @RANLIB@
     216REQUIREDPACKAGES = @REQUIREDPACKAGES@
    185217RPATH_FLAGS = @RPATH_FLAGS@
     218SAMPLE_CFLAGS = @SAMPLE_CFLAGS@
     219SAMPLE_DATA = @SAMPLE_DATA@
     220SAMPLE_LIBS = @SAMPLE_LIBS@
    186221SET_MAKE = @SET_MAKE@
    187222SHELL = @SHELL@
    … …  
    189224VERSION = @VERSION@
    190225VPATH_DISTCLEANFILES = @VPATH_DISTCLEANFILES@
     226_SVN_REV = @_SVN_REV@
    191227abs_bin_dir = @abs_bin_dir@
    192228abs_include_dir = @abs_include_dir@
    … …  
    201237ac_ct_STRIP = @ac_ct_STRIP@
    202238ac_cxx_preproc_warn_flag = @ac_cxx_preproc_warn_flag@
     239ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
    203240am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
    204241am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
    … …  
    221258have_automake = @have_automake@
    222259have_svn = @have_svn@
     260have_svnversion = @have_svnversion@
    223261host = @host@
    224262host_alias = @host_alias@
    … …  
    276314#                  Installation of the addlibs file                    #
    277315########################################################################
    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
     318pkgconfiglibdir = $(libdir)/pkgconfig
     319pkgconfiglib_DATA = clp.pc
    280320
    281321########################################################################
    282322#                         Maintainer Stuff                             #
    283323########################################################################
     324CLEANFILES = clp_addlibs.txt
    284325
    285326# Files that are generated and should be cleaned with make distclean
    286327DISTCLEANFILES = $(am__append_3) $(VPATH_DISTCLEANFILES)
    287328DocFiles = README AUTHORS LICENSE
    288 DocInstallDir = $(prefix)/share/doc/coin/$(PACKAGE_NAME)
     329DocInstallDir = $(datadir)/coin/doc/$(PACKAGE_NAME)
    289330all: all-recursive
    290331
    … …  
    342383examples/Makefile: $(top_builddir)/config.status $(top_srcdir)/examples/Makefile.in
    343384        cd $(top_builddir) && $(SHELL) ./config.status $@
    344 clp_addlibs.txt: $(top_builddir)/config.status $(srcdir)/clp_addlibs.txt.in
     385clp.pc: $(top_builddir)/config.status $(srcdir)/clp.pc.in
     386        cd $(top_builddir) && $(SHELL) ./config.status $@
     387clp-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/clp-uninstalled.pc.in
     388        cd $(top_builddir) && $(SHELL) ./config.status $@
     389osi-clp-uninstalled.pc: $(top_builddir)/config.status $(top_srcdir)/src/OsiClp/osi-clp-uninstalled.pc.in
    345390        cd $(top_builddir) && $(SHELL) ./config.status $@
    346391
    … …  
    354399        -rm -f libtool
    355400uninstall-info-am:
     401install-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
     411uninstall-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
     418install-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
     428uninstall-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
    356435
    357436# This directory's subdirectories are mostly independent; you can cd
    … …  
    490569        $(am__remove_distdir)
    491570        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
    493572        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    494573        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
    … …  
    631710check-am: all-am
    632711check: check-recursive
    633 all-am: Makefile
     712all-am: Makefile $(DATA)
    634713installdirs: installdirs-recursive
    635714installdirs-am:
     715        for dir in "$(DESTDIR)$(addlibsdir)" "$(DESTDIR)$(pkgconfiglibdir)"; do \
     716          test -z "$$dir" || $(mkdir_p) "$$dir"; \
     717        done
    636718install: install-recursive
    637719install-exec: install-exec-recursive
    … …  
    651733
    652734clean-generic:
     735        -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
    653736
    654737distclean-generic:
    … …  
    679762info-am:
    680763
    681 install-data-am:
     764install-data-am: install-addlibsDATA install-pkgconfiglibDATA
    682765
    683766install-exec-am: install-exec-local
    … …  
    707790ps-am:
    708791
    709 uninstall-am: uninstall-info-am uninstall-local
     792uninstall-am: uninstall-addlibsDATA uninstall-info-am uninstall-local \
     793        uninstall-pkgconfiglibDATA
    710794
    711795uninstall-info: uninstall-info-recursive
    … …  
    718802        distclean-local distclean-recursive distclean-tags \
    719803        distcleancheck distdir distuninstallcheck dvi dvi-am html \
    720         html-am info info-am install install-am 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 \
    722806        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
    729814
    730815
    … …  
    744829        if test -r test/Makefile; then cd test; $(MAKE) distclean; fi
    745830
     831install-exec-local: install-doc
     832
     833uninstall-local: uninstall-doc
     834
    746835.PHONY: test unitTest
    747836
    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
    753839
    754840install-doc: $(DocFiles)
Note: See TracChangeset for help on using the changeset viewer.