Ignore:
Timestamp:
Apr 30, 2010 11:02:15 AM (10 years ago)
Author:
stefan
Message:

rerun autotools; generate addlibs files from .pc files; remove empty README's

File:
1 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/ASL/branches/split/Makefile.in

    r1490 r1539  
    5252build_triplet = @build@
    5353host_triplet = @host@
    54 DIST_COMMON = README $(am__configure_deps) \
     54DIST_COMMON = $(am__configure_deps) \
    5555        $(srcdir)/../../BuildTools/Makemain.inc \
    5656        $(srcdir)/../../config.guess $(srcdir)/../../config.sub \
    5757        $(srcdir)/../../install-sh $(srcdir)/../../ltmain.sh \
    5858        $(srcdir)/../../missing $(srcdir)/Makefile.am \
    59         $(srcdir)/Makefile.in $(srcdir)/asl_addlibs.txt.in \
    60         $(srcdir)/coinasl-uninstalled.pc.in $(srcdir)/coinasl.pc.in \
    61         $(srcdir)/compile_MS_ASL.in $(srcdir)/compile_Unix_ASL.in \
    62         $(thirdpartyinclude_HEADERS) $(top_srcdir)/configure
     59        $(srcdir)/Makefile.in $(srcdir)/coinasl-uninstalled.pc.in \
     60        $(srcdir)/coinasl.pc.in $(srcdir)/compile_MS_ASL.in \
     61        $(srcdir)/compile_Unix_ASL.in $(thirdpartyinclude_HEADERS) \
     62        $(top_srcdir)/configure
    6363@HAVE_EXTERNALS_TRUE@am__append_1 = Externals
    6464@HAVE_EXTERNALS_TRUE@am__append_2 = .Externals-stamp
     
    7272 configure.lineno configure.status.lineno
    7373mkinstalldirs = $(install_sh) -d
    74 CONFIG_CLEAN_FILES = asl_addlibs.txt compile_MS_ASL compile_Unix_ASL \
    75         coinasl.pc coinasl-uninstalled.pc
     74CONFIG_CLEAN_FILES = compile_MS_ASL compile_Unix_ASL coinasl.pc \
     75        coinasl-uninstalled.pc
    7676SOURCES =
    7777DIST_SOURCES =
     
    8383am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
    8484am__installdirs = "$(DESTDIR)$(addlibsdir)" \
    85         "$(DESTDIR)$(pkgconfiglibdir)" \
     85        "$(DESTDIR)$(pkgconfiglibdir)" "$(DESTDIR)$(thirdpartylibdir)" \
    8686        "$(DESTDIR)$(thirdpartyincludedir)"
    8787addlibsDATA_INSTALL = $(INSTALL_DATA)
    8888pkgconfiglibDATA_INSTALL = $(INSTALL_DATA)
    89 DATA = $(addlibs_DATA) $(pkgconfiglib_DATA)
     89thirdpartylibDATA_INSTALL = $(INSTALL_DATA)
     90DATA = $(addlibs_DATA) $(pkgconfiglib_DATA) $(thirdpartylib_DATA)
    9091thirdpartyincludeHEADERS_INSTALL = $(INSTALL_HEADER)
    9192HEADERS = $(thirdpartyinclude_HEADERS)
     
    127128CDEFS = @CDEFS@
    128129CFLAGS = @CFLAGS@
     130COIN_HAS_PKGCONFIG_FALSE = @COIN_HAS_PKGCONFIG_FALSE@
     131COIN_HAS_PKGCONFIG_TRUE = @COIN_HAS_PKGCONFIG_TRUE@
    129132CPP = @CPP@
    130133CPPFLAGS = @CPPFLAGS@
     
    177180PACKAGE_VERSION = @PACKAGE_VERSION@
    178181PATH_SEPARATOR = @PATH_SEPARATOR@
     182PKG_CONFIG = @PKG_CONFIG@
    179183RANLIB = @RANLIB@
    180184RPATH_FLAGS = @RPATH_FLAGS@
     
    196200ac_ct_STRIP = @ac_ct_STRIP@
    197201ac_cxx_preproc_warn_flag = @ac_cxx_preproc_warn_flag@
     202ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
    198203am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
    199204am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
     
    245250compdir = compdir
    246251libampl = $(AMPLSOLVER_A)
    247 
    248 #if SKIPMAKE
    249 #  alltargets =
    250 #else
    251252alltargets = $(libampl) stdio1.h arith.h funcadd0.$(OBJEXT)
    252 thirdpartylibdir = $(libdir)/coin/ThirdParty
    253 addlibsdir = $(datadir)/coin/doc/ThirdParty/ASL
    254 addlibs_DATA = README asl_addlibs.txt
    255253thirdpartyincludedir = $(includedir)/coin/ThirdParty
    256254thirdpartyinclude_HEADERS = \
     
    259257  stdio1.h arith.h
    260258
     259thirdpartylibdir = $(libdir)/coin/ThirdParty
     260thirdpartylib_DATA = $(libampl)
     261@COIN_HAS_PKGCONFIG_TRUE@addlibsdir = $(datadir)/coin/doc/ThirdParty/ASL
     262@COIN_HAS_PKGCONFIG_TRUE@addlibs_DATA = asl_addlibs.txt
    261263pkgconfiglibdir = $(libdir)/pkgconfig
    262264pkgconfiglib_DATA = coinasl.pc
    263 CLEANFILES = $(libampl) stdio1.h arith.h funcadd0.$(OBJEXT)
     265CLEANFILES = $(libampl) stdio1.h arith.h funcadd0.$(OBJEXT) asl_addlibs.txt
    264266
    265267########################################################################
     
    307309$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
    308310        cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
    309 asl_addlibs.txt: $(top_builddir)/config.status $(srcdir)/asl_addlibs.txt.in
    310         cd $(top_builddir) && $(SHELL) ./config.status $@
    311311compile_MS_ASL: $(top_builddir)/config.status $(srcdir)/compile_MS_ASL.in
    312312        cd $(top_builddir) && $(SHELL) ./config.status $@
     
    360360          echo " rm -f '$(DESTDIR)$(pkgconfiglibdir)/$$f'"; \
    361361          rm -f "$(DESTDIR)$(pkgconfiglibdir)/$$f"; \
     362        done
     363install-thirdpartylibDATA: $(thirdpartylib_DATA)
     364        @$(NORMAL_INSTALL)
     365        test -z "$(thirdpartylibdir)" || $(mkdir_p) "$(DESTDIR)$(thirdpartylibdir)"
     366        @list='$(thirdpartylib_DATA)'; for p in $$list; do \
     367          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
     368          f=$(am__strip_dir) \
     369          echo " $(thirdpartylibDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(thirdpartylibdir)/$$f'"; \
     370          $(thirdpartylibDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(thirdpartylibdir)/$$f"; \
     371        done
     372
     373uninstall-thirdpartylibDATA:
     374        @$(NORMAL_UNINSTALL)
     375        @list='$(thirdpartylib_DATA)'; for p in $$list; do \
     376          f=$(am__strip_dir) \
     377          echo " rm -f '$(DESTDIR)$(thirdpartylibdir)/$$f'"; \
     378          rm -f "$(DESTDIR)$(thirdpartylibdir)/$$f"; \
    362379        done
    363380install-thirdpartyincludeHEADERS: $(thirdpartyinclude_HEADERS)
     
    558575all-am: Makefile $(DATA) $(HEADERS) all-local
    559576installdirs:
    560         for dir in "$(DESTDIR)$(addlibsdir)" "$(DESTDIR)$(pkgconfiglibdir)" "$(DESTDIR)$(thirdpartyincludedir)"; do \
     577        for dir in "$(DESTDIR)$(addlibsdir)" "$(DESTDIR)$(pkgconfiglibdir)" "$(DESTDIR)$(thirdpartylibdir)" "$(DESTDIR)$(thirdpartyincludedir)"; do \
    561578          test -z "$$dir" || $(mkdir_p) "$$dir"; \
    562579        done
     
    608625
    609626install-data-am: install-addlibsDATA install-pkgconfiglibDATA \
    610         install-thirdpartyincludeHEADERS
    611 
    612 install-exec-am: install-exec-local
     627        install-thirdpartyincludeHEADERS install-thirdpartylibDATA
     628
     629install-exec-am:
    613630
    614631install-info: install-info-am
     
    636653ps-am:
    637654
    638 uninstall-am: uninstall-addlibsDATA uninstall-info-am uninstall-local \
    639         uninstall-pkgconfiglibDATA uninstall-thirdpartyincludeHEADERS
     655uninstall-am: uninstall-addlibsDATA uninstall-info-am \
     656        uninstall-pkgconfiglibDATA uninstall-thirdpartyincludeHEADERS \
     657        uninstall-thirdpartylibDATA
    640658
    641659.PHONY: CTAGS GTAGS all all-am all-local am--refresh check check-am \
     
    646664        html-am info info-am install install-addlibsDATA install-am \
    647665        install-data install-data-am install-exec install-exec-am \
    648         install-exec-local install-info install-info-am install-man \
     666        install-info install-info-am install-man \
    649667        install-pkgconfiglibDATA install-strip \
    650         install-thirdpartyincludeHEADERS installcheck installcheck-am \
    651         installdirs maintainer-clean maintainer-clean-generic \
    652         mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
    653         ps ps-am tags uninstall uninstall-addlibsDATA uninstall-am \
    654         uninstall-info-am uninstall-local uninstall-pkgconfiglibDATA \
    655         uninstall-thirdpartyincludeHEADERS
    656 
    657 #endif
     668        install-thirdpartyincludeHEADERS install-thirdpartylibDATA \
     669        installcheck installcheck-am installdirs maintainer-clean \
     670        maintainer-clean-generic mostlyclean mostlyclean-generic \
     671        mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
     672        uninstall-addlibsDATA uninstall-am uninstall-info-am \
     673        uninstall-pkgconfiglibDATA uninstall-thirdpartyincludeHEADERS \
     674        uninstall-thirdpartylibDATA
     675
    658676
    659677all-local: $(alltargets)
     
    665683
    666684stdio1.h arith.h funcadd0.$(OBJEXT): $(libampl)
    667 install-exec-local: $(libampl)
    668         test -z "$(DESTDIR)$(thirdpartylibdir)" || $(mkdir_p) "$(DESTDIR)$(thirdpartylibdir)"
    669         $(install_sh_DATA) $(libampl) "$(DESTDIR)$(thirdpartylibdir)/$(libampl)"
    670 
    671 uninstall-local:
    672         rm -f $(DESTDIR)$(thirdpartylibdir)/$(libampl)
     685
     686@COIN_HAS_PKGCONFIG_TRUE@asl_addlibs.txt : coinasl.pc
     687@COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=.:$(libdir)/pkgconfig:${PKG_CONFIG_PATH} $(PKG_CONFIG) --libs coinasl > asl_addlibs.txt
    673688
    674689install-doc: $(DocFiles)
Note: See TracChangeset for help on using the changeset viewer.