X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=Makefile;h=904b3d037f3e380f0a60beb891d85d91f7cab751;hb=446ef95621c6f3ed2c394abfe1dcd1cf8c0a471b;hp=2035b0d252cfc99b2757f026d361d9ee5caf9033;hpb=48e10658b46e07b89ee7074af1a56bdc61656f05;p=i3%2Fi3status diff --git a/Makefile b/Makefile index 2035b0d..904b3d0 100644 --- a/Makefile +++ b/Makefile @@ -14,6 +14,7 @@ ifndef SYSCONFDIR endif endif +PKG_CONFIG ?= pkg-config CFLAGS+=-Wall -Wshadow -Wpointer-arith -Wcast-qual -Wsign-compare CFLAGS+=-g CFLAGS+=-std=gnu99 @@ -40,8 +41,8 @@ OS:=$(shell uname) ifeq ($(OS),Linux) CPPFLAGS+=-DLINUX CPPFLAGS+=-D_GNU_SOURCE -CFLAGS += $(shell pkg-config --cflags libnl-genl-3.0) -LIBS += $(shell pkg-config --libs libnl-genl-3.0) +CFLAGS += $(shell $(PKG_CONFIG) --cflags libnl-genl-3.0) +LIBS += $(shell $(PKG_CONFIG) --libs libnl-genl-3.0) LIBS+=-lasound endif @@ -76,7 +77,7 @@ CFLAGS+=$(EXTRA_CFLAGS) # YAJL_MAJOR from that file to decide which code path should be used. CFLAGS += -idirafter yajl-fallback -OBJS:=$(wildcard src/*.c *.c) +OBJS:=$(sort $(wildcard src/*.c *.c)) OBJS:=$(OBJS:.c=.o) ifeq ($(OS),OpenBSD) @@ -84,6 +85,11 @@ OBJS:=$(filter-out src/pulse.o, $(OBJS)) LIBS:=$(filter-out -lpulse, $(LIBS)) endif +ifeq ($(OS),DragonFly) +OBJS:=$(filter-out src/pulse.o, $(OBJS)) +LIBS:=$(filter-out -lpulse, $(LIBS)) -lpthread +endif + src/%.o: src/%.c include/i3status.h $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< @echo " CC $<" @@ -98,6 +104,9 @@ i3status: ${OBJS} $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) @echo " LD $@" +test: i3status + LC_ALL=C ./travis/run-tests.pl + clean: rm -f *.o src/*.o @@ -112,8 +121,6 @@ install: install -m 755 -d $(DESTDIR)$(SYSCONFDIR) install -m 755 -d $(DESTDIR)$(MANPREFIX)/share/man/man1 install -m 755 i3status $(DESTDIR)$(PREFIX)/bin/i3status - # Allow network configuration for getting the link speed - (which setcap && setcap cap_net_admin=ep $(DESTDIR)$(PREFIX)/bin/i3status) || true install -m 644 i3status.conf $(DESTDIR)$(SYSCONFDIR)/i3status.conf install -m 644 man/i3status.1 $(DESTDIR)$(MANPREFIX)/share/man/man1 @@ -128,6 +135,6 @@ release: cp -r include i3status-${VERSION} cp -r yajl-fallback i3status-${VERSION} cp -r contrib i3status-${VERSION} - sed -e 's/^I3STATUS_VERSION:=\(.*\)/I3STATUS_VERSION=${I3STATUS_VERSION}/g;s/^VERSION:=\(.*\)/VERSION=${VERSION}/g' Makefile > i3status-${VERSION}/Makefile + echo ${I3STATUS_VERSION} > i3status-${VERSION}/I3STATUS_VERSION tar cjf i3status-${VERSION}.tar.bz2 i3status-${VERSION} rm -rf i3status-${VERSION}