diff options
| author | marha <marha@users.sourceforge.net> | 2012-11-19 11:21:45 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-11-19 11:21:45 +0100 |
| commit | 57b3e446b9b4017ccfdd3227be481df590740426 (patch) | |
| tree | 0e4899f530f75d343c090202fc7123c78f9b4866 /mesalib/Makefile.am | |
| parent | 24635abae6008bef13e30d798b3f33abab412770 (diff) | |
| parent | b3e1e62c45f525cdd332073aaa34d8452cb23374 (diff) | |
| download | vcxsrv-57b3e446b9b4017ccfdd3227be481df590740426.tar.gz vcxsrv-57b3e446b9b4017ccfdd3227be481df590740426.tar.bz2 vcxsrv-57b3e446b9b4017ccfdd3227be481df590740426.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
git update 19 nov 2012
Added bash script to update released branch
Conflicts:
mesalib/src/mapi/glapi/gen/gl_API.xml
mesalib/src/mesa/program/.gitignore
pixman/pixman/pixman-mmx.c
xorg-server/Xi/xiquerypointer.c
xorg-server/xkb/xkb.c
Diffstat (limited to 'mesalib/Makefile.am')
| -rw-r--r-- | mesalib/Makefile.am | 64 |
1 files changed, 62 insertions, 2 deletions
diff --git a/mesalib/Makefile.am b/mesalib/Makefile.am index 5e0071c04..b22458ec8 100644 --- a/mesalib/Makefile.am +++ b/mesalib/Makefile.am @@ -61,7 +61,15 @@ PACKAGE_NAME = MesaLib-$(PACKAGE_VERSION) EXTRA_FILES = \ aclocal.m4 \ configure \ + bin/ar-lib \ + bin/compile \ + bin/config.sub \ + bin/config.guess \ + bin/depcomp \ bin/install-sh \ + bin/ltmain.sh \ + bin/missing \ + bin/ylwrap \ src/glsl/glsl_parser.cc \ src/glsl/glsl_parser.h \ src/glsl/glsl_lexer.cc \ @@ -76,7 +84,59 @@ EXTRA_FILES = \ src/mesa/main/api_exec_es2_remap_helper.h \ src/mesa/program/lex.yy.c \ src/mesa/program/program_parse.tab.c \ - src/mesa/program/program_parse.tab.h + src/mesa/program/program_parse.tab.h \ + src/gallium/drivers/r600/Makefile.in \ + src/gallium/drivers/r300/Makefile.in \ + src/gallium/drivers/Makefile.in \ + src/gallium/Makefile.in \ + src/gallium/auxiliary/pipe-loader/Makefile.in \ + src/gallium/targets/opencl/Makefile.in \ + src/gallium/state_trackers/clover/Makefile.in \ + src/mapi/glapi/tests/Makefile.in \ + src/mapi/glapi/Makefile.in \ + src/mapi/glapi/gen/Makefile.in \ + src/mapi/es1api/Makefile.in \ + src/mapi/shared-glapi/tests/Makefile.in \ + src/mapi/shared-glapi/Makefile.in \ + src/mapi/vgapi/Makefile.in \ + src/mapi/es2api/Makefile.in \ + src/glsl/tests/Makefile.in \ + src/glsl/glcpp/Makefile.in \ + src/glsl/builtin_compiler/Makefile.in \ + src/glsl/Makefile.in \ + src/gtest/Makefile.in \ + src/egl/drivers/Makefile.in \ + src/egl/drivers/glx/Makefile.in \ + src/egl/drivers/dri2/Makefile.in \ + src/egl/Makefile.in \ + src/egl/main/Makefile.in \ + src/egl/wayland/Makefile.in \ + src/egl/wayland/wayland-drm/Makefile.in \ + src/egl/wayland/wayland-egl/Makefile.in \ + src/Makefile.in \ + src/glx/tests/Makefile.in \ + src/glx/Makefile.in \ + src/gbm/Makefile.in \ + src/mesa/drivers/Makefile.in \ + src/mesa/drivers/dri/common/Makefile.in \ + src/mesa/drivers/dri/i965/Makefile.in \ + src/mesa/drivers/dri/r200/Makefile.in \ + src/mesa/drivers/dri/Makefile.in \ + src/mesa/drivers/dri/radeon/Makefile.in \ + src/mesa/drivers/dri/swrast/Makefile.in \ + src/mesa/drivers/dri/nouveau/Makefile.in \ + src/mesa/drivers/dri/i915/Makefile.in \ + src/mesa/drivers/osmesa/Makefile.in \ + src/mesa/drivers/x11/Makefile.in \ + src/mesa/Makefile.in \ + src/mesa/libdricore/Makefile.in \ + src/mesa/x86-64/Makefile.in \ + src/mesa/program/Makefile.in \ + src/mesa/main/tests/Makefile.in \ + src/mesa/main/tests/hash_table/Makefile.in \ + src/mesa/x86/Makefile.in \ + Makefile.in + IGNORE_FILES = \ -x autogen.sh @@ -86,7 +146,7 @@ parsers: configure -@touch $(top_builddir)/configs/current $(MAKE) -C src/glsl glsl_parser.cc glsl_parser.h glsl_lexer.cc $(MAKE) -C src/glsl/glcpp glcpp-lex.c glcpp-parse.c glcpp-parse.h - $(MAKE) -C src/mesa program/lex.yy.c program/program_parse.tab.c program/program_parse.tab.h + $(MAKE) -C src/mesa/program lex.yy.c program_parse.tab.c program_parse.tab.h # Everything for new a Mesa release: ARCHIVES = $(PACKAGE_NAME).tar.gz \ |