summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authordwheeler <dwheeler@88473608-6f18-0410-8b6c-91216bd3049c>2009-11-04 06:39:14 +0000
committerdwheeler <dwheeler@88473608-6f18-0410-8b6c-91216bd3049c>2009-11-04 06:39:14 +0000
commitb68063732dcfc806e7f953f28632f40eda47885f (patch)
treea26cd6cb256c52275cd9cfa162ab1e4911f1048d /Makefile
parent59e51b691cf974da079cb170f89123835df4761c (diff)
Modify top-level make so that by default everything is built
git-svn-id: svn+ssh://svn-nitpicker.cl.cam.ac.uk/linpicker/trunk@619 88473608-6f18-0410-8b6c-91216bd3049c
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile15
1 files changed, 13 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index a23e565..0d740ec 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
-TARGETS=nitpicker-server lxevent
+TARGETS=nitpicker-server nitpicker-test-client multiplex \
+ make_input make_screen make_track
CFLAGS=$(shell pkg-config directfb --cflags) -g
@@ -10,9 +11,19 @@ nitpicker-server.o : nitpicker-server.c
nitpicker-test-client : nitpicker-test-client.o comm-client.o comm-mouse.o comm-keyboard.o comm-setup.o
+multiplex: multiplex.o comm-client.o comm-mouse.o comm-keyboard.o comm-setup.o
+
+# Obsoleted by multiplex:
lxevent : lxevent.o comm-client.o comm-mouse.o comm-keyboard.o comm-setup.o
-multiplex: multiplex.o comm-client.o comm-mouse.o comm-keyboard.o comm-setup.o
+make_input:
+ cd XClient/input ; $(MAKE)
+
+make_screen:
+ cd XClient/screen ; $(MAKE)
+
+make_track:
+ cd XClient/track; $(MAKE)
# The server - but NOT the client - needs to use directfb.
# -lrt is needed for using shm_open: