Changeset 1411 for ThirdParty/Glpk/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/Glpk/trunk/Makefile.am (modified) (2 diffs)

ThirdParty/Glpk/trunk/Makefile.am

@@ -9 +9 @@
 EXTRA_DIST = get.GLPK INSTALL.Glpk glpk.patch
 
-thirdpartylibdir = $(prefix)/lib/ThirdParty
-thirdpartylib_LTLIBRARIES = libcoinglpk.la
+if COIN_BUILD_GLPK
+  noinst_LTLIBRARIES = libcoinglpk.la
+else
+  noinst_LTLIBRARIES =
+endif
 
 GLPKDIR = @GLPKDIR@
 
-libcoinglpk_la_SOURCES = \
+nodist_libcoinglpk_la_SOURCES = \
 $(GLPKDIR)/src/glpapi01.c \
 $(GLPKDIR)/src/glpapi02.c \
@@ -167 +170 @@
 libcoinglpk_la_LDFLAGS = $(LT_LDFLAGS)
 
-thirdpartyincludedir = $(includedir)/coin/ThirdParty
-thirdpartyinclude_HEADERS = $(GLPKDIR)/include/glpk.h
-
-addlibsdir = $(prefix)/share/doc/coin/ThirdParty/Glpk
-addlibs_DATA = glpk_addlibs.txt README
-
-pkgconfiglibdir = $(prefix)/lib/ThirdParty/pkgconfig
-pkgconfiglib_DATA = glpk.pc
-
 ########################################################################
 #                         Maintainer Stuff                             #