Ignore:
Timestamp:
May 1, 2010 6:19:43 AM (10 years ago)
Author:
stefan
Message:

use advanced AC_COIN_HAS_MODULE macro; setup addlibs file by pkg-config

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/split/Clp/Makefile.in

    r1542 r1546  
    6464        $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
    6565        $(srcdir)/clp-uninstalled.pc.in $(srcdir)/clp.pc.in \
    66         $(srcdir)/clp_addlibs.txt.in $(top_srcdir)/configure \
    67         $(top_srcdir)/examples/Makefile.in \
     66        $(top_srcdir)/configure $(top_srcdir)/examples/Makefile.in \
    6867        $(top_srcdir)/inc/config_clp.h.in \
    6968        $(top_srcdir)/src/OsiClp/osi-clp-uninstalled.pc.in AUTHORS
     
    8079mkinstalldirs = $(install_sh) -d
    8180CONFIG_HEADER = $(top_builddir)/inc/config_clp.h
    82 CONFIG_CLEAN_FILES = examples/Makefile clp_addlibs.txt clp.pc \
    83         clp-uninstalled.pc osi-clp-uninstalled.pc
     81CONFIG_CLEAN_FILES = examples/Makefile clp.pc clp-uninstalled.pc \
     82        osi-clp-uninstalled.pc
    8483SOURCES =
    8584DIST_SOURCES =
     
    147146COIN_HAS_OSI_FALSE = @COIN_HAS_OSI_FALSE@
    148147COIN_HAS_OSI_TRUE = @COIN_HAS_OSI_TRUE@
     148COIN_HAS_PKGCONFIG_FALSE = @COIN_HAS_PKGCONFIG_FALSE@
     149COIN_HAS_PKGCONFIG_TRUE = @COIN_HAS_PKGCONFIG_TRUE@
    149150COIN_HAS_SAMPLE_FALSE = @COIN_HAS_SAMPLE_FALSE@
    150151COIN_HAS_SAMPLE_TRUE = @COIN_HAS_SAMPLE_TRUE@
     152COIN_PKG_CONFIG_PATH = @COIN_PKG_CONFIG_PATH@
    151153CPP = @CPP@
    152154CPPFLAGS = @CPPFLAGS@
     
    310312#                  Installation of the addlibs file                    #
    311313########################################################################
    312 addlibsdir = $(datadir)/coin/doc/Clp
    313 addlibs_DATA = clp_addlibs.txt
     314@COIN_HAS_PKGCONFIG_TRUE@addlibsdir = $(datadir)/coin/doc/Clp
     315@COIN_HAS_PKGCONFIG_TRUE@addlibs_DATA = clp_addlibs.txt
    314316pkgconfiglibdir = $(libdir)/pkgconfig
    315317pkgconfiglib_DATA = clp.pc
     
    318320#                         Maintainer Stuff                             #
    319321########################################################################
     322CLEANFILES = clp_addlibs.txt
    320323
    321324# Files that are generated and should be cleaned with make distclean
     
    377380        -rm -f inc/config_clp.h inc/stamp-h1
    378381examples/Makefile: $(top_builddir)/config.status $(top_srcdir)/examples/Makefile.in
    379         cd $(top_builddir) && $(SHELL) ./config.status $@
    380 clp_addlibs.txt: $(top_builddir)/config.status $(srcdir)/clp_addlibs.txt.in
    381382        cd $(top_builddir) && $(SHELL) ./config.status $@
    382383clp.pc: $(top_builddir)/config.status $(srcdir)/clp.pc.in
     
    730731
    731732clean-generic:
     733        -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
    732734
    733735distclean-generic:
     
    831833.PHONY: test unitTest
    832834
     835@COIN_HAS_PKGCONFIG_TRUE@clp_addlibs.txt : clp.pc
     836@COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=.:@COIN_PKG_CONFIG_PATH@ $(PKG_CONFIG) --libs clp > clp_addlibs.txt
     837
    833838install-doc: $(DocFiles)
    834839        test -z "$(DocInstallDir)" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)"
Note: See TracChangeset for help on using the changeset viewer.