Bits of new display code

[osdd.git] / Makefile

diff --git a/Makefile b/Makefile
index 31eeafbb92aca633f1b1fe85ea5b34c6cb1b17af..3e7319cac0f97094ee837791a7517db2a833012a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,16 +3,14 @@ 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 osd-alsa
-all: test
+all: osdd osdc osd-batt osd-alsa
 
-osdd: osdd.o util.o
+osdd: osdd.o util.o display.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: LDLIBS+=$(shell xosd-config --libs)
+osdd: LDLIBS+=$(shell pkg-config --libs xft) -l Xext
 
 osdc: LDLIBS+=-lX11
 osd-batt: LDLIBS+=-lX11
@@ -20,9 +18,7 @@ osd-batt: LDLIBS+=-lX11
 osd-alsa.o: CFLAGS+=$(shell pkg-config --cflags alsa)
 osd-alsa: LDLIBS+=$(shell pkg-config --libs alsa) -lX11
 
-test.o: CFLAGS+=$(shell pkg-config --cflags xft)
-test: LDFLAGS+=$(shell pkg-config --libs xft) -l Xext
-test: test.o util.o
+display.o: CFLAGS+=$(shell pkg-config --cflags xft)
 
 clean:
        rm -f *~ *.o TAGS core osdd osdc osd-batt osd-alsa