COIN-OR::LEMON - Graph Library

Ticket #198: pkg-config.patch

File pkg-config.patch, 1.3 KB (added by Akos Ladanyi, 14 years ago)

484fff1afecd

  • Makefile.in

    # HG changeset patch
    # User Akos Ladanyi <ladanyi@tmit.bme.hu>
    # Date 1230984938 0
    # Node ID 484fff1afecd8a2118d688b5be34640bb6e56a03
    # Parent  a291609dad527edda0385431ccef4de4510f0616
    Move pkg-config invocation to the Makefile from configure
    
    diff --git a/Makefile.in b/Makefile.in
    a b  
    4343        mv lemon.tag.tmp lemon.tag || \
    4444        rm lemon.tag.tmp
    4545
     46LEMON_CFLAGS = $(shell pkg-config --cflags lemon)
     47LEMON_LIBS = $(shell pkg-config --libs lemon)
    4648
    4749$(DEMOS): demo/build/%: demo/%.cc
    4850        -mkdir -p demo/build
    49         g++ -o $@ @lemon_cflags@ @lemon_libs@ \
     51        g++ -o $@ $(LEMON_CFLAGS) $(LEMON_LIBS) \
    5052        -Wall -W -Wall -W -Wunused -Wformat=2 -Wctor-dtor-privacy \
    5153        -Wnon-virtual-dtor -Wno-char-subscripts -Wwrite-strings \
    5254        -Wno-char-subscripts -Wreturn-type -Wcast-qual -Wcast-align \
  • configure

    diff --git a/configure b/configure
    a b  
    5858fi
    5959lemon_doc_prefix=$(echo $lemon_doc_prefix|sed 's/\//\\\\\\\//g')
    6060
    61 lemon_cflags=$(pkg-config --cflags lemon|sed 's/\//\\\//g')
    62 lemon_libs=$(pkg-config --libs lemon|sed 's/\//\\\//g')
    6361
    64 
    65 sed -e "s/@lemon_cflags@/${lemon_cflags}/g" \
    66     -e "s/@lemon_libs@/${lemon_libs}/g" \
    67    -e "s/@make_lemon_doc_prefix@/${lemon_doc_prefix}/g" \
     62sed -e "s/@make_lemon_doc_prefix@/${lemon_doc_prefix}/g" \
    6863    < Makefile.in > Makefile