summaryrefslogtreecommitdiffstats
path: root/progs/egl/opengl/Makefile
diff options
context:
space:
mode:
authorChia-I Wu <[email protected]>2010-04-27 14:13:13 +0800
committerChia-I Wu <[email protected]>2010-04-27 14:19:24 +0800
commitfbfecda6ae9cf3ccaa1cef3ea60dfec12ca6e503 (patch)
tree668407c267bc502596ce4bdda92ee1c440a98170 /progs/egl/opengl/Makefile
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/opengl/Makefile')
-rw-r--r--progs/egl/opengl/Makefile4
1 files changed, 0 insertions, 4 deletions
diff --git a/progs/egl/opengl/Makefile b/progs/egl/opengl/Makefile
index 20158b1f0bc..79cd5fc6533 100644
--- a/progs/egl/opengl/Makefile
+++ b/progs/egl/opengl/Makefile
@@ -62,9 +62,6 @@ xeglgears: xeglgears.o $(HEADERS) $(LIB_DEP)
xeglthreads: xeglthreads.o $(HEADERS) $(LIB_DEP)
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) -lpthread -lm $(X11_LIBS)
-$(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 $(LIB_DEP)
@@ -80,4 +77,3 @@ $(EGLUT_SCREEN_DEMOS):
clean:
-rm -f *.o *~
-rm -f $(PROGRAMS) $(EGLUT_X11_DEMOS) $(EGLUT_SCREEN_DEMOS)
- @$(MAKE) -C $(EGLUT_DIR) clean