diff options
| author | marha <marha@users.sourceforge.net> | 2012-07-16 07:53:32 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-07-16 07:53:32 +0200 |
| commit | 01102cdf33d68a7be192a139752831ff93dee117 (patch) | |
| tree | 84cc702a6d5bb77647f6df3840b41eb9a7b9faf4 /mesalib/Makefile.am | |
| parent | dcf9ae77854778629cabd0d6943dda3678eb91fa (diff) | |
| parent | d09d7be8bbbb39926f44834023d7120535155829 (diff) | |
| download | vcxsrv-01102cdf33d68a7be192a139752831ff93dee117.tar.gz vcxsrv-01102cdf33d68a7be192a139752831ff93dee117.tar.bz2 vcxsrv-01102cdf33d68a7be192a139752831ff93dee117.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/glsl/.gitignore
mesalib/src/glsl/glcpp/.gitignore
Diffstat (limited to 'mesalib/Makefile.am')
| -rw-r--r-- | mesalib/Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesalib/Makefile.am b/mesalib/Makefile.am index 8210fccd4..b2c810aef 100644 --- a/mesalib/Makefile.am +++ b/mesalib/Makefile.am @@ -58,9 +58,9 @@ PACKAGE_NAME = MesaLib-$(PACKAGE_VERSION) EXTRA_FILES = \ aclocal.m4 \ configure \ - src/glsl/glsl_parser.cpp \ + src/glsl/glsl_parser.cc \ src/glsl/glsl_parser.h \ - src/glsl/glsl_lexer.cpp \ + src/glsl/glsl_lexer.cc \ src/glsl/glcpp/glcpp-lex.c \ src/glsl/glcpp/glcpp-parse.c \ src/glsl/glcpp/glcpp-parse.h \ @@ -80,7 +80,7 @@ IGNORE_FILES = \ parsers: configure -@touch $(top_builddir)/configs/current - $(MAKE) -C src/glsl glsl_parser.cpp glsl_parser.h glsl_lexer.cpp + $(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 |