summaryrefslogtreecommitdiff
path: root/progs/egl/opengles1
diff options
context:
space:
mode:
authorChia-I Wu <olv@lunarg.com>2010-04-27 14:13:13 +0800
committerChia-I Wu <olv@lunarg.com>2010-04-27 14:19:24 +0800
commitfbfecda6ae9cf3ccaa1cef3ea60dfec12ca6e503 (patch)
tree668407c267bc502596ce4bdda92ee1c440a98170 /progs/egl/opengles1
parent0fcea8a411e1c5ecae32a9a88187a80a07bc90d4 (diff)
progs/egl: Add egl/eglut to PROGRAM_DIRS.
Make sure eglut is built before the demos. This should work more reliably with make -j<N>.
Diffstat (limited to 'progs/egl/opengles1')
-rw-r--r--progs/egl/opengles1/Makefile4
1 files changed, 0 insertions, 4 deletions
diff --git a/progs/egl/opengles1/Makefile b/progs/egl/opengles1/Makefile
index ba9d1b84d5..593145d4bf 100644
--- a/progs/egl/opengles1/Makefile
+++ b/progs/egl/opengles1/Makefile
@@ -81,9 +81,6 @@ two_win: two_win.o $(ES1_LIB_DEPS)
$(CC) $(CFLAGS) two_win.o $(ES1_LIBS) -o $@
-$(EGLUT_DIR)/libeglut-x11.a $(EGLUT_DIR)/libeglut-screen.a:
- @$(MAKE) -C $(EGLUT_DIR)
-
# define the rules for EGLUT demos
define eglut-demo-rule
$(1)_x11 $(1)_screen: $(1)_%: $(1).o $(EGLUT_DIR)/libeglut-%.a $(ES1_LIB_DEPS)
@@ -100,4 +97,3 @@ $(EGLUT_SCREEN_DEMOS):
clean:
-rm -f *.o *~
-rm -f $(PROGRAMS) $(EGLUT_X11_DEMOS) $(EGLUT_SCREEN_DEMOS)
- @$(MAKE) -C $(EGLUT_DIR) clean