summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2010-03-23 09:14:17 -0600
committerBrian Paul <brianp@vmware.com>2010-03-23 09:14:17 -0600
commit2689dd304c6d644b04c941e6da63e466be5de0d6 (patch)
tree26e2878e1d4457205254fcdcc877e3c192e0cec5 /Makefile
parent83f4c444f4e630fe2bfd17ad750f3f17ceff13f6 (diff)
parentff54af530bc17429eda73a761dd6b73e3ec0d6ef (diff)
Merge branch '7.8'
Conflicts: Makefile src/gallium/state_trackers/glx/xlib/xm_api.c src/mesa/drivers/dri/intel/intel_blit.c src/mesa/drivers/dri/intel/intel_pixel_copy.c src/mesa/main/version.h
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile9
1 files changed, 9 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 81fe0d1e87..e0d852e534 100644
--- a/Makefile
+++ b/Makefile
@@ -323,6 +323,7 @@ GALLIUM_FILES = \
$(DIRECTORY)/src/gallium/*/Makefile \
$(DIRECTORY)/src/gallium/*/SConscript \
$(DIRECTORY)/src/gallium/*/*/Makefile \
+ $(DIRECTORY)/src/gallium/*/*/Makefile.egl \
$(DIRECTORY)/src/gallium/*/*/Makefile.template \
$(DIRECTORY)/src/gallium/*/*/SConscript \
$(DIRECTORY)/src/gallium/*/*/*.[ch] \
@@ -406,6 +407,14 @@ 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/fbdev/Makefile \
$(DIRECTORY)/progs/fbdev/glfbdevtest.c \
$(DIRECTORY)/progs/objviewer/*.[ch] \