Pass the "instance" JSON property key for tztime blocks

[i3/i3status] / Makefile

diff --git a/Makefile b/Makefile
index eb7da6e81a44840f0c9862858d0b2e4b85fc6327..625b5220cf678e7014b250f1c5584728f4535076 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -21,30 +21,43 @@ LIBS+=-lyajl
 
 VERSION:=$(shell git describe --tags --abbrev=0)
 GIT_VERSION:="$(shell git describe --tags --always) ($(shell git log --pretty=format:%cd --date=short -n1))"
+OS:=$(shell uname)
 
-ifeq ($(shell uname),Linux)
+ifeq ($(OS),Linux)
 CPPFLAGS+=-DLINUX
 CPPFLAGS+=-D_GNU_SOURCE
 LIBS+=-liw
 LIBS+=-lasound
 endif
 
-ifeq ($(shell uname),GNU/kFreeBSD)
+ifeq ($(OS),GNU/kFreeBSD)
 LIBS+=-lbsd
 endif
 
-ifeq ($(shell uname),OpenBSD)
+ifneq (, $(filter $(OS), DragonFly FreeBSD OpenBSD))
 CFLAGS+=-I/usr/local/include/
 LDFLAGS+=-L/usr/local/lib/
+endif
+
+ifeq ($(OS),OpenBSD)
 LIBS+=-lossaudio
 endif
 
+ifeq ($(OS), NetBSD)
+LIBS+= -lprop
+endif
+
 # This probably applies for any pkgsrc based system
-ifeq ($(shell uname),DragonFly)
+ifneq (, $(filter $(OS), NetBSD DragonFly))
 CFLAGS+=-I/usr/pkg/include/
 LDFLAGS+=-L/usr/pkg/lib/
 endif
 
+V ?= 0
+ifeq ($(V),0)
+# Don’t print command lines which are run
+.SILENT:
+endif
 
 CFLAGS+=$(EXTRA_CFLAGS)
 
@@ -55,18 +68,18 @@ CFLAGS += -idirafter yajl-fallback
 OBJS:=$(wildcard src/*.c *.c)
 OBJS:=$(OBJS:.c=.o)
 
-src/%.o: src/%.c
-       @$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
+src/%.o: src/%.c include/i3status.h
+       $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
        @echo " CC $<"
 
 %.o: %.c include/%.h
-       @$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
+       $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
        @echo " CC $<"
 
 all: i3status manpage
 
 i3status: ${OBJS}
-       @$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+       $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
        @echo " LD $@"
 
 clean:
@@ -91,7 +104,7 @@ install:
 release:
        [ -f i3status-${VERSION} ] || rm -rf i3status-${VERSION}
        mkdir i3status-${VERSION}
-       find . -maxdepth 1 -type f \( -regex ".*\.\(c\|conf\|h\)" -or -name "Makefile" -or -name "LICENSE" -or -name "CHANGELOG" \) -exec cp '{}' i3status-${VERSION} \;
+       find . -maxdepth 1 -type f \( -regex ".*\.\(c\|conf\|h\)" -or -name "README" -or -name "Makefile" -or -name "LICENSE" -or -name "CHANGELOG" \) -exec cp '{}' i3status-${VERSION} \;
        mkdir i3status-${VERSION}/src
        mkdir i3status-${VERSION}/man
        find src -maxdepth 1 -type f \( -regex ".*\.\(c\|h\)" \) -exec cp '{}' i3status-${VERSION}/src \;