Changeset 1411 for ThirdParty/FilterSQP


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

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

Location:
ThirdParty/FilterSQP/trunk
Files:
2 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/FilterSQP/trunk/Makefile.am

    r1388 r1411  
    1 # Copyright (C) 2003, 2006, 2009 International Business Machines and others.
     1# Copyright (C) 2003, 2006 International Business Machines and others.
    22# All Rights Reserved.
    33# This file is distributed under the Common Public License.
     
    99EXTRA_DIST =
    1010
    11 thirdpartylibdir = $(prefix)/lib/ThirdParty
    12 thirdpartylib_LTLIBRARIES = libfiltersqp.la
     11noinst_LTLIBRARIES = libfiltersqp.la
    1312
    14 libfiltersqp_la_SOURCES = \
     13nodist_libfiltersqp_la_SOURCES = \
    1514        source/src/auxil.f \
    1615        source/src/bqpd.f \
     
    2625libfiltersqp_la_LDFLAGS = $(LT_LDFLAGS)
    2726
    28 addlibsdir = $(prefix)/share/doc/coin/ThirdParty/FilterSQP
    29 addlibs_DATA = filtersqp_addlibs.txt README
    30 
    3127########################################################################
    3228#                         Maintainer Stuff                             #
  • ThirdParty/FilterSQP/trunk/Makefile.in

    r1388 r1411  
    1515@SET_MAKE@
    1616
    17 # Copyright (C) 2003, 2006, 2009 International Business Machines and others.
     17# Copyright (C) 2003, 2006 International Business Machines and others.
    1818# All Rights Reserved.
    1919# This file is distributed under the Common Public License.
     
    2828#                    Documentation installation                        #
    2929########################################################################
    30 
    3130
    3231srcdir = @srcdir@
     
    5251build_triplet = @build@
    5352host_triplet = @host@
    54 DIST_COMMON = README $(am__configure_deps) \
     53DIST_COMMON = $(am__configure_deps) \
    5554        $(srcdir)/../../BuildTools/Makemain.inc \
    5655        $(srcdir)/../../config.guess $(srcdir)/../../config.sub \
    5756        $(srcdir)/../../install-sh $(srcdir)/../../ltmain.sh \
    5857        $(srcdir)/../../missing $(srcdir)/Makefile.am \
    59         $(srcdir)/Makefile.in $(srcdir)/filtersqp_addlibs.txt.in \
    60         $(top_srcdir)/configure
     58        $(srcdir)/Makefile.in $(top_srcdir)/configure
    6159@HAVE_EXTERNALS_TRUE@am__append_1 = Externals
    6260@HAVE_EXTERNALS_TRUE@am__append_2 = .Externals-stamp
     
    7068 configure.lineno configure.status.lineno
    7169mkinstalldirs = $(install_sh) -d
    72 CONFIG_CLEAN_FILES = filtersqp_addlibs.txt
    73 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
    74 am__vpath_adj = case $$p in \
    75     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
    76     *) f=$$p;; \
    77   esac;
    78 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
    79 am__installdirs = "$(DESTDIR)$(thirdpartylibdir)" \
    80         "$(DESTDIR)$(addlibsdir)"
    81 thirdpartylibLTLIBRARIES_INSTALL = $(INSTALL)
    82 LTLIBRARIES = $(thirdpartylib_LTLIBRARIES)
     70CONFIG_CLEAN_FILES =
     71LTLIBRARIES = $(noinst_LTLIBRARIES)
    8372libfiltersqp_la_LIBADD =
    84 am_libfiltersqp_la_OBJECTS = auxil.lo bqpd.lo filteraux.lo filter.lo \
    85         QPsolves.lo scaling.lo sparseA.lo sparseL.lo util.lo wdotd.lo
    86 libfiltersqp_la_OBJECTS = $(am_libfiltersqp_la_OBJECTS)
     73nodist_libfiltersqp_la_OBJECTS = auxil.lo bqpd.lo filteraux.lo \
     74        filter.lo QPsolves.lo scaling.lo sparseA.lo sparseL.lo util.lo \
     75        wdotd.lo
     76libfiltersqp_la_OBJECTS = $(nodist_libfiltersqp_la_OBJECTS)
    8777DEFAULT_INCLUDES = -I. -I$(srcdir)
    8878F77COMPILE = $(F77) $(AM_FFLAGS) $(FFLAGS)
     
    9282F77LINK = $(LIBTOOL) --tag=F77 --mode=link $(F77LD) $(AM_FFLAGS) \
    9383        $(FFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
    94 SOURCES = $(libfiltersqp_la_SOURCES)
    95 DIST_SOURCES = $(libfiltersqp_la_SOURCES)
    96 addlibsDATA_INSTALL = $(INSTALL_DATA)
    97 DATA = $(addlibs_DATA)
     84SOURCES = $(nodist_libfiltersqp_la_SOURCES)
     85DIST_SOURCES =
    9886ETAGS = etags
    9987CTAGS = ctags
     
    242230AUTOMAKE_OPTIONS = foreign
    243231EXTRA_DIST = $(am__append_1)
    244 thirdpartylibdir = $(prefix)/lib/ThirdParty
    245 thirdpartylib_LTLIBRARIES = libfiltersqp.la
    246 libfiltersqp_la_SOURCES = \
     232noinst_LTLIBRARIES = libfiltersqp.la
     233nodist_libfiltersqp_la_SOURCES = \
    247234        source/src/auxil.f \
    248235        source/src/bqpd.f \
     
    257244
    258245libfiltersqp_la_LDFLAGS = $(LT_LDFLAGS)
    259 addlibsdir = $(prefix)/share/doc/coin/ThirdParty/FilterSQP
    260 addlibs_DATA = filtersqp_addlibs.txt README
    261246
    262247########################################################################
     
    305290$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
    306291        cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
    307 filtersqp_addlibs.txt: $(top_builddir)/config.status $(srcdir)/filtersqp_addlibs.txt.in
    308         cd $(top_builddir) && $(SHELL) ./config.status $@
    309 install-thirdpartylibLTLIBRARIES: $(thirdpartylib_LTLIBRARIES)
    310         @$(NORMAL_INSTALL)
    311         test -z "$(thirdpartylibdir)" || $(mkdir_p) "$(DESTDIR)$(thirdpartylibdir)"
    312         @list='$(thirdpartylib_LTLIBRARIES)'; for p in $$list; do \
    313           if test -f $$p; then \
    314             f=$(am__strip_dir) \
    315             echo " $(LIBTOOL) --mode=install $(thirdpartylibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(thirdpartylibdir)/$$f'"; \
    316             $(LIBTOOL) --mode=install $(thirdpartylibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(thirdpartylibdir)/$$f"; \
    317           else :; fi; \
    318         done
    319 
    320 uninstall-thirdpartylibLTLIBRARIES:
    321         @$(NORMAL_UNINSTALL)
    322         @set -x; list='$(thirdpartylib_LTLIBRARIES)'; for p in $$list; do \
    323           p=$(am__strip_dir) \
    324           echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(thirdpartylibdir)/$$p'"; \
    325           $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(thirdpartylibdir)/$$p"; \
    326         done
    327 
    328 clean-thirdpartylibLTLIBRARIES:
    329         -test -z "$(thirdpartylib_LTLIBRARIES)" || rm -f $(thirdpartylib_LTLIBRARIES)
    330         @list='$(thirdpartylib_LTLIBRARIES)'; for p in $$list; do \
     292
     293clean-noinstLTLIBRARIES:
     294        -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
     295        @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
    331296          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
    332297          test "$$dir" != "$$p" || dir=.; \
     
    335300        done
    336301libfiltersqp.la: $(libfiltersqp_la_OBJECTS) $(libfiltersqp_la_DEPENDENCIES)
    337         $(F77LINK) -rpath $(thirdpartylibdir) $(libfiltersqp_la_LDFLAGS) $(libfiltersqp_la_OBJECTS) $(libfiltersqp_la_LIBADD) $(LIBS)
     302        $(F77LINK) $(libfiltersqp_la_LDFLAGS) $(libfiltersqp_la_OBJECTS) $(libfiltersqp_la_LIBADD) $(LIBS)
    338303
    339304mostlyclean-compile:
     
    391356        -rm -f libtool
    392357uninstall-info-am:
    393 install-addlibsDATA: $(addlibs_DATA)
    394         @$(NORMAL_INSTALL)
    395         test -z "$(addlibsdir)" || $(mkdir_p) "$(DESTDIR)$(addlibsdir)"
    396         @list='$(addlibs_DATA)'; for p in $$list; do \
    397           if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
    398           f=$(am__strip_dir) \
    399           echo " $(addlibsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(addlibsdir)/$$f'"; \
    400           $(addlibsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(addlibsdir)/$$f"; \
    401         done
    402 
    403 uninstall-addlibsDATA:
    404         @$(NORMAL_UNINSTALL)
    405         @list='$(addlibs_DATA)'; for p in $$list; do \
    406           f=$(am__strip_dir) \
    407           echo " rm -f '$(DESTDIR)$(addlibsdir)/$$f'"; \
    408           rm -f "$(DESTDIR)$(addlibsdir)/$$f"; \
    409         done
    410358
    411359ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
     
    460408        $(am__remove_distdir)
    461409        mkdir $(distdir)
    462         $(mkdir_p) $(distdir)/. $(distdir)/../.. $(distdir)/../../BuildTools
     410        $(mkdir_p) $(distdir)/../.. $(distdir)/../../BuildTools
    463411        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    464412        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
     
    586534check-am: all-am
    587535check: check-am
    588 all-am: Makefile $(LTLIBRARIES) $(DATA)
     536all-am: Makefile $(LTLIBRARIES)
    589537installdirs:
    590         for dir in "$(DESTDIR)$(thirdpartylibdir)" "$(DESTDIR)$(addlibsdir)"; do \
    591           test -z "$$dir" || $(mkdir_p) "$$dir"; \
    592         done
    593538install: install-am
    594539install-exec: install-exec-am
     
    618563clean: clean-am
    619564
    620 clean-am: clean-generic clean-libtool clean-thirdpartylibLTLIBRARIES \
     565clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
    621566        mostlyclean-am
    622567
     
    637582info-am:
    638583
    639 install-data-am: install-addlibsDATA install-thirdpartylibLTLIBRARIES
     584install-data-am:
    640585
    641586install-exec-am:
     
    666611ps-am:
    667612
    668 uninstall-am: uninstall-addlibsDATA uninstall-info-am \
    669         uninstall-thirdpartylibLTLIBRARIES
     613uninstall-am: uninstall-info-am
    670614
    671615.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
    672         clean-generic clean-libtool clean-thirdpartylibLTLIBRARIES \
    673         ctags dist dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ \
    674         dist-zip distcheck distclean distclean-compile \
    675         distclean-generic distclean-libtool distclean-tags \
    676         distcleancheck distdir distuninstallcheck dvi dvi-am html \
    677         html-am info info-am install install-addlibsDATA install-am \
    678         install-data install-data-am install-exec install-exec-am \
    679         install-info install-info-am install-man install-strip \
    680         install-thirdpartylibLTLIBRARIES installcheck installcheck-am \
    681         installdirs maintainer-clean maintainer-clean-generic \
    682         mostlyclean mostlyclean-compile mostlyclean-generic \
    683         mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
    684         uninstall-addlibsDATA uninstall-am uninstall-info-am \
    685         uninstall-thirdpartylibLTLIBRARIES
     616        clean-generic clean-libtool clean-noinstLTLIBRARIES ctags dist \
     617        dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip \
     618        distcheck distclean distclean-compile distclean-generic \
     619        distclean-libtool distclean-tags distcleancheck distdir \
     620        distuninstallcheck dvi dvi-am html html-am info info-am \
     621        install install-am install-data install-data-am install-exec \
     622        install-exec-am install-info install-info-am install-man \
     623        install-strip installcheck installcheck-am installdirs \
     624        maintainer-clean maintainer-clean-generic mostlyclean \
     625        mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
     626        pdf pdf-am ps ps-am tags uninstall uninstall-am \
     627        uninstall-info-am
    686628
    687629
  • ThirdParty/FilterSQP/trunk/configure

    r1388 r1411  
    2105321053}
    2105421054
    21055                     ac_config_files="$ac_config_files Makefile filtersqp_addlibs.txt"
     21055          ac_config_files="$ac_config_files Makefile"
    2105621056
    2105721057
     
    2174521745  # Handling of arguments.
    2174621746  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
    21747   "filtersqp_addlibs.txt" ) CONFIG_FILES="$CONFIG_FILES filtersqp_addlibs.txt" ;;
    2174821747  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
    2174921748  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
  • ThirdParty/FilterSQP/trunk/configure.ac

    r1388 r1411  
    5252AC_COIN_INIT_AUTO_TOOLS
    5353
    54 AC_CONFIG_FILES([Makefile filtersqp_addlibs.txt])
     54AC_CONFIG_FILES([Makefile])
    5555
    5656AC_COIN_FINALIZE
Note: See TracChangeset for help on using the changeset viewer.