From a0f4bfb5e88319b5f39051055065a838d90e1906 Mon Sep 17 00:00:00 2001 From: hasufell Date: Sun, 18 Mar 2012 02:00:49 +0100 Subject: [PATCH] respect cflags and ldflags, default to gcc if CC is unset, fix install-method --- Makefile | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 088753e..b531304 100644 --- a/Makefile +++ b/Makefile @@ -1,26 +1,25 @@ +CC ?= gcc + PREFIX ?= /usr BINDIR ?= $(PREFIX)/bin MANDIR ?= $(PREFIX)/share/man/man1 PACKAGES = x11 xcomposite xfixes xdamage xrender -LIBS = `pkg-config --libs $(PACKAGES)` -lm -INCS = `pkg-config --cflags $(PACKAGES)` -CFLAGS = -Wall +LIBS = $(shell pkg-config --libs $(PACKAGES)) -lm +INCS = $(shell pkg-config --cflags $(PACKAGES)) +CFLAGS += -Wall OBJS = compton.o %.o: src/%.c src/%.h $(CC) $(CFLAGS) $(INCS) -c src/$*.c compton: $(OBJS) - $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) + $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJS) $(LIBS) install: compton - @[ -e "$(PREFIX)" ] || mkdir -p "$(PREFIX)" - @[ -e "$(BINDIR)" ] || mkdir -p "$(BINDIR)" - @[ -e "$(MANDIR)" ] || mkdir -p "$(MANDIR)" - @cp compton "$(BINDIR)" - @cp bin/settrans "$(BINDIR)" - @cp man/compton.1 "$(MANDIR)" + @install -Dm755 compton "$(BINDIR)"/compton + @install -Dm755 bin/settrans "$(BINDIR)"/settrans + @install -Dm644 man/compton.1 "$(MANDIR)"/compton.1 uninstall: @rm -f "$(BINDIR)/compton"