Ignore:
Timestamp:
Sep 13, 2009 2:24:20 PM (11 years ago)
Author:
stefan
Message:

revert my recent changes related to BSPsplit after copying them into branches

File:
1 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Glpk/trunk/Makefile.in

    r1396 r1411  
    2828#                    Documentation installation                        #
    2929########################################################################
    30 
    31 
    3230
    3331srcdir = @srcdir@
     
    5351build_triplet = @build@
    5452host_triplet = @host@
    55 DIST_COMMON = README $(am__configure_deps) \
     53DIST_COMMON = $(am__configure_deps) \
    5654        $(srcdir)/../../BuildTools/Makemain.inc \
    5755        $(srcdir)/../../config.guess $(srcdir)/../../config.sub \
     
    5957        $(srcdir)/../../ltmain.sh $(srcdir)/../../missing \
    6058        $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
    61         $(srcdir)/config_glpk.h.in $(srcdir)/glpk-uninstalled.pc.in \
    62         $(srcdir)/glpk.pc.in $(srcdir)/glpk_addlibs.txt.in \
    63         $(thirdpartyinclude_HEADERS) $(top_srcdir)/configure
     59        $(srcdir)/config_glpk.h.in $(srcdir)/glpk_addlibs.txt.in \
     60        $(top_srcdir)/configure
    6461@HAVE_EXTERNALS_TRUE@am__append_1 = Externals
    6562@HAVE_EXTERNALS_TRUE@am__append_2 = .Externals-stamp
     
    7471mkinstalldirs = $(install_sh) -d
    7572CONFIG_HEADER = config_glpk.h
    76 CONFIG_CLEAN_FILES = glpk_addlibs.txt glpk.pc glpk-uninstalled.pc
    77 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
    78 am__vpath_adj = case $$p in \
    79     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
    80     *) f=$$p;; \
    81   esac;
    82 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
    83 am__installdirs = "$(DESTDIR)$(thirdpartylibdir)" \
    84         "$(DESTDIR)$(addlibsdir)" "$(DESTDIR)$(pkgconfiglibdir)" \
    85         "$(DESTDIR)$(thirdpartyincludedir)"
    86 thirdpartylibLTLIBRARIES_INSTALL = $(INSTALL)
    87 LTLIBRARIES = $(thirdpartylib_LTLIBRARIES)
     73CONFIG_CLEAN_FILES = glpk_addlibs.txt
     74LTLIBRARIES = $(noinst_LTLIBRARIES)
    8875libcoinglpk_la_LIBADD =
    89 am_libcoinglpk_la_OBJECTS = glpapi01.lo glpapi02.lo glpapi03.lo \
     76nodist_libcoinglpk_la_OBJECTS = glpapi01.lo glpapi02.lo glpapi03.lo \
    9077        glpapi04.lo glpapi05.lo glpapi06.lo glpapi07.lo glpapi08.lo \
    9178        glpapi09.lo glpapi10.lo glpapi11.lo glpapi12.lo glpapi13.lo \
     
    10996        amd_info.lo amd_order.lo amd_postorder.lo amd_post_tree.lo \
    11097        amd_preprocess.lo amd_valid.lo colamd.lo
    111 libcoinglpk_la_OBJECTS = $(am_libcoinglpk_la_OBJECTS)
     98libcoinglpk_la_OBJECTS = $(nodist_libcoinglpk_la_OBJECTS)
     99@COIN_BUILD_GLPK_TRUE@am_libcoinglpk_la_rpath =
    112100depcomp = $(SHELL) $(top_srcdir)/../../depcomp
    113101am__depfiles_maybe = depfiles
     
    120108LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
    121109        $(AM_LDFLAGS) $(LDFLAGS) -o $@
    122 SOURCES = $(libcoinglpk_la_SOURCES)
    123 DIST_SOURCES = $(libcoinglpk_la_SOURCES)
    124 addlibsDATA_INSTALL = $(INSTALL_DATA)
    125 pkgconfiglibDATA_INSTALL = $(INSTALL_DATA)
    126 DATA = $(addlibs_DATA) $(pkgconfiglib_DATA)
    127 thirdpartyincludeHEADERS_INSTALL = $(INSTALL_HEADER)
    128 HEADERS = $(thirdpartyinclude_HEADERS)
     110SOURCES = $(nodist_libcoinglpk_la_SOURCES)
     111DIST_SOURCES =
    129112ETAGS = etags
    130113CTAGS = ctags
     
    159142CDEFS = @CDEFS@
    160143CFLAGS = @CFLAGS@
     144COIN_BUILD_GLPK_FALSE = @COIN_BUILD_GLPK_FALSE@
     145COIN_BUILD_GLPK_TRUE = @COIN_BUILD_GLPK_TRUE@
    161146COIN_HAS_GLPK_FALSE = @COIN_HAS_GLPK_FALSE@
    162147COIN_HAS_GLPK_TRUE = @COIN_HAS_GLPK_TRUE@
     
    183168FFLAGS = @FFLAGS@
    184169GLPKDIR = @GLPKDIR@
    185 GLPKDOCDIR = @GLPKDOCDIR@
     170GLPKINCDIR = @GLPKINCDIR@
     171GLPKLIB = @GLPKLIB@
    186172GLPKOBJDIR = @GLPKOBJDIR@
    187 GLPKSRCDIR = @GLPKSRCDIR@
    188173HAVE_EXTERNALS_FALSE = @HAVE_EXTERNALS_FALSE@
    189174HAVE_EXTERNALS_TRUE = @HAVE_EXTERNALS_TRUE@
     
    205190MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
    206191MAKEINFO = @MAKEINFO@
     192MAKEOKFILE = @MAKEOKFILE@
    207193MPICC = @MPICC@
    208194OBJEXT = @OBJEXT@
     
    251237datadir = @datadir@
    252238exec_prefix = @exec_prefix@
    253 glpkmajorver = @glpkmajorver@
    254 glpkminorver = @glpkminorver@
    255239have_autoconf = @have_autoconf@
    256240have_automake = @have_automake@
     
    279263AUTOMAKE_OPTIONS = foreign
    280264EXTRA_DIST = get.GLPK INSTALL.Glpk glpk.patch $(am__append_1)
    281 thirdpartylibdir = $(prefix)/lib/ThirdParty
    282 thirdpartylib_LTLIBRARIES = libcoinglpk.la
    283 libcoinglpk_la_SOURCES = \
     265@COIN_BUILD_GLPK_FALSE@noinst_LTLIBRARIES =
     266@COIN_BUILD_GLPK_TRUE@noinst_LTLIBRARIES = libcoinglpk.la
     267nodist_libcoinglpk_la_SOURCES = \
    284268$(GLPKDIR)/src/glpapi01.c \
    285269$(GLPKDIR)/src/glpapi02.c \
     
    412396
    413397libcoinglpk_la_LDFLAGS = $(LT_LDFLAGS)
    414 thirdpartyincludedir = $(includedir)/coin/ThirdParty
    415 thirdpartyinclude_HEADERS = $(GLPKDIR)/include/glpk.h
    416 addlibsdir = $(prefix)/share/doc/coin/ThirdParty/Glpk
    417 addlibs_DATA = glpk_addlibs.txt README
    418 pkgconfiglibdir = $(prefix)/lib/ThirdParty/pkgconfig
    419 pkgconfiglib_DATA = glpk.pc
    420398
    421399########################################################################
     
    484462glpk_addlibs.txt: $(top_builddir)/config.status $(srcdir)/glpk_addlibs.txt.in
    485463        cd $(top_builddir) && $(SHELL) ./config.status $@
    486 glpk.pc: $(top_builddir)/config.status $(srcdir)/glpk.pc.in
    487         cd $(top_builddir) && $(SHELL) ./config.status $@
    488 glpk-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/glpk-uninstalled.pc.in
    489         cd $(top_builddir) && $(SHELL) ./config.status $@
    490 install-thirdpartylibLTLIBRARIES: $(thirdpartylib_LTLIBRARIES)
    491         @$(NORMAL_INSTALL)
    492         test -z "$(thirdpartylibdir)" || $(mkdir_p) "$(DESTDIR)$(thirdpartylibdir)"
    493         @list='$(thirdpartylib_LTLIBRARIES)'; for p in $$list; do \
    494           if test -f $$p; then \
    495             f=$(am__strip_dir) \
    496             echo " $(LIBTOOL) --mode=install $(thirdpartylibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(thirdpartylibdir)/$$f'"; \
    497             $(LIBTOOL) --mode=install $(thirdpartylibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(thirdpartylibdir)/$$f"; \
    498           else :; fi; \
    499         done
    500 
    501 uninstall-thirdpartylibLTLIBRARIES:
    502         @$(NORMAL_UNINSTALL)
    503         @set -x; list='$(thirdpartylib_LTLIBRARIES)'; for p in $$list; do \
    504           p=$(am__strip_dir) \
    505           echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(thirdpartylibdir)/$$p'"; \
    506           $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(thirdpartylibdir)/$$p"; \
    507         done
    508 
    509 clean-thirdpartylibLTLIBRARIES:
    510         -test -z "$(thirdpartylib_LTLIBRARIES)" || rm -f $(thirdpartylib_LTLIBRARIES)
    511         @list='$(thirdpartylib_LTLIBRARIES)'; for p in $$list; do \
     464
     465clean-noinstLTLIBRARIES:
     466        -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
     467        @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
    512468          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
    513469          test "$$dir" != "$$p" || dir=.; \
     
    516472        done
    517473libcoinglpk.la: $(libcoinglpk_la_OBJECTS) $(libcoinglpk_la_DEPENDENCIES)
    518         $(LINK) -rpath $(thirdpartylibdir) $(libcoinglpk_la_LDFLAGS) $(libcoinglpk_la_OBJECTS) $(libcoinglpk_la_LIBADD) $(LIBS)
     474        $(LINK) $(am_libcoinglpk_la_rpath) $(libcoinglpk_la_LDFLAGS) $(libcoinglpk_la_OBJECTS) $(libcoinglpk_la_LIBADD) $(LIBS)
    519475
    520476mostlyclean-compile:
     
    14111367        -rm -f libtool
    14121368uninstall-info-am:
    1413 install-addlibsDATA: $(addlibs_DATA)
    1414         @$(NORMAL_INSTALL)
    1415         test -z "$(addlibsdir)" || $(mkdir_p) "$(DESTDIR)$(addlibsdir)"
    1416         @list='$(addlibs_DATA)'; for p in $$list; do \
    1417           if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
    1418           f=$(am__strip_dir) \
    1419           echo " $(addlibsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(addlibsdir)/$$f'"; \
    1420           $(addlibsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(addlibsdir)/$$f"; \
    1421         done
    1422 
    1423 uninstall-addlibsDATA:
    1424         @$(NORMAL_UNINSTALL)
    1425         @list='$(addlibs_DATA)'; for p in $$list; do \
    1426           f=$(am__strip_dir) \
    1427           echo " rm -f '$(DESTDIR)$(addlibsdir)/$$f'"; \
    1428           rm -f "$(DESTDIR)$(addlibsdir)/$$f"; \
    1429         done
    1430 install-pkgconfiglibDATA: $(pkgconfiglib_DATA)
    1431         @$(NORMAL_INSTALL)
    1432         test -z "$(pkgconfiglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfiglibdir)"
    1433         @list='$(pkgconfiglib_DATA)'; for p in $$list; do \
    1434           if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
    1435           f=$(am__strip_dir) \
    1436           echo " $(pkgconfiglibDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfiglibdir)/$$f'"; \
    1437           $(pkgconfiglibDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfiglibdir)/$$f"; \
    1438         done
    1439 
    1440 uninstall-pkgconfiglibDATA:
    1441         @$(NORMAL_UNINSTALL)
    1442         @list='$(pkgconfiglib_DATA)'; for p in $$list; do \
    1443           f=$(am__strip_dir) \
    1444           echo " rm -f '$(DESTDIR)$(pkgconfiglibdir)/$$f'"; \
    1445           rm -f "$(DESTDIR)$(pkgconfiglibdir)/$$f"; \
    1446         done
    1447 install-thirdpartyincludeHEADERS: $(thirdpartyinclude_HEADERS)
    1448         @$(NORMAL_INSTALL)
    1449         test -z "$(thirdpartyincludedir)" || $(mkdir_p) "$(DESTDIR)$(thirdpartyincludedir)"
    1450         @list='$(thirdpartyinclude_HEADERS)'; for p in $$list; do \
    1451           if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
    1452           f=$(am__strip_dir) \
    1453           echo " $(thirdpartyincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(thirdpartyincludedir)/$$f'"; \
    1454           $(thirdpartyincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(thirdpartyincludedir)/$$f"; \
    1455         done
    1456 
    1457 uninstall-thirdpartyincludeHEADERS:
    1458         @$(NORMAL_UNINSTALL)
    1459         @list='$(thirdpartyinclude_HEADERS)'; for p in $$list; do \
    1460           f=$(am__strip_dir) \
    1461           echo " rm -f '$(DESTDIR)$(thirdpartyincludedir)/$$f'"; \
    1462           rm -f "$(DESTDIR)$(thirdpartyincludedir)/$$f"; \
    1463         done
    14641369
    14651370ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
     
    15141419        $(am__remove_distdir)
    15151420        mkdir $(distdir)
    1516         $(mkdir_p) $(distdir)/$(GLPKDIR)/include $(distdir)/. $(distdir)/../.. $(distdir)/../../BuildTools
     1421        $(mkdir_p) $(distdir)/. $(distdir)/../.. $(distdir)/../../BuildTools
    15171422        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    15181423        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
     
    16401545check-am: all-am
    16411546check: check-am
    1642 all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) config_glpk.h
     1547all-am: Makefile $(LTLIBRARIES) config_glpk.h
    16431548installdirs:
    1644         for dir in "$(DESTDIR)$(thirdpartylibdir)" "$(DESTDIR)$(addlibsdir)" "$(DESTDIR)$(pkgconfiglibdir)" "$(DESTDIR)$(thirdpartyincludedir)"; do \
    1645           test -z "$$dir" || $(mkdir_p) "$$dir"; \
    1646         done
    16471549install: install-am
    16481550install-exec: install-exec-am
     
    16721574clean: clean-am
    16731575
    1674 clean-am: clean-generic clean-libtool clean-thirdpartylibLTLIBRARIES \
     1576clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
    16751577        mostlyclean-am
    16761578
     
    16921594info-am:
    16931595
    1694 install-data-am: install-addlibsDATA install-pkgconfiglibDATA \
    1695         install-thirdpartyincludeHEADERS \
    1696         install-thirdpartylibLTLIBRARIES
     1596install-data-am:
    16971597
    16981598install-exec-am:
     
    17241624ps-am:
    17251625
    1726 uninstall-am: uninstall-addlibsDATA uninstall-info-am \
    1727         uninstall-pkgconfiglibDATA uninstall-thirdpartyincludeHEADERS \
    1728         uninstall-thirdpartylibLTLIBRARIES
     1626uninstall-am: uninstall-info-am
    17291627
    17301628.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
    1731         clean-generic clean-libtool clean-thirdpartylibLTLIBRARIES \
    1732         ctags dist dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ \
    1733         dist-zip distcheck distclean distclean-compile \
    1734         distclean-generic distclean-hdr distclean-libtool \
    1735         distclean-tags distcleancheck distdir distuninstallcheck dvi \
    1736         dvi-am html html-am info info-am install install-addlibsDATA \
    1737         install-am install-data install-data-am install-exec \
    1738         install-exec-am install-info install-info-am install-man \
    1739         install-pkgconfiglibDATA install-strip \
    1740         install-thirdpartyincludeHEADERS \
    1741         install-thirdpartylibLTLIBRARIES installcheck installcheck-am \
     1629        clean-generic clean-libtool clean-noinstLTLIBRARIES ctags dist \
     1630        dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip \
     1631        distcheck distclean distclean-compile distclean-generic \
     1632        distclean-hdr distclean-libtool distclean-tags distcleancheck \
     1633        distdir distuninstallcheck dvi dvi-am html html-am info \
     1634        info-am install install-am install-data install-data-am \
     1635        install-exec install-exec-am install-info install-info-am \
     1636        install-man install-strip installcheck installcheck-am \
    17421637        installdirs maintainer-clean maintainer-clean-generic \
    17431638        mostlyclean mostlyclean-compile mostlyclean-generic \
    17441639        mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
    1745         uninstall-addlibsDATA uninstall-am uninstall-info-am \
    1746         uninstall-pkgconfiglibDATA uninstall-thirdpartyincludeHEADERS \
    1747         uninstall-thirdpartylibLTLIBRARIES
     1640        uninstall-am uninstall-info-am
    17481641
    17491642
Note: See TracChangeset for help on using the changeset viewer.