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/ASL/trunk/Makefile.in

    r1388 r1411  
    2828#                    Documentation installation                        #
    2929########################################################################
    30 
    31 
    3230srcdir = @srcdir@
    3331top_srcdir = @top_srcdir@
    … …  
    5250build_triplet = @build@
    5351host_triplet = @host@
    54 DIST_COMMON = README $(am__configure_deps) \
     52DIST_COMMON = $(am__configure_deps) \
    5553        $(srcdir)/../../BuildTools/Makemain.inc \
    5654        $(srcdir)/../../config.guess $(srcdir)/../../config.sub \
    5755        $(srcdir)/../../install-sh $(srcdir)/../../ltmain.sh \
    5856        $(srcdir)/../../missing $(srcdir)/Makefile.am \
    59         $(srcdir)/Makefile.in $(srcdir)/asl_addlibs.txt.in \
    60         $(srcdir)/compile_MS_ASL.in $(srcdir)/compile_Unix_ASL.in \
    61         $(thirdpartyinclude_HEADERS) $(top_srcdir)/configure
     57        $(srcdir)/Makefile.in $(srcdir)/compile_MS_ASL.in \
     58        $(srcdir)/compile_Unix_ASL.in $(top_srcdir)/configure
    6259@HAVE_EXTERNALS_TRUE@am__append_1 = Externals
    6360@HAVE_EXTERNALS_TRUE@am__append_2 = .Externals-stamp
    … …  
    7168 configure.lineno configure.status.lineno
    7269mkinstalldirs = $(install_sh) -d
    73 CONFIG_CLEAN_FILES = asl_addlibs.txt compile_MS_ASL compile_Unix_ASL
     70CONFIG_CLEAN_FILES = compile_MS_ASL compile_Unix_ASL
    7471SOURCES =
    7572DIST_SOURCES =
    76 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
    77 am__vpath_adj = case $$p in \
    78     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
    79     *) f=$$p;; \
    80   esac;
    81 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
    82 am__installdirs = "$(DESTDIR)$(addlibsdir)" \
    83         "$(DESTDIR)$(thirdpartyincludedir)"
    84 addlibsDATA_INSTALL = $(INSTALL_DATA)
    85 DATA = $(addlibs_DATA)
    86 thirdpartyincludeHEADERS_INSTALL = $(INSTALL_HEADER)
    87 HEADERS = $(thirdpartyinclude_HEADERS)
    88 ETAGS = etags
    89 CTAGS = ctags
    9073DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    9174distdir = $(PACKAGE)-$(VERSION)
    … …  
    10992AMTAR = @AMTAR@
    11093AR = @AR@
     94ASLLIB = @ASLLIB@
    11195ASLMAKEFLAGS = @ASLMAKEFLAGS@
     96ASL_CPPFLAGS = @ASL_CPPFLAGS@
    11297AUTOCONF = @AUTOCONF@
    11398AUTOHEADER = @AUTOHEADER@
    … …  
    120105CDEFS = @CDEFS@
    121106CFLAGS = @CFLAGS@
     107COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
     108COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
    122109CPP = @CPP@
    123110CPPFLAGS = @CPPFLAGS@
    … …  
    158145MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
    159146MAKEINFO = @MAKEINFO@
     147MAKEOKFILE = @MAKEOKFILE@
    160148MPICC = @MPICC@
    161149MSVC_COMPILE_FALSE = @MSVC_COMPILE_FALSE@
    … …  
    174162SET_MAKE = @SET_MAKE@
    175163SHELL = @SHELL@
     164SKIPMAKE_FALSE = @SKIPMAKE_FALSE@
     165SKIPMAKE_TRUE = @SKIPMAKE_TRUE@
    176166STRIP = @STRIP@
    177167VERSION = @VERSION@
    … …  
    238228compdir = compdir
    239229libampl = $(AMPLSOLVER_A)
    240 
    241 #if SKIPMAKE
    242 #  alltargets =
    243 #else
    244 alltargets = $(libampl) stdio1.h arith.h funcadd0.$(OBJEXT)
    245 thirdpartylibdir = $(prefix)/lib/ThirdParty
    246 addlibsdir = $(prefix)/share/doc/coin/ThirdParty/ASL
    247 addlibs_DATA = README asl_addlibs.txt
    248 thirdpartyincludedir = $(includedir)/coin/ThirdParty
    249 thirdpartyinclude_HEADERS = \
    250   solvers/asl.h solvers/asl_pfg.h solvers/asl_pfgh.h solvers/psinfo.h solvers/funcadd.h \
    251   solvers/nlp.h solvers/nlp2.h solvers/getstub.h solvers/opcode.hd solvers/r_opn.hd \
    252   stdio1.h arith.h
    253 
     230@SKIPMAKE_FALSE@alltargets = $(libampl) stdio1.h arith.h funcadd0.$(OBJEXT)
     231@SKIPMAKE_TRUE@alltargets =
    254232CLEANFILES = $(libampl) stdio1.h arith.h funcadd0.$(OBJEXT)
    255233
    … …  
    298276$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
    299277        cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
    300 asl_addlibs.txt: $(top_builddir)/config.status $(srcdir)/asl_addlibs.txt.in
    301         cd $(top_builddir) && $(SHELL) ./config.status $@
    302278compile_MS_ASL: $(top_builddir)/config.status $(srcdir)/compile_MS_ASL.in
    303279        cd $(top_builddir) && $(SHELL) ./config.status $@
    … …  
    314290        -rm -f libtool
    315291uninstall-info-am:
    316 install-addlibsDATA: $(addlibs_DATA)
    317         @$(NORMAL_INSTALL)
    318         test -z "$(addlibsdir)" || $(mkdir_p) "$(DESTDIR)$(addlibsdir)"
    319         @list='$(addlibs_DATA)'; for p in $$list; do \
    320           if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
    321           f=$(am__strip_dir) \
    322           echo " $(addlibsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(addlibsdir)/$$f'"; \
    323           $(addlibsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(addlibsdir)/$$f"; \
    324         done
    325 
    326 uninstall-addlibsDATA:
    327         @$(NORMAL_UNINSTALL)
    328         @list='$(addlibs_DATA)'; for p in $$list; do \
    329           f=$(am__strip_dir) \
    330           echo " rm -f '$(DESTDIR)$(addlibsdir)/$$f'"; \
    331           rm -f "$(DESTDIR)$(addlibsdir)/$$f"; \
    332         done
    333 install-thirdpartyincludeHEADERS: $(thirdpartyinclude_HEADERS)
    334         @$(NORMAL_INSTALL)
    335         test -z "$(thirdpartyincludedir)" || $(mkdir_p) "$(DESTDIR)$(thirdpartyincludedir)"
    336         @list='$(thirdpartyinclude_HEADERS)'; for p in $$list; do \
    337           if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
    338           f=$(am__strip_dir) \
    339           echo " $(thirdpartyincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(thirdpartyincludedir)/$$f'"; \
    340           $(thirdpartyincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(thirdpartyincludedir)/$$f"; \
    341         done
    342 
    343 uninstall-thirdpartyincludeHEADERS:
    344         @$(NORMAL_UNINSTALL)
    345         @list='$(thirdpartyinclude_HEADERS)'; for p in $$list; do \
    346           f=$(am__strip_dir) \
    347           echo " rm -f '$(DESTDIR)$(thirdpartyincludedir)/$$f'"; \
    348           rm -f "$(DESTDIR)$(thirdpartyincludedir)/$$f"; \
    349         done
    350 
    351 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
    352         list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
    353         unique=`for i in $$list; do \
    354             if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
    355           done | \
    356           $(AWK) '    { files[$$0] = 1; } \
    357                END { for (i in files) print i; }'`; \
    358         mkid -fID $$unique
    359292tags: TAGS
    360 
    361 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
    362                 $(TAGS_FILES) $(LISP)
    363         tags=; \
    364         here=`pwd`; \
    365         list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
    366         unique=`for i in $$list; do \
    367             if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
    368           done | \
    369           $(AWK) '    { files[$$0] = 1; } \
    370                END { for (i in files) print i; }'`; \
    371         if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
    372           test -n "$$unique" || unique=$$empty_fix; \
    373           $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
    374             $$tags $$unique; \
    375         fi
     293TAGS:
     294
    376295ctags: CTAGS
    377 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
    378                 $(TAGS_FILES) $(LISP)
    379         tags=; \
    380         here=`pwd`; \
    381         list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
    382         unique=`for i in $$list; do \
    383             if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
    384           done | \
    385           $(AWK) '    { files[$$0] = 1; } \
    386                END { for (i in files) print i; }'`; \
    387         test -z "$(CTAGS_ARGS)$$tags$$unique" \
    388           || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
    389              $$tags $$unique
    390 
    391 GTAGS:
    392         here=`$(am__cd) $(top_builddir) && pwd` \
    393           && cd $(top_srcdir) \
    394           && gtags -i $(GTAGS_ARGS) $$here
    395 
    396 distclean-tags:
    397         -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
     296CTAGS:
     297
    398298
    399299distdir: $(DISTFILES)
    400300        $(am__remove_distdir)
    401301        mkdir $(distdir)
    402         $(mkdir_p) $(distdir)/. $(distdir)/../.. $(distdir)/../../BuildTools $(distdir)/solvers
     302        $(mkdir_p) $(distdir)/. $(distdir)/../.. $(distdir)/../../BuildTools
    403303        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    404304        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
    … …  
    526426check-am: all-am
    527427check: check-am
    528 all-am: Makefile $(DATA) $(HEADERS) all-local
     428all-am: Makefile all-local
    529429installdirs:
    530         for dir in "$(DESTDIR)$(addlibsdir)" "$(DESTDIR)$(thirdpartyincludedir)"; do \
    531           test -z "$$dir" || $(mkdir_p) "$$dir"; \
    532         done
    533430install: install-am
    534431install-exec: install-exec-am
    … …  
    564461        -rm -f $(am__CONFIG_DISTCLEAN_FILES)
    565462        -rm -f Makefile
    566 distclean-am: clean-am distclean-generic distclean-libtool \
    567         distclean-tags
     463distclean-am: clean-am distclean-generic distclean-libtool
    568464
    569465dvi: dvi-am
    … …  
    577473info-am:
    578474
    579 install-data-am: install-addlibsDATA install-thirdpartyincludeHEADERS
    580 
    581 install-exec-am: install-exec-local
     475install-data-am:
     476
     477install-exec-am:
    582478
    583479install-info: install-info-am
    … …  
    605501ps-am:
    606502
    607 uninstall-am: uninstall-addlibsDATA uninstall-info-am uninstall-local \
    608         uninstall-thirdpartyincludeHEADERS
    609 
    610 .PHONY: CTAGS GTAGS all all-am all-local am--refresh check check-am \
    611         clean clean-generic clean-libtool ctags dist dist-all \
    612         dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip distcheck \
    613         distclean distclean-generic distclean-libtool distclean-tags \
    614         distcleancheck distdir distuninstallcheck dvi dvi-am html \
    615         html-am info info-am install install-addlibsDATA install-am \
    616         install-data install-data-am install-exec install-exec-am \
    617         install-exec-local install-info install-info-am install-man \
    618         install-strip install-thirdpartyincludeHEADERS installcheck \
    619         installcheck-am installdirs maintainer-clean \
    620         maintainer-clean-generic mostlyclean mostlyclean-generic \
    621         mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
    622         uninstall-addlibsDATA uninstall-am uninstall-info-am \
    623         uninstall-local uninstall-thirdpartyincludeHEADERS
    624 
    625 #endif
     503uninstall-am: uninstall-info-am
     504
     505.PHONY: all all-am all-local am--refresh check check-am clean \
     506        clean-generic clean-libtool dist dist-all dist-bzip2 dist-gzip \
     507        dist-shar dist-tarZ dist-zip distcheck distclean \
     508        distclean-generic distclean-libtool distcleancheck distdir \
     509        distuninstallcheck dvi dvi-am html html-am info info-am \
     510        install install-am install-data install-data-am install-exec \
     511        install-exec-am install-info install-info-am install-man \
     512        install-strip installcheck installcheck-am installdirs \
     513        maintainer-clean maintainer-clean-generic mostlyclean \
     514        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
     515        uninstall uninstall-am uninstall-info-am
     516
    626517
    627518all-local: $(alltargets)
    … …  
    633524
    634525stdio1.h arith.h funcadd0.$(OBJEXT): $(libampl)
    635 install-exec-local: $(libampl)
    636         test -z "$(DESTDIR)$(thirdpartylibdir)" || $(mkdir_p) "$(DESTDIR)$(thirdpartylibdir)"
    637         $(install_sh_DATA) $(libampl) "$(DESTDIR)$(thirdpartylibdir)/$(libampl)"
    638 
    639 uninstall-local:
    640         rm -f $(DESTDIR)$(thirdpartylibdir)/$(libampl)
    641526
    642527install-doc: $(DocFiles)
Note: See TracChangeset for help on using the changeset viewer.