X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=Makefile;h=0434fa36b2dd5631d10ff7f63d39feaf097f4c2a;hb=e86321d03eb795669378283dd15e9b5514d5760b;hp=7123fa3e085290c249c6c5e28acd1f2cace210fb;hpb=01cf5b63183e83dc0b78b28b170d5d47685b9d14;p=osdd.git

diff --git a/Makefile b/Makefile
index 7123fa3..0434fa3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,24 +1,30 @@
-VERSION=1.0
+VERSION=1.1
 ARCHIVE=osdd-$(VERSION).tar.gz
 
 CFLAGS=-O2 -Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes -Wundef -Wredundant-decls -std=gnu99
 
-all: osdd osdc osd-batt
+all: osdd osdc osd-batt osd-alsa
 
 osdd: osdd.o util.o
 osdc: osdc.o util.o client.o
 osd-batt: osd-batt.o util.o client.o
+osd-alsa: osd-alsa.o util.o client.o
 
 osdd.o: CFLAGS+=$(shell xosd-config --cflags)
-osdd: LDFLAGS+=$(shell xosd-config --libs)
+osdd: LDLIBS+=$(shell xosd-config --libs)
 
-osdc: LDFLAGS+=-lX11
-osd-batt: LDFLAGS+=-lX11
+osdc: LDLIBS+=-lX11
+osd-batt: LDLIBS+=-lX11
+
+osd-alsa.o: CFLAGS+=$(shell pkg-config --cflags alsa)
+osd-alsa: LDLIBS+=$(shell pkg-config --libs alsa) -lX11
 
 clean:
-	rm -f *~ *.o TAGS core osdd osdc
+	rm -f *~ *.o TAGS core osdd osdc osd-batt osd-alsa
 
 release:
+	git tag v$(VERSION)
+	git push --tags
 	git archive --format=tar --prefix=osdd-$(VERSION)/ HEAD | gzip >$(ARCHIVE)
 	scp $(ARCHIVE) atrey:~ftp/pub/local/mj/linux/
 	ssh jw "cd www && bin/release-prog osdd $(VERSION)"