Changeset 2143 for ThirdParty/ASL


Ignore:
Timestamp:
Mar 27, 2011 1:59:19 PM (9 years ago)
Author:
stefan
Message:

fix install/uninstall of libcoinasl.la

Location:
ThirdParty/ASL/trunk
Files:
2 edited

Legend:

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

    r2142 r2143  
    5656        rm -rf linkdir
    5757
     58install-exec-local: libcoinasl.la
     59        test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
     60        if test -f libcoinasl.la; then \
     61          $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) libcoinasl.la "$(DESTDIR)$(libdir)/libcoinasl.la"; \
     62        fi
     63       
     64uninstall-local:
     65        $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/libcoinasl.la"
     66
    5867alltargets += libcoinasl.la
    5968
    60 thirdpartylibdir = $(libdir)
    61 thirdpartylib_DATA = libcoinasl.la
    6269endif
    6370
  • ThirdParty/ASL/trunk/Makefile.in

    r2142 r2143  
    2525#    in a shared library build, this should give a shared libcoinasl.so library
    2626#    further, configure should have taken care of adding -fPIC -DPIC to the CFLAGS when compiling the ASL sources
    27 #    to avoid a libtool warning and
     27#    to avoid a failure when building static libraries and a libtool warning, we additionally create .lo files for each object
    2828
    2929# Copyright (C) 2006, 2007 International Business Machines and others.
     
    8888am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
    8989am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfiglibdir)" \
    90         "$(DESTDIR)$(thirdpartylibdir)" \
    9190        "$(DESTDIR)$(thirdpartyincludedir)"
    9291libLTLIBRARIES_INSTALL = $(INSTALL)
     
    110109DIST_SOURCES = $(libcoinasl_la_SOURCES)
    111110pkgconfiglibDATA_INSTALL = $(INSTALL_DATA)
    112 thirdpartylibDATA_INSTALL = $(INSTALL_DATA)
    113 DATA = $(pkgconfiglib_DATA) $(thirdpartylib_DATA)
     111DATA = $(pkgconfiglib_DATA)
    114112thirdpartyincludeHEADERS_INSTALL = $(INSTALL_HEADER)
    115113HEADERS = $(thirdpartyinclude_HEADERS)
     
    280278compdir = compdir
    281279alltargets = stdio1.h arith.h funcadd0.$(OBJEXT) $(am__append_1)
    282 @COIN_CC_IS_CL_FALSE@thirdpartylibdir = $(libdir)
    283 @COIN_CC_IS_CL_FALSE@thirdpartylib_DATA = libcoinasl.la
    284280thirdpartyincludedir = $(includedir)/coin/ThirdParty
    285281thirdpartyinclude_HEADERS = \
     
    405401          echo " rm -f '$(DESTDIR)$(pkgconfiglibdir)/$$f'"; \
    406402          rm -f "$(DESTDIR)$(pkgconfiglibdir)/$$f"; \
    407         done
    408 install-thirdpartylibDATA: $(thirdpartylib_DATA)
    409         @$(NORMAL_INSTALL)
    410         test -z "$(thirdpartylibdir)" || $(mkdir_p) "$(DESTDIR)$(thirdpartylibdir)"
    411         @list='$(thirdpartylib_DATA)'; for p in $$list; do \
    412           if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
    413           f=$(am__strip_dir) \
    414           echo " $(thirdpartylibDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(thirdpartylibdir)/$$f'"; \
    415           $(thirdpartylibDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(thirdpartylibdir)/$$f"; \
    416         done
    417 
    418 uninstall-thirdpartylibDATA:
    419         @$(NORMAL_UNINSTALL)
    420         @list='$(thirdpartylib_DATA)'; for p in $$list; do \
    421           f=$(am__strip_dir) \
    422           echo " rm -f '$(DESTDIR)$(thirdpartylibdir)/$$f'"; \
    423           rm -f "$(DESTDIR)$(thirdpartylibdir)/$$f"; \
    424403        done
    425404install-thirdpartyincludeHEADERS: $(thirdpartyinclude_HEADERS)
     
    620599all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) all-local
    621600installdirs:
    622         for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfiglibdir)" "$(DESTDIR)$(thirdpartylibdir)" "$(DESTDIR)$(thirdpartyincludedir)"; do \
     601        for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfiglibdir)" "$(DESTDIR)$(thirdpartyincludedir)"; do \
    623602          test -z "$$dir" || $(mkdir_p) "$$dir"; \
    624603        done
     
    649628        @echo "This command is intended for maintainers to use"
    650629        @echo "it deletes files that may require special tools to rebuild."
     630@COIN_CC_IS_CL_TRUE@uninstall-local:
     631@COIN_CC_IS_CL_TRUE@install-exec-local:
    651632clean: clean-am
    652633
     
    671652
    672653install-data-am: install-pkgconfiglibDATA \
    673         install-thirdpartyincludeHEADERS install-thirdpartylibDATA
    674 
    675 install-exec-am: install-libLTLIBRARIES
     654        install-thirdpartyincludeHEADERS
     655
     656install-exec-am: install-exec-local install-libLTLIBRARIES
    676657
    677658install-info: install-info-am
     
    701682
    702683uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
    703         uninstall-pkgconfiglibDATA uninstall-thirdpartyincludeHEADERS \
    704         uninstall-thirdpartylibDATA
     684        uninstall-local uninstall-pkgconfiglibDATA \
     685        uninstall-thirdpartyincludeHEADERS
    705686
    706687.PHONY: CTAGS GTAGS all all-am all-local am--refresh check check-am \
     
    711692        distcleancheck distdir distuninstallcheck dvi dvi-am html \
    712693        html-am info info-am install install-am install-data \
    713         install-data-am install-exec install-exec-am install-info \
    714         install-info-am install-libLTLIBRARIES install-man \
    715         install-pkgconfiglibDATA install-strip \
    716         install-thirdpartyincludeHEADERS install-thirdpartylibDATA \
    717         installcheck installcheck-am installdirs maintainer-clean \
     694        install-data-am install-exec install-exec-am \
     695        install-exec-local install-info install-info-am \
     696        install-libLTLIBRARIES install-man install-pkgconfiglibDATA \
     697        install-strip install-thirdpartyincludeHEADERS installcheck \
     698        installcheck-am installdirs maintainer-clean \
    718699        maintainer-clean-generic mostlyclean mostlyclean-compile \
    719700        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
    720701        tags uninstall uninstall-am uninstall-info-am \
    721         uninstall-libLTLIBRARIES uninstall-pkgconfiglibDATA \
    722         uninstall-thirdpartyincludeHEADERS uninstall-thirdpartylibDATA
     702        uninstall-libLTLIBRARIES uninstall-local \
     703        uninstall-pkgconfiglibDATA uninstall-thirdpartyincludeHEADERS
    723704
    724705
     
    735716@COIN_CC_IS_CL_FALSE@     lofile=`echo $$i | sed -e 's/.o$$/.lo/'`; \
    736717@COIN_CC_IS_CL_FALSE@     echo "# fake line" > $$lofile ; \
    737 @COIN_CC_IS_CL_FALSE@     echo "# Generated by bla libtool" >> $$lofile ; \
     718@COIN_CC_IS_CL_FALSE@     echo "# Generated by fake libtool" >> $$lofile ; \
    738719@COIN_CC_IS_CL_FALSE@     echo "pic_object='$$i'" >> $$lofile ; \
    739720@COIN_CC_IS_CL_FALSE@     echo "non_pic_object='$$i'" >> $$lofile ; \
     
    742723@COIN_CC_IS_CL_FALSE@   rm -rf linkdir
    743724
     725@COIN_CC_IS_CL_FALSE@install-exec-local: libcoinasl.la
     726@COIN_CC_IS_CL_FALSE@   test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
     727@COIN_CC_IS_CL_FALSE@   if test -f libcoinasl.la; then \
     728@COIN_CC_IS_CL_FALSE@          $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) libcoinasl.la "$(DESTDIR)$(libdir)/libcoinasl.la"; \
     729@COIN_CC_IS_CL_FALSE@   fi
     730
     731@COIN_CC_IS_CL_FALSE@uninstall-local:
     732@COIN_CC_IS_CL_FALSE@   $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/libcoinasl.la"
     733
    744734stdio1.h arith.h funcadd0.$(OBJEXT): $(AMPLSOLVER_A)
    745735
Note: See TracChangeset for help on using the changeset viewer.