diff --git a/src/Makefile b/src/Makefile index 846f364..78be679 100644 --- a/src/Makefile +++ b/src/Makefile @@ -24,16 +24,16 @@ SOURCES = maingui.cc guiuserdata.cc guiconfiguration.cc guiaboutdialog.cc \ OBJECTS = $(foreach file,$(SOURCES),$(subst .cc,.o,$(file))) gtkevemon: ${OBJECTS} - ${COMPILER} -o ${BINARY} ${OBJECTS} ${LIBS} + ${CXX} -o ${BINARY} ${OBJECTS} ${LDFLAGS} multicore: $(MAKE) -j${CORES} gtkevemon depend: - ${COMPILER} -MM ${SOURCES} > Makefile.dep + ${CXX} -MM ${SOURCES} > Makefile.dep %.o: %.cc - ${COMPILER} -c -o $@ $< ${CXXFLAGS} + ${CXX} -c -o $@ $< ${CXXFLAGS} clean: FORCE ${RM} ${BINARY} ${OBJECTS} diff --git a/src/Makefile.linux b/src/Makefile.linux index 0881b7e..7e9afa6 100644 --- a/src/Makefile.linux +++ b/src/Makefile.linux @@ -1,4 +1,4 @@ -COMPILER = g++ +CXX ?= g++ CORES = $(shell grep processor /proc/cpuinfo | wc -l) @@ -9,7 +9,8 @@ PTH_LIBS = -lpthread XML_FLAGS = $(shell pkg-config --cflags libxml-2.0) XML_LIBS = $(shell pkg-config --libs libxml-2.0) -CXXFLAGS = ${GCC_FLAGS} ${GTK_FLAGS} ${XML_FLAGS} -LIBS = ${GTK_LIBS} ${PTH_LIBS} ${XML_LIBS} +CXXFLAGS ?= ${GCC_FLAGS} +CXXFLAGS += ${GTK_FLAGS} ${XML_FLAGS} +LDFLAGS += ${GTK_LIBS} ${PTH_LIBS} ${XML_LIBS} BINARY = gtkevemon