Ignore:
Timestamp:
May 8, 2010 9:54:35 AM (11 years ago)
Author:
stefan
Message:

copy over pkg-config setup and making thirdparty projects installable projects from split branch

File:
1 edited

Legend:

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

    r1471 r1548  
    99EXTRA_DIST = get.GLPK INSTALL.Glpk glpk.patch
    1010
    11 if COIN_BUILD_GLPK
    12   noinst_LTLIBRARIES = libcoinglpk.la
    13 else
    14   noinst_LTLIBRARIES =
    15 endif
     11thirdpartylibdir = $(libdir)/coin/ThirdParty
     12thirdpartylib_LTLIBRARIES = libcoinglpk.la
    1613
    1714GLPKDIR = @GLPKDIR@
    1815
    19 nodist_libcoinglpk_la_SOURCES = \
     16libcoinglpk_la_SOURCES = \
    2017$(GLPKDIR)/src/glpapi01.c \
    2118$(GLPKDIR)/src/glpapi02.c \
     
    127124$(GLPKDIR)/src/colamd/colamd.c
    128125
    129 # CoinUtils and SYMPHONY include glpmpl.h, have HAVE_CONFIG_H defined,
    130 # and so Glpk attempts to include config.h.
    131 # Therefore, we put a simple config.h file into $(GLPKDIR)/include.
    132 # It's purpose is to include the config_glpk.h file that is generated
    133 # by configure.
    134 libcoinglpk_la_DEPENDENCIES = $(srcdir)/$(GLPKDIR)/include/config.h \
    135   $(srcdir)/$(GLPKDIR)/include/glpmpl.h \
    136   $(srcdir)/$(GLPKDIR)/include/glpavl.h \
    137   $(srcdir)/$(GLPKDIR)/include/glprng.h \
    138   $(srcdir)/$(GLPKDIR)/include/glpdmp.h \
    139   $(srcdir)/$(GLPKDIR)/include/glpenv.h \
    140   $(srcdir)/$(GLPKDIR)/include/glplib.h \
    141   $(srcdir)/$(GLPKDIR)/include/glpstd.h
    142 
    143 $(srcdir)/$(GLPKDIR)/include/config.h : $(srcdir)/config.h
    144         cp $(srcdir)/config.h $(srcdir)/$(GLPKDIR)/include/config.h
    145 
    146 $(srcdir)/$(GLPKDIR)/include/glpmpl.h : $(srcdir)/$(GLPKDIR)/src/glpmpl.h
    147         cp $(srcdir)/$(GLPKDIR)/src/glpmpl.h $(srcdir)/$(GLPKDIR)/include/glpmpl.h
    148 
    149 $(srcdir)/$(GLPKDIR)/include/glpavl.h : $(srcdir)/$(GLPKDIR)/src/glpavl.h
    150         cp $(srcdir)/$(GLPKDIR)/src/glpavl.h $(srcdir)/$(GLPKDIR)/include/glpavl.h
    151 
    152 $(srcdir)/$(GLPKDIR)/include/glprng.h : $(srcdir)/$(GLPKDIR)/src/glprng.h
    153         cp $(srcdir)/$(GLPKDIR)/src/glprng.h $(srcdir)/$(GLPKDIR)/include/glprng.h
    154 
    155 $(srcdir)/$(GLPKDIR)/include/glpdmp.h : $(srcdir)/$(GLPKDIR)/src/glpdmp.h
    156         cp $(srcdir)/$(GLPKDIR)/src/glpdmp.h $(srcdir)/$(GLPKDIR)/include/glpdmp.h
    157 
    158 $(srcdir)/$(GLPKDIR)/include/glpenv.h : $(srcdir)/$(GLPKDIR)/src/glpenv.h
    159         cp $(srcdir)/$(GLPKDIR)/src/glpenv.h $(srcdir)/$(GLPKDIR)/include/glpenv.h
    160 
    161 $(srcdir)/$(GLPKDIR)/include/glplib.h : $(srcdir)/$(GLPKDIR)/src/glplib.h
    162         cp $(srcdir)/$(GLPKDIR)/src/glplib.h $(srcdir)/$(GLPKDIR)/include/glplib.h
    163 
    164 $(srcdir)/$(GLPKDIR)/include/glpstd.h : $(srcdir)/$(GLPKDIR)/src/glpstd.h
    165         cp $(srcdir)/$(GLPKDIR)/src/glpstd.h $(srcdir)/$(GLPKDIR)/include/glpstd.h
    166 
    167126DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)`
    168127
     
    175134libcoinglpk_la_LDFLAGS = $(LT_LDFLAGS)
    176135
     136thirdpartyincludedir = $(includedir)/coin/ThirdParty
     137thirdpartyinclude_HEADERS = $(GLPKDIR)/include/glpk.h
     138
     139if COIN_HAS_PKGCONFIG
     140addlibsdir = $(datadir)/coin/doc/ThirdParty/Glpk
     141addlibs_DATA = glpk_addlibs.txt
     142
     143glpk_addlibs.txt : coinglpk.pc
     144        PKG_CONFIG_PATH=.:@COIN_PKG_CONFIG_PATH@ $(PKG_CONFIG) --libs coinglpk > glpk_addlibs.txt
     145endif
     146
     147pkgconfiglibdir = $(libdir)/pkgconfig
     148pkgconfiglib_DATA = coinglpk.pc
     149
    177150########################################################################
    178151#                         Maintainer Stuff                             #
    179152########################################################################
     153
     154CLEANFILES = glpk_addlibs.txt
    180155
    181156# Files that are generated and should be cleaned with make distclean
Note: See TracChangeset for help on using the changeset viewer.