projects / mesa.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge remote branch 'origin/7.8'
[mesa.git] / Makefile
diff --git a/Makefile b/Makefile
index e0d852e534ef590a62c3792b201211437d263dd0..411130bc272a91ecee2dd70a684e1a7e0f7e42e9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -320,6 +320,8 @@ GALLIUM_FILES = \
        $(DIRECTORY)/src/gallium/Makefile                               \
        $(DIRECTORY)/src/gallium/Makefile.template                      \
        $(DIRECTORY)/src/gallium/SConscript                             \
+       $(DIRECTORY)/src/gallium/targets/Makefile.dri                   \
+       $(DIRECTORY)/src/gallium/targets/Makefile.egl                   \
        $(DIRECTORY)/src/gallium/*/Makefile                             \
        $(DIRECTORY)/src/gallium/*/SConscript                           \
        $(DIRECTORY)/src/gallium/*/*/Makefile                           \
@@ -407,14 +409,18 @@ DEMO_FILES = \
        $(DIRECTORY)/progs/demos/*.cxx                  \
        $(DIRECTORY)/progs/demos/*.dat                  \
        $(DIRECTORY)/progs/demos/README                 \
-       $(DIRECTORY)/progs/egl/Makefile                 \
-       $(DIRECTORY)/progs/egl/*.[ch]                   \
-       $(DIRECTORY)/progs/es1/*/Makefile               \
-       $(DIRECTORY)/progs/es1/*/*.[ch]                 \
-       $(DIRECTORY)/progs/es2/*/Makefile               \
-       $(DIRECTORY)/progs/es2/*/*.[ch]                 \
-       $(DIRECTORY)/progs/openvg/*/Makefile            \
-       $(DIRECTORY)/progs/openvg/*/*.[ch]              \
+       $(DIRECTORY)/progs/egl/eglut/Makefile           \
+       $(DIRECTORY)/progs/egl/eglut/*.[ch]             \
+       $(DIRECTORY)/progs/egl/opengl/Makefile          \
+       $(DIRECTORY)/progs/egl/opengl/*.[ch]            \
+       $(DIRECTORY)/progs/egl/opengles1/Makefile       \
+       $(DIRECTORY)/progs/egl/opengles1/*.[ch]         \
+       $(DIRECTORY)/progs/egl/opengles2/Makefile       \
+       $(DIRECTORY)/progs/egl/opengles2/*.[ch]         \
+       $(DIRECTORY)/progs/egl/openvg/Makefile          \
+       $(DIRECTORY)/progs/egl/openvg/*.[ch]            \
+       $(DIRECTORY)/progs/egl/openvg/*/Makefile        \
+       $(DIRECTORY)/progs/egl/openvg/*/*.[ch]          \
        $(DIRECTORY)/progs/fbdev/Makefile               \
        $(DIRECTORY)/progs/fbdev/glfbdevtest.c          \
        $(DIRECTORY)/progs/objviewer/*.[ch]             \