OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build/glsl: fix location of generated files.

Browse Source 
Like in src/mesa, use GLSL_BUILDDIR/GLSL_SRCDIR to unambiguously
distinguish between in-tree and generated files.

Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
This commit is contained in:
Christopher James Halse Rogers
2012-07-19 12:30:10 +10:00
committed by Matt Turner
parent 37a1b8083e
commit 77a3efc6b9
3 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/glsl/Makefile.am
View File

@@ -23,9 +23,6 @@
# builtin_compiler is built before libglsl to generate builtin_function.cpp for libglsl. # builtin_compiler is built before libglsl to generate builtin_function.cpp for libglsl.
# For this to work, a dummy version of builtin_function.cpp, builtin_stubs.cpp, is used. # For this to work, a dummy version of builtin_function.cpp, builtin_stubs.cpp, is used.
# Hack to make some of the non-automake variables work.
TOP=$(top_builddir)
AM_CFLAGS = \ AM_CFLAGS = \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_srcdir)/src/mapi \ -I$(top_srcdir)/src/mapi \
@@ -39,7 +36,6 @@ AM_CXXFLAGS = $(AM_CFLAGS)
AM_LFLAGS = --nounistd -o$(LEX_OUTPUT_ROOT).c AM_LFLAGS = --nounistd -o$(LEX_OUTPUT_ROOT).c
GLSL_SRCDIR=$(top_srcdir)/src/glsl
include Makefile.sources include Makefile.sources
noinst_LTLIBRARIES = libglslcommon.la libglsl.la noinst_LTLIBRARIES = libglslcommon.la libglsl.la

15
src/glsl/Makefile.sources
View File

@@ -1,6 +1,7 @@
# shared source lists for Makefile, SConscript, and Android.mk # shared source lists for Makefile, SConscript, and Android.mk
GLSL_SRCDIR ?= . GLSL_SRCDIR = $(top_srcdir)/src/glsl
GLSL_BUILDDIR = $(top_builddir)/src/glsl
# libglcpp # libglcpp
@@ -8,8 +9,8 @@ LIBGLCPP_FILES = \
$(GLSL_SRCDIR)/glcpp/pp.c $(GLSL_SRCDIR)/glcpp/pp.c
LIBGLCPP_GENERATED_FILES = \ LIBGLCPP_GENERATED_FILES = \
$(GLSL_SRCDIR)/glcpp/glcpp-lex.c \ $(GLSL_BUILDDIR)/glcpp/glcpp-lex.c \
$(GLSL_SRCDIR)/glcpp/glcpp-parse.c $(GLSL_BUILDDIR)/glcpp/glcpp-parse.c
# libglsl # libglsl
@@ -102,10 +103,10 @@ BUILTIN_COMPILER_CXX_FILES = \
$(GLSL_SRCDIR)/builtin_stubs.cpp $(GLSL_SRCDIR)/builtin_stubs.cpp
BUILTIN_COMPILER_GENERATED_CXX_FILES = \ BUILTIN_COMPILER_GENERATED_CXX_FILES = \
$(GLSL_SRCDIR)/glsl_lexer.cc \ $(GLSL_BUILDDIR)/glsl_lexer.cc \
$(GLSL_SRCDIR)/glsl_parser.cc $(GLSL_BUILDDIR)/glsl_parser.cc
# libglsl generated sources # libglsl generated sources
LIBGLSL_GENERATED_CXX_FILES = \ LIBGLSL_GENERATED_CXX_FILES = \
$(GLSL_SRCDIR)/$(BUILTIN_COMPILER_GENERATED_CXX_FILES) \ $(BUILTIN_COMPILER_GENERATED_CXX_FILES) \
$(GLSL_SRCDIR)/builtin_function.cpp $(GLSL_BUILDDIR)/builtin_function.cpp

4
src/glsl/glcpp/Makefile.am
View File

@@ -20,10 +20,6 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE. # IN THE SOFTWARE.
# Hack to make some of the non-automake variables work.
TOP=$(top_builddir)
GLSL_SRCDIR=$(top_srcdir)/src/glsl
include ../Makefile.sources include ../Makefile.sources
AM_CFLAGS = \ AM_CFLAGS = \