diff options
| author | marha <marha@users.sourceforge.net> | 2012-02-01 08:36:02 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-02-01 08:36:02 +0100 |
| commit | 68320ff05946f092b6836754c6267b1dff2f4633 (patch) | |
| tree | 424d73f509dff521d4cc22a95369594b7ee56dad /mesalib/src/glsl/Makefile | |
| parent | 71b5bea4d5ef75f50bd7bd7b93f47f8552c178e0 (diff) | |
| parent | 58ff764d4111bfaa7360c57bc62dd620fbdce06f (diff) | |
| download | vcxsrv-68320ff05946f092b6836754c6267b1dff2f4633.tar.gz vcxsrv-68320ff05946f092b6836754c6267b1dff2f4633.tar.bz2 vcxsrv-68320ff05946f092b6836754c6267b1dff2f4633.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/glsl/Makefile')
| -rw-r--r-- | mesalib/src/glsl/Makefile | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/mesalib/src/glsl/Makefile b/mesalib/src/glsl/Makefile index d9ecbc8e3..f6c722997 100644 --- a/mesalib/src/glsl/Makefile +++ b/mesalib/src/glsl/Makefile @@ -10,20 +10,20 @@ LIBNAME = glsl include Makefile.sources GLCPP_SOURCES = \ - $(LIBGLCPP_GENERATED_SOURCES) \ - $(LIBGLCPP_SOURCES) \ + $(LIBGLCPP_GENERATED_FILES) \ + $(LIBGLCPP_FILES) \ ralloc.c \ glcpp/glcpp.c C_SOURCES = \ - $(LIBGLCPP_GENERATED_SOURCES) \ - $(LIBGLCPP_SOURCES) \ - $(LIBGLSL_SOURCES) + $(LIBGLCPP_GENERATED_FILES) \ + $(LIBGLCPP_FILES) \ + $(LIBGLSL_FILES) # common sources for builtin_compiler and libglsl CXX_SOURCES = \ - $(BUILTIN_COMPILER_GENERATED_CXX_SOURCES) \ - $(LIBGLSL_CXX_SOURCES) + $(BUILTIN_COMPILER_GENERATED_CXX_FILES) \ + $(LIBGLSL_CXX_FILES) LIBS = \ $(TOP)/src/glsl/libglsl.a @@ -34,7 +34,7 @@ GLSL2_C_SOURCES = \ ../mesa/program/hash_table.c \ ../mesa/program/symbol_table.c GLSL2_CXX_SOURCES = \ - $(GLSL_COMPILER_CXX_SOURCES) + $(GLSL_COMPILER_CXX_FILES) GLSL2_OBJECTS = \ $(GLSL2_C_SOURCES:.c=.o) \ |