X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=Makefile;h=644edd1c2719ff3166093e2ec46098d633ec1ca5;hb=6dbf9bfb6403f4e36ffe20a60ce7d67221586fdf;hp=9f61eef9f75d69b6734e6ada53dad47448d901c1;hpb=7665643894cf20108ba01b7fed6bc9f2fe452668;p=i3%2Fi3status

diff --git a/Makefile b/Makefile
index 9f61eef..644edd1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,42 +1,54 @@
+ifndef PREFIX
+  PREFIX=/usr
+endif
+ifndef SYSCONFDIR
+  ifeq ($(PREFIX),/usr)
+    SYSCONFDIR=/etc
+  else
+    SYSCONFDIR=$(PREFIX)/etc
+  endif
+endif
+
 CFLAGS+=-Wall -Wshadow -Wpointer-arith -Wcast-qual -Wsign-compare
 CFLAGS+=-g
 CFLAGS+=-std=gnu99
 CFLAGS+=-pedantic
-CFLAGS+=-DPREFIX=\"\"
-CFLAGS+=-I.
-LDFLAGS+=-lconfuse
+CPPFLAGS+=-DSYSCONFDIR=\"$(SYSCONFDIR)\"
+CPPFLAGS+=-DVERSION=\"${GIT_VERSION}\"
+CFLAGS+=-Iinclude
+LIBS+=-lconfuse
 
-VERSION=$(shell git describe --tags --abbrev=0)
+VERSION:=$(shell git describe --tags --abbrev=0)
+GIT_VERSION:="$(shell git describe --tags --always) ($(shell git log --pretty=format:%cd --date=short -n1))"
 
 ifeq ($(shell uname),Linux)
-CFLAGS+=-DLINUX
-CFLAGS+=-D_GNU_SOURCE
-LDFLAGS+=-liw
+CPPFLAGS+=-DLINUX
+CPPFLAGS+=-D_GNU_SOURCE
+LIBS+=-liw
+LIBS+=-lasound
 endif
 
 ifeq ($(shell uname),GNU/kFreeBSD)
-CFLAGS+=-lbsd
+LIBS+=-lbsd
 endif
 
-# Define this if you want i3status to spit out dzen2-compatible output on stdout
-#CFLAGS+=-DDZEN
 CFLAGS+=$(EXTRA_CFLAGS)
 
 OBJS:=$(wildcard src/*.c *.c)
 OBJS:=$(OBJS:.c=.o)
 
 src/%.o: src/%.c
-	@$(CC) $(CFLAGS) -c -o $@ $<
+	@$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
 	@echo " CC $<"
 
-%.o: %.c %.h
-	@$(CC) $(CFLAGS) -c -o $@ $<
+%.o: %.c include/%.h
+	@$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
 	@echo " CC $<"
 
 all: i3status manpage
 
 i3status: ${OBJS}
-	@$(CC) -o $@ src/*.o *.o $(LDFLAGS)
+	@$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
 	@echo " LD $@"
 
 clean:
@@ -46,7 +58,7 @@ distclean: clean
 	rm -f i3status
 
 manpage:
-	make -C man
+	$(MAKE) -C man
 
 install:
 	install -m 755 -d $(DESTDIR)/usr/bin
@@ -66,5 +78,7 @@ release:
 	mkdir i3status-${VERSION}/man
 	find src -maxdepth 1 -type f \( -regex ".*\.\(c\|h\)" \) -exec cp '{}' i3status-${VERSION}/src \;
 	find man -maxdepth 1 -type f \( -regex ".*\.\(1\|man\|conf\)" -or -name "Makefile" \) -exec cp '{}' i3status-${VERSION}/man \;
+	cp -r include i3status-${VERSION}
+	sed -e 's/^GIT_VERSION:=\(.*\)/GIT_VERSION=${GIT_VERSION}/g;s/^VERSION:=\(.*\)/VERSION=${VERSION}/g' Makefile > i3status-${VERSION}/Makefile
 	tar cjf i3status-${VERSION}.tar.bz2 i3status-${VERSION}
 	rm -rf i3status-${VERSION}