diff --git a/xwords4/relay/Makefile b/xwords4/relay/Makefile index 2421f746c..04a3555bb 100644 --- a/xwords4/relay/Makefile +++ b/xwords4/relay/Makefile @@ -41,12 +41,14 @@ HASH=$(shell git describe) OBJ = $(patsubst %.cpp,%.o,$(SRC)) #LDFLAGS += -pthread -g -lmcheck $(STATIC) -LDFLAGS += -pthread -g $(STATIC) \ - -L$(shell pg_config --libdir) +LDFLAGS += -pthread -g $(STATIC) +LDFLAGS += -L$(shell pg_config --libdir) +LDFLAGS += $(shell pkg-config --libs glib-2.0) -CPPFLAGS += -DSPAWN_SELF -g -Wall \ - -I $(shell pg_config --includedir) \ - -DSVN_REV=\"$(shell cat $(GITINFO) 2>/dev/null || echo -n $(HASH) )\" +CPPFLAGS += -DSPAWN_SELF -g -Wall +CPPFLAGS += -I $(shell pg_config --includedir) +CPPFLAGS += -DSVN_REV=\"$(shell cat $(GITINFO) 2>/dev/null || echo -n $(HASH) )\" +CPPFLAGS += $(shell pkg-config --cflags glib-2.0) # CPPFLAGS += -DDO_HTTP # CPPFLAGS += -DHAVE_STIME @@ -58,7 +60,7 @@ memdebug all: xwrelay rq # Manual config in order to place -lpq after the .obj files as # required by something Ubuntu did upgrading natty to oneiric xwrelay: $(OBJ) - $(CXX) $(CPPFLAGS) $(LDFLAGS) -o $@ $^ -lpq + $(CXX) $(CPPFLAGS) -o $@ $^ -lpq $(LDFLAGS) rq: rq.c