diff options
| author | Chia-I Wu <[email protected]> | 2010-04-27 14:13:13 +0800 |
|---|---|---|
| committer | Chia-I Wu <[email protected]> | 2010-04-27 14:19:24 +0800 |
| commit | fbfecda6ae9cf3ccaa1cef3ea60dfec12ca6e503 (patch) | |
| tree | 668407c267bc502596ce4bdda92ee1c440a98170 /progs | |
| parent | 0fcea8a411e1c5ecae32a9a88187a80a07bc90d4 (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')
| -rw-r--r-- | progs/egl/eglut/Makefile | 5 | ||||
| -rw-r--r-- | progs/egl/opengl/Makefile | 4 | ||||
| -rw-r--r-- | progs/egl/opengles1/Makefile | 4 | ||||
| -rw-r--r-- | progs/egl/openvg/Makefile | 4 |
4 files changed, 4 insertions, 13 deletions
diff --git a/progs/egl/eglut/Makefile b/progs/egl/eglut/Makefile index dec89117bb9..364f5b0be3d 100644 --- a/progs/egl/eglut/Makefile +++ b/progs/egl/eglut/Makefile @@ -7,7 +7,10 @@ INCLUDES = \ -I$(TOP)/include \ $(X11_CFLAGS) -SOURCES = $(wildcard *.c) +SOURCES = \ + eglut.c \ + eglut_screen.c \ + eglut_x11.c EGLUT_X11_OBJECTS = eglut.o eglut_x11.o EGLUT_SCREEN_OBJECTS = eglut.o eglut_screen.o 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 diff --git a/progs/egl/opengles1/Makefile b/progs/egl/opengles1/Makefile index ba9d1b84d5f..593145d4bf2 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 diff --git a/progs/egl/openvg/Makefile b/progs/egl/openvg/Makefile index 431341c8a3f..3b11933db26 100644 --- a/progs/egl/openvg/Makefile +++ b/progs/egl/openvg/Makefile @@ -34,9 +34,6 @@ lion_screen: lion.o lion-render.o $(EGLUT_DIR)/libeglut-screen.a -L$(EGLUT_DIR) -leglut-screen $(VG_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 @@ -52,4 +49,3 @@ $(EGLUT_SCREEN_DEMOS): clean: rm -f *.o *~ rm -f $(EGLUT_X11_DEMOS) $(EGLUT_SCREEN_DEMOS) - @$(MAKE) -C $(EGLUT_DIR) clean |