Merge remote-tracking branch 'upstream/master'

Makefile

@@ -9,17 +9,11 @@ OBJ = ${SRC:.c=.o}
 # FreeBSD users, prefix all ifdef, else and endif statements with a . for this to work (e.g. .ifdef)
 
 ifdef YAJLLIBS
-all: options dwm dwm-msg
+all: dwm dwm-msg
 else
-all: options dwm
+all: dwm
 endif
 
-options:
-	@echo dwm build options:
-	@echo "CFLAGS	= ${CFLAGS}"
-	@echo "LDFLAGS	= ${LDFLAGS}"
-	@echo "CC	= ${CC}"
-
 .c.o:
 	${CC} -c ${CFLAGS} $<
 
@@ -76,4 +70,4 @@ uninstall:
 		${DESTDIR}${MANPREFIX}/man1/dwm.1\
 		${DESTDIR}${PREFIX}/share/xsessions/dwm.desktop
 
-.PHONY: all options clean dist install uninstall
+.PHONY: all clean dist install uninstall