walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Makefile: Use pcre-config to get include/lib paths etc

This commit is contained in:
Ville Skyttä 2011-10-28 21:20:19 +02:00 committed by Daniel Marjamäki
parent 979f3b051c
commit b69ad0fefc
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -10,11 +10,11 @@ ifndef CXXFLAGS
endif endif
ifeq ($(HAVE_RULES),yes) ifeq ($(HAVE_RULES),yes)
CXXFLAGS += -DHAVE_RULES CXXFLAGS += -DHAVE_RULES $(shell pcre-config --cflags)
ifdef LIBS ifdef LIBS
LIBS += -lpcre LIBS += $(shell pcre-config --libs)
else else
LIBS=-lpcre LIBS=$(shell pcre-config --libs)
endif endif
endif endif

6
tools/dmake.cpp
View File

@ -239,11 +239,11 @@ int main(int argc, char **argv)
} }
fout << "ifeq ($(HAVE_RULES),yes)\n" fout << "ifeq ($(HAVE_RULES),yes)\n"
<< " CXXFLAGS += -DHAVE_RULES\n" << " CXXFLAGS += -DHAVE_RULES $(shell pcre-config --cflags)\n"
<< " ifdef LIBS\n" << " ifdef LIBS\n"
<< " LIBS += -lpcre\n" << " LIBS += $(shell pcre-config --libs)\n"
<< " else\n" << " else\n"
<< " LIBS=-lpcre\n" << " LIBS=$(shell pcre-config --libs)\n"
<< " endif\n" << " endif\n"
<< "endif\n\n"; << "endif\n\n";