Merge branch 'master' of ssh://git.ucw.cz/home/mj/GIT/osdd

[osdd.git] / Makefile

diff --git a/Makefile b/Makefile
index 5acc1db5de2135e006966da5d1242b9202082318..0434fa36b2dd5631d10ff7f63d39feaf097f4c2a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,31 @@
+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
+all: osdd osdc osd-batt osd-alsa
 
 osdd: osdd.o util.o
-osdc: osdc.o util.o send.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: LDLIBS+=-lX11
+osd-batt: LDLIBS+=-lX11
 
-osdc: LDFLAGS+=-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)"
+       mv $(ARCHIVE) ~/archives/mj/