Commit 196531c33bd22f19e8c1e7df8289da5775550eba

Authored by Matti Virkkunen
1 parent 92e8a219

Use environment settings for compilers is defined.

Showing 1 changed file with 2 additions and 2 deletions
libpurple/Makefile
@@ -6,12 +6,12 @@ ifdef THRIFT_STATIC @@ -6,12 +6,12 @@ ifdef THRIFT_STATIC
6 THRIFT_LIBS = -L$(THRIFT_STATIC_DIR)/lib/cpp/.libs -Wl,-Bstatic -lthrift -Wl,-Bdynamic 6 THRIFT_LIBS = -L$(THRIFT_STATIC_DIR)/lib/cpp/.libs -Wl,-Bstatic -lthrift -Wl,-Bdynamic
7 THRIFT_DEP = $(THRIFT) 7 THRIFT_DEP = $(THRIFT)
8 else 8 else
9 - THRIFT = thrift 9 + THRIFT ?= thrift
10 THRIFT_CXXFLAGS = `pkg-config --cflags thrift` 10 THRIFT_CXXFLAGS = `pkg-config --cflags thrift`
11 THRIFT_LIBS = `pkg-config --libs thrift` 11 THRIFT_LIBS = `pkg-config --libs thrift`
12 endif 12 endif
13 13
14 -CXX = g++ 14 +CXX ?= g++
15 CXXFLAGS = -g -Wall -shared -fPIC \ 15 CXXFLAGS = -g -Wall -shared -fPIC \
16 -DHAVE_INTTYPES_H -DHAVE_CONFIG_H -DPURPLE_PLUGINS \ 16 -DHAVE_INTTYPES_H -DHAVE_CONFIG_H -DPURPLE_PLUGINS \
17 `pkg-config --cflags purple` $(THRIFT_CXXFLAGS) 17 `pkg-config --cflags purple` $(THRIFT_CXXFLAGS)