aboutsummaryrefslogtreecommitdiff
path: root/mesalib/Makefile.am
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-01-24 08:36:10 +0100
committermarha <marha@users.sourceforge.net>2013-01-24 08:36:10 +0100
commit06872e284da1c00ce03b234ca24aefeac64990d2 (patch)
treee1e8bee8a20f7b759b50edfc21d2313489280d10 /mesalib/Makefile.am
parent470f7ca9f0be348faf2f03fc16811844c5eeffce (diff)
downloadvcxsrv-06872e284da1c00ce03b234ca24aefeac64990d2.tar.gz
vcxsrv-06872e284da1c00ce03b234ca24aefeac64990d2.tar.bz2
vcxsrv-06872e284da1c00ce03b234ca24aefeac64990d2.zip
fontconfig mesa pixman xkbcomp xserver git update 24 jan 2013
fontconfig: fb3b410998aba8835999e2ca7003a180431cfaf4 mesa: 5bd86b26df30d32412ca1b7ac02892ab5e10c6ef pixman: b527a0e615a726aa6a7d18f0ea0b38564b153afa xkbcomp: 705b9bbb426410f9510601c7010da51184919b36 xserver: 7fe5e6dfa5c1e71d8b7540b28c1d508687a2fbee
Diffstat (limited to 'mesalib/Makefile.am')
-rw-r--r--mesalib/Makefile.am8
1 files changed, 3 insertions, 5 deletions
diff --git a/mesalib/Makefile.am b/mesalib/Makefile.am
index ee733339a..0e61a55d5 100644
--- a/mesalib/Makefile.am
+++ b/mesalib/Makefile.am
@@ -30,7 +30,6 @@ check-local:
$(MAKE) -C src/mapi/glapi/tests check
$(MAKE) -C src/mapi/shared-glapi/tests check
$(MAKE) -C src/mesa/main/tests check
- $(MAKE) -C src/glsl/tests check
$(MAKE) -C src/glx/tests check
.PHONY: doxygen
@@ -53,9 +52,9 @@ EXTRA_FILES = \
bin/ltmain.sh \
bin/missing \
bin/ylwrap \
- src/glsl/glsl_parser.cc \
+ src/glsl/glsl_parser.cpp \
src/glsl/glsl_parser.h \
- src/glsl/glsl_lexer.cc \
+ src/glsl/glsl_lexer.cpp \
src/glsl/glcpp/glcpp-lex.c \
src/glsl/glcpp/glcpp-parse.c \
src/glsl/glcpp/glcpp-parse.h \
@@ -76,8 +75,7 @@ IGNORE_FILES = \
parsers: configure
- $(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/glsl glsl_parser.cpp glsl_parser.h glsl_lexer.cpp glcpp/glcpp-lex.c glcpp/glcpp-parse.c glcpp/glcpp-parse.h
$(MAKE) -C src/mesa/program lex.yy.c program_parse.tab.c program_parse.tab.h
# Everything for new a Mesa release: