# 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
|
|
| 43 | 43 | mv lemon.tag.tmp lemon.tag || \ |
| 44 | 44 | rm lemon.tag.tmp |
| 45 | 45 | |
| | 46 | LEMON_CFLAGS = $(shell pkg-config --cflags lemon) |
| | 47 | LEMON_LIBS = $(shell pkg-config --libs lemon) |
| 46 | 48 | |
| 47 | 49 | $(DEMOS): demo/build/%: demo/%.cc |
| 48 | 50 | -mkdir -p demo/build |
| 49 | | g++ -o $@ @lemon_cflags@ @lemon_libs@ \ |
| | 51 | g++ -o $@ $(LEMON_CFLAGS) $(LEMON_LIBS) \ |
| 50 | 52 | -Wall -W -Wall -W -Wunused -Wformat=2 -Wctor-dtor-privacy \ |
| 51 | 53 | -Wnon-virtual-dtor -Wno-char-subscripts -Wwrite-strings \ |
| 52 | 54 | -Wno-char-subscripts -Wreturn-type -Wcast-qual -Wcast-align \ |
diff --git a/configure b/configure
|
a
|
b
|
|
| 58 | 58 | fi |
| 59 | 59 | lemon_doc_prefix=$(echo $lemon_doc_prefix|sed 's/\//\\\\\\\//g') |
| 60 | 60 | |
| 61 | | lemon_cflags=$(pkg-config --cflags lemon|sed 's/\//\\\//g') |
| 62 | | lemon_libs=$(pkg-config --libs lemon|sed 's/\//\\\//g') |
| 63 | 61 | |
| 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" \ |
| | 62 | sed -e "s/@make_lemon_doc_prefix@/${lemon_doc_prefix}/g" \ |
| 68 | 63 | < Makefile.in > Makefile |
