Skip to content

Commit

Permalink
Merge pull request #417 from rlaboiss/pangocairo-pkg-config
Browse files Browse the repository at this point in the history
Use pkg-config for pangocairo cflags and libs
  • Loading branch information
PaulBoersma committed Aug 14, 2017
2 parents 60e55e0 + a3283b1 commit 40dd563
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions makefiles/makefile.defs.linux.nogui
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ CC = gcc -std=gnu99

CXX = g++ -std=c++11

CFLAGS = -DNO_GUI -DNO_NETWORK -D_FILE_OFFSET_BITS=64 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/cairo -I/usr/include/pango-1.0 -DUNIX -Dlinux -Werror=missing-prototypes -Werror=implicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O3 -g1 -pthread
CFLAGS = -DNO_GUI -DNO_NETWORK -D_FILE_OFFSET_BITS=64 `pkg-config --cflags pangocairo` -DUNIX -Dlinux -Werror=missing-prototypes -Werror=implicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O3 -g1 -pthread

CXXFLAGS = $(CFLAGS) -Wshadow

LINK = g++

EXECUTABLE = praat_nogui

LIBS = -lpangocairo-1.0 -lcairo -lpango-1.0 -lgobject-2.0 -lm -lpthread
LIBS = `pkg-config --libs pangocairo` -lm -lpthread

AR = ar
RANLIB = ls
Expand Down

0 comments on commit 40dd563

Please sign in to comment.