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

    r1396 r1411  
    99EXTRA_DIST = get.GLPK INSTALL.Glpk glpk.patch
    1010
    11 thirdpartylibdir = $(prefix)/lib/ThirdParty
    12 thirdpartylib_LTLIBRARIES = libcoinglpk.la
     11if COIN_BUILD_GLPK
     12  noinst_LTLIBRARIES = libcoinglpk.la
     13else
     14  noinst_LTLIBRARIES =
     15endif
    1316
    1417GLPKDIR = @GLPKDIR@
    1518
    16 libcoinglpk_la_SOURCES = \
     19nodist_libcoinglpk_la_SOURCES = \
    1720$(GLPKDIR)/src/glpapi01.c \
    1821$(GLPKDIR)/src/glpapi02.c \
     
    167170libcoinglpk_la_LDFLAGS = $(LT_LDFLAGS)
    168171
    169 thirdpartyincludedir = $(includedir)/coin/ThirdParty
    170 thirdpartyinclude_HEADERS = $(GLPKDIR)/include/glpk.h
    171 
    172 addlibsdir = $(prefix)/share/doc/coin/ThirdParty/Glpk
    173 addlibs_DATA = glpk_addlibs.txt README
    174 
    175 pkgconfiglibdir = $(prefix)/lib/ThirdParty/pkgconfig
    176 pkgconfiglib_DATA = glpk.pc
    177 
    178172########################################################################
    179173#                         Maintainer Stuff                             #
Note: See TracChangeset for help on using the changeset viewer.