Changeset 1411 for ThirdParty/HSL/trunk/Makefile.am

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:

• ThirdParty/HSL/trunk/Makefile.am (modified) (4 diffs)

ThirdParty/HSL/trunk/Makefile.am

@@ -1 @@
-# Copyright (C) 2003, 2008, 2009 International Business Machines and others
+# Copyright (C) 2003, 2008 International Business Machines and others
 # All Rights Reserved.
 # This file is distributed under the Common Public License.
@@ -9 +9 @@
 EXTRA_DIST = INSTALL.HSL
 
-thirdpartylibdir = $(prefix)/lib/ThirdParty
-thirdpartylib_LTLIBRARIES = libcoinhsl.la
+noinst_LTLIBRARIES = libcoinhsl.la
 
-libcoinhsl_la_SOURCES = dummy.c
+nodist_libcoinhsl_la_SOURCES = dummy.c
 
 if COIN_HAS_MA27
-  libcoinhsl_la_SOURCES += ma27ad.f
+  nodist_libcoinhsl_la_SOURCES += ma27ad.f
 endif
 
 if COIN_HAS_MA57
-  libcoinhsl_la_SOURCES += ma57ad.f
+  nodist_libcoinhsl_la_SOURCES += ma57ad.f
 endif
 
 if COIN_HAS_MC19
-  libcoinhsl_la_SOURCES += mc19ad.f
+  nodist_libcoinhsl_la_SOURCES += mc19ad.f
 endif
 
 if COIN_HAS_MA28
-  libcoinhsl_la_SOURCES += ma28ad.f ma30ad.f mc13dd.f mc20ad.f \
+  nodist_libcoinhsl_la_SOURCES += ma28ad.f ma30ad.f mc13dd.f mc20ad.f \
         mc21ad.f mc22ad.f mc23ad.f mc24ad.f
+endif
+
+lib_LTLIBRARIES =
+if INSTALL_LOADABLE_LIBRARY
+if EXTRA_SHARED_COMMAND
+else
+  lib_LTLIBRARIES += libhsl.la
+  libhsl_la_SOURCES = $(nodist_libcoinhsl_la_SOURCES)
+endif
 endif
 
@@ -38 +46 @@
 if EXTRA_SHARED_COMMAND
 
-$(HSL_SHARED_LIB): $(thirdpartylib_LTLIBRARIES) $(DEFFILE)
+$(HSL_SHARED_LIB): $(noinst_LTLIBRARIES) $(DEFFILE)
         bla=; \
         for i in $(nodist_libcoinhsl_la_SOURCES); do \
@@ -64 +72 @@
 
 install-exec-local: $(HSL_SHARED_LIB)
-        test -z "$(DESTDIR)$(libdir)/ThirdParty" || $(mkdir_p) "$(DESTDIR)$(libdir)/ThirdParty"
-        $(libLTLIBRARIES_INSTALL) $(HSL_SHARED_LIB) "$(DESTDIR)$(libdir)/ThirdParty/$(HSL_SHARED_LIB)"
+        test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+        $(libLTLIBRARIES_INSTALL) $(HSL_SHARED_LIB) "$(DESTDIR)$(libdir)/$(HSL_SHARED_LIB)"
 
 CLEANFILES = $(HSL_SHARED_LIB) $(DEFFILE)
 
 uninstall-local:
-        rm -f "$(DESTDIR)$(libdir)/ThirdParty/$(HSL_SHARED_LIB)"
+        rm -f "$(DESTDIR)$(libdir)/$(HSL_SHARED_LIB)"
 endif
-
-addlibsdir = $(prefix)/share/doc/coin/ThirdParty/HSL
-addlibs_DATA = hsl_addlibs.txt README
 
 ########################################################################