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/HSL/trunk/Makefile.am

    r1388 r1411  
    1 # Copyright (C) 2003, 2008, 2009 International Business Machines and others
     1# Copyright (C) 2003, 2008 International Business Machines and others
    22# All Rights Reserved.
    33# This file is distributed under the Common Public License.
     
    99EXTRA_DIST = INSTALL.HSL
    1010
    11 thirdpartylibdir = $(prefix)/lib/ThirdParty
    12 thirdpartylib_LTLIBRARIES = libcoinhsl.la
     11noinst_LTLIBRARIES = libcoinhsl.la
    1312
    14 libcoinhsl_la_SOURCES = dummy.c
     13nodist_libcoinhsl_la_SOURCES = dummy.c
    1514
    1615if COIN_HAS_MA27
    17   libcoinhsl_la_SOURCES += ma27ad.f
     16  nodist_libcoinhsl_la_SOURCES += ma27ad.f
    1817endif
    1918
    2019if COIN_HAS_MA57
    21   libcoinhsl_la_SOURCES += ma57ad.f
     20  nodist_libcoinhsl_la_SOURCES += ma57ad.f
    2221endif
    2322
    2423if COIN_HAS_MC19
    25   libcoinhsl_la_SOURCES += mc19ad.f
     24  nodist_libcoinhsl_la_SOURCES += mc19ad.f
    2625endif
    2726
    2827if COIN_HAS_MA28
    29   libcoinhsl_la_SOURCES += ma28ad.f ma30ad.f mc13dd.f mc20ad.f \
     28  nodist_libcoinhsl_la_SOURCES += ma28ad.f ma30ad.f mc13dd.f mc20ad.f \
    3029        mc21ad.f mc22ad.f mc23ad.f mc24ad.f
     30endif
     31
     32lib_LTLIBRARIES =
     33if INSTALL_LOADABLE_LIBRARY
     34if EXTRA_SHARED_COMMAND
     35else
     36  lib_LTLIBRARIES += libhsl.la
     37  libhsl_la_SOURCES = $(nodist_libcoinhsl_la_SOURCES)
     38endif
    3139endif
    3240
     
    3846if EXTRA_SHARED_COMMAND
    3947
    40 $(HSL_SHARED_LIB): $(thirdpartylib_LTLIBRARIES) $(DEFFILE)
     48$(HSL_SHARED_LIB): $(noinst_LTLIBRARIES) $(DEFFILE)
    4149        bla=; \
    4250        for i in $(nodist_libcoinhsl_la_SOURCES); do \
     
    6472
    6573install-exec-local: $(HSL_SHARED_LIB)
    66         test -z "$(DESTDIR)$(libdir)/ThirdParty" || $(mkdir_p) "$(DESTDIR)$(libdir)/ThirdParty"
    67         $(libLTLIBRARIES_INSTALL) $(HSL_SHARED_LIB) "$(DESTDIR)$(libdir)/ThirdParty/$(HSL_SHARED_LIB)"
     74        test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
     75        $(libLTLIBRARIES_INSTALL) $(HSL_SHARED_LIB) "$(DESTDIR)$(libdir)/$(HSL_SHARED_LIB)"
    6876
    6977CLEANFILES = $(HSL_SHARED_LIB) $(DEFFILE)
    7078
    7179uninstall-local:
    72         rm -f "$(DESTDIR)$(libdir)/ThirdParty/$(HSL_SHARED_LIB)"
     80        rm -f "$(DESTDIR)$(libdir)/$(HSL_SHARED_LIB)"
    7381endif
    74 
    75 addlibsdir = $(prefix)/share/doc/coin/ThirdParty/HSL
    76 addlibs_DATA = hsl_addlibs.txt README
    7782
    7883########################################################################
Note: See TracChangeset for help on using the changeset viewer.