progs/egl: Move demos a level deeper.

Move the demos to "opengl" subdirectory.
2010-04-01 11:17:43 +08:00
parent 2da7ef077a
commit c727ef0108
16 changed files with 4 additions and 4 deletions
@@ -52,7 +52,7 @@ GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \

 # Directories
 SRC_DIRS := glx egl $(SRC_DIRS)
-PROGRAM_DIRS := egl $(PROGRAM_DIRS)
+PROGRAM_DIRS := egl/opengl $(PROGRAM_DIRS)

 # EGL directories
 EGL_DRIVERS_DIRS = glx
@@ -48,7 +48,7 @@ GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \

 # Directories
 SRC_DIRS = gallium mesa gallium/winsys gallium/targets glu egl
-PROGRAM_DIRS = egl
+PROGRAM_DIRS = egl/opengl

 DRIVER_DIRS = dri
 GALLIUM_WINSYS_DIRS = egl_drm
@@ -954,7 +954,7 @@ if test "x$enable_egl" = xyes; then
    fi

    if test "$with_demos" = yes; then
-        PROGRAM_DIRS="$PROGRAM_DIRS egl"
+        PROGRAM_DIRS="$PROGRAM_DIRS egl/opengl"
    fi
 fi
 AC_SUBST([EGL_LIB_DEPS])
@@ -1,6 +1,6 @@
 # progs/egl/Makefile

-TOP = ../..
+TOP = ../../..
 include $(TOP)/configs/current