From 497342a11a4df102098853b6e464ba7344387740 Mon Sep 17 00:00:00 2001 From: Karl Linden Date: Sun, 8 Oct 2017 14:06:57 +0200 Subject: [PATCH] Makefile improvements. * Respect CXX, CXXFLAGS and LDFLAGS. * Add an install rule. --- Makefile | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 7b9effb..7b6cffa 100644 --- a/Makefile +++ b/Makefile @@ -1,17 +1,24 @@ +CXXFLAGS ?= -O2 + +PREFIX ?= /usr/local + all: xkblayout-state XKeyboard.o: XKeyboard.cpp XKeyboard.h X11Exception.h - g++ -c -Wall -O2 XKeyboard.cpp -o XKeyboard.o + $(CXX) $(CXXFLAGS) -Wall -c -o $@ $< wrapper.o: wrapper.cpp XKeyboard.h - g++ -c -Wall -O2 wrapper.cpp -o wrapper.o + $(CXX) $(CXXFLAGS) -Wall -c -o $@ $< xkblayout-state: XKeyboard.o wrapper.o - g++ XKeyboard.o wrapper.o -lX11 -o xkblayout-state + $(CXX) $(CXXFLAGS) $(LDFLAGS) -lX11 -o xkblayout-state $^ -clean: +clean: rm -f xkblayout-state XKeyboard.o wrapper.o +install: xkblayout-state + install xkblayout-state $(DESTDIR)$(PREFIX)/bin + dist: tar cfa xkblayout-state-v1b.tar.gz Makefile README.md wrapper.cpp X11Exception.h XKeyboard.cpp XKeyboard.h