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

[osdd.git] / Makefile

diff --git a/Makefile b/Makefile
index 9bdb6ffb7ab47316be7c3c0730d550567c14ebda..0434fa36b2dd5631d10ff7f63d39feaf097f4c2a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,22 +1,26 @@
-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)