[Mesa-dev] [PATCH 6/7] glsl/build: Build glcpp via the glsl Makefile
Matt Turner
mattst88 at gmail.com
Wed Jan 16 15:14:15 PST 2013
Removing the subdirectory recursion provides a small speed up.
---
configure.ac | 1 -
src/glsl/.gitignore | 4 +-
src/glsl/Makefile.am | 108 ++++++++++++++++++++++++++++++---------
src/glsl/Makefile.sources | 8 ++--
src/glsl/glcpp/Makefile.am | 54 -------------------
src/glsl/glcpp/tests/glcpp-test | 4 +-
6 files changed, 91 insertions(+), 88 deletions(-)
delete mode 100644 src/glsl/glcpp/Makefile.am
diff --git a/configure.ac b/configure.ac
index 5dd9a80..b08c1c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2085,7 +2085,6 @@ AC_CONFIG_FILES([Makefile
src/gbm/main/gbm.pc
src/glsl/Makefile
src/glsl/builtin_compiler/Makefile
- src/glsl/glcpp/Makefile
src/glsl/tests/Makefile
src/glx/Makefile
src/glx/tests/Makefile
diff --git a/src/glsl/.gitignore b/src/glsl/.gitignore
index a04df27..2cf5b00 100644
--- a/src/glsl/.gitignore
+++ b/src/glsl/.gitignore
@@ -1,6 +1,6 @@
glsl_compiler
-glsl_lexer.cc
-glsl_parser.cc
+glsl_lexer.cpp
+glsl_parser.cpp
glsl_parser.h
glsl_parser.output
builtin_function.cpp
diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am
index 07fcf96..1962d3b 100644
--- a/src/glsl/Makefile.am
+++ b/src/glsl/Makefile.am
@@ -20,35 +20,42 @@
# IN THE SOFTWARE.
if CROSS_COMPILING
-SUBDIRS = builtin_compiler glcpp
-else
-SUBDIRS = glcpp
+SUBDIRS = builtin_compiler
endif
AM_CPPFLAGS = \
-I$(top_srcdir)/include \
-I$(top_srcdir)/src/mapi \
-I$(top_srcdir)/src/mesa/ \
+ -I$(top_srcdir)/src/glsl/glcpp \
$(DEFINES) \
$(API_DEFINES)
AM_CFLAGS = $(VISIBILITY_CFLAGS)
AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS)
-AM_LFLAGS = --nounistd -o$(LEX_OUTPUT_ROOT).c
-
include Makefile.sources
-noinst_LTLIBRARIES = libglsl.la
-check_PROGRAMS = glsl_test
+TESTS = glcpp/tests/glcpp-test
-libglsl_la_SOURCES = \
- glsl_lexer.ll \
- glsl_parser.cc \
- $(LIBGLSL_FILES) \
- builtin_function.cpp
+noinst_LTLIBRARIES = libglcpp.la libglsl.la
+check_PROGRAMS = glcpp/glcpp glsl_test
-libglsl_la_LIBADD = glcpp/libglcpp.la
-libglsl_la_LDFLAGS =
+libglcpp_la_SOURCES = \
+ glcpp/glcpp-lex.c \
+ glcpp/glcpp-parse.c \
+ $(LIBGLCPP_FILES)
+
+glcpp_glcpp_SOURCES = \
+ glcpp/glcpp.c \
+ $(top_srcdir)/src/mesa/program/prog_hash_table.c
+glcpp_glcpp_LDADD = libglcpp.la
+
+libglsl_la_SOURCES = \
+ glsl_lexer.cpp \
+ glsl_parser.cpp \
+ $(LIBGLSL_FILES) \
+ builtin_function.cpp
+libglsl_la_LIBADD = libglcpp.la
glsl_test_SOURCES = \
$(top_srcdir)/src/mesa/main/hash_table.c \
@@ -69,8 +76,8 @@ noinst_PROGRAMS = builtincompiler
noinst_LTLIBRARIES += libglslcore.la
libglslcore_la_SOURCES = \
- glsl_lexer.ll \
- glsl_parser.cc \
+ glsl_lexer.cpp \
+ glsl_parser.cpp \
$(LIBGLSL_FILES)
builtincompiler_SOURCES = \
$(top_srcdir)/src/mesa/main/hash_table.c \
@@ -78,18 +85,69 @@ builtincompiler_SOURCES = \
$(top_srcdir)/src/mesa/program/symbol_table.c \
$(top_srcdir)/src/glsl/builtin_compiler/builtin_stubs.cpp \
$(GLSL_COMPILER_CXX_FILES)
-builtincompiler_LDADD = libglslcore.la glcpp/libglcpp.la
+builtincompiler_LDADD = libglslcore.la libglcpp.la
endif
-# automake <=1.11 and automake >=1.12 have different conventions for naming C++ header files
-# made by yacc. To work with both, we write our own rule rather than using automake's.
-# When (if) we require automake >=1.12 in configure.ac, this can be removed, and we can use
-# the automake rule.
-glsl_parser.cc glsl_parser.h: glsl_parser.yy
- $(AM_V_GEN) $(YACC) -v -o glsl_parser.cc -p "_mesa_glsl_" --defines=glsl_parser.h $<
+# We write our own rules for yacc and lex below. We'd rather use automake,
+# but automake makes it especially difficult for a number of reasons:
+#
+# * < automake-1.12 generates .h files from .yy and .ypp files, but
+# >=automake-1.12 generates .hh and .hpp files respectively. There's no
+# good way of making a project that uses C++ yacc files compatible with
+# both versions of automake. Strong work automake developers.
+#
+# * Since we're generating code from .l/.y files in a subdirectory (glcpp/)
+# we'd like the resulting generated code to also go in glcpp/ for purposes
+# of distribution. Automake gives no way to do this.
+#
+# * Since we're building multiple yacc parsers into one library (and via one
+# Makefile) we have to use per-target YFLAGS. Using per-target YFLAGS causes
+# automake to name the resulting generated code as <library-name>_filename.c.
+# Frankly, that's ugly and we don't want a libglcpp_glcpp_parser.h file.
-BUILT_SOURCES = glsl_parser.h
-CLEANFILES = glsl_lexer.cc glsl_parser.cc $(BUILT_SOURCES) builtin_function.cpp
+# In order to make build output print "LEX" and "YACC", we reproduce the
+# automake variables below.
+
+AM_V_LEX = $(am__v_LEX_$(V))
+am__v_LEX_ = $(am__v_LEX_$(AM_DEFAULT_VERBOSITY))
+am__v_LEX_0 = @echo " LEX " $@;
+am__v_LEX_1 =
+
+AM_V_YACC = $(am__v_YACC_$(V))
+am__v_YACC_ = $(am__v_YACC_$(AM_DEFAULT_VERBOSITY))
+am__v_YACC_0 = @echo " YACC " $@;
+am__v_YACC_1 =
+
+glsl_parser.cpp glsl_parser.h: glsl_parser.yy
+ $(AM_V_YACC) $(YACC) $(YFLAGS) -o $@ -p "_mesa_glsl_" --defines=$(GLSL_BUILDDIR)/glsl_parser.h $<
+
+glsl_lexer.cpp: glsl_lexer.ll
+ $(AM_V_LEX) $(LEX) $(LFLAGS) -o $@ $<
+
+glcpp/glcpp-parse.c glcpp/glcpp-parse.h: glcpp/glcpp-parse.y
+ $(MKDIR_P) $(GLSL_BUILDDIR)/glcpp
+ $(AM_V_YACC) $(YACC) $(YFLAGS) -o $@ -p "glcpp_parser_" --defines=$(GLSL_BUILDDIR)/glcpp/glcpp-parse.h $<
+
+glcpp/glcpp-lex.c: glcpp/glcpp-lex.l
+ $(MKDIR_P) $(GLSL_BUILDDIR)/glcpp
+ $(AM_V_LEX) $(LEX) $(LFLAGS) -o $@ $<
+
+# Only the parsers (specifically the header files generated at the same time)
+# need to be in BUILT_SOURCES. Though if we list the parser headers YACC is
+# called for the .c/.cpp file and the .h files. By listing the .c/.cpp files
+# YACC is only executed once for each parser. The rest of the generated code
+# will be created at the appropriate times according to standard automake
+# dependency rules.
+BUILT_SOURCES = \
+ glsl_parser.cpp \
+ glcpp/glcpp-parse.c \
+ builtin_function.cpp
+CLEANFILES = \
+ glcpp/glcpp-parse.h \
+ glcpp/glcpp-lex.c \
+ glsl_parser.h \
+ glsl_lexer.cpp \
+ $(BUILT_SOURCES)
builtin_function.cpp: $(srcdir)/builtins/profiles/* $(srcdir)/builtins/ir/* $(srcdir)/builtins/glsl/* $(srcdir)/builtins/tools/generate_builtins.py $(srcdir)/builtins/tools/texture_builtins.py $(BUILTIN_COMPILER)
$(AM_V_GEN) $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/builtins/tools/generate_builtins.py $(builddir)/$(BUILTIN_COMPILER) > builtin_function.cpp || rm -f builtin_function.cpp
diff --git a/src/glsl/Makefile.sources b/src/glsl/Makefile.sources
index 2227c5e..7955d34 100644
--- a/src/glsl/Makefile.sources
+++ b/src/glsl/Makefile.sources
@@ -6,6 +6,7 @@ GLSL_BUILDDIR = $(top_builddir)/src/glsl
# libglcpp
LIBGLCPP_FILES = \
+ $(GLSL_SRCDIR)/ralloc.c \
$(GLSL_SRCDIR)/glcpp/pp.c
LIBGLCPP_GENERATED_FILES = \
@@ -84,8 +85,7 @@ LIBGLSL_FILES = \
$(GLSL_SRCDIR)/opt_swizzle_swizzle.cpp \
$(GLSL_SRCDIR)/opt_tree_grafting.cpp \
$(GLSL_SRCDIR)/s_expression.cpp \
- $(GLSL_SRCDIR)/strtod.c \
- $(GLSL_SRCDIR)/ralloc.c
+ $(GLSL_SRCDIR)/strtod.c
# glsl_compiler
@@ -103,8 +103,8 @@ BUILTIN_COMPILER_CXX_FILES = \
$(GLSL_SRCDIR)/builtin_stubs.cpp
BUILTIN_COMPILER_GENERATED_CXX_FILES = \
- $(GLSL_BUILDDIR)/glsl_lexer.cc \
- $(GLSL_BUILDDIR)/glsl_parser.cc
+ $(GLSL_BUILDDIR)/glsl_lexer.cpp \
+ $(GLSL_BUILDDIR)/glsl_parser.cpp
# libglsl generated sources
LIBGLSL_GENERATED_CXX_FILES = \
diff --git a/src/glsl/glcpp/Makefile.am b/src/glsl/glcpp/Makefile.am
deleted file mode 100644
index d79f865..0000000
--- a/src/glsl/glcpp/Makefile.am
+++ /dev/null
@@ -1,54 +0,0 @@
-
-# Copyright © 2012 Jon TURNEY
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-# IN THE SOFTWARE.
-
-include ../Makefile.sources
-
-TESTS = tests/glcpp-test
-
-AM_CFLAGS = \
- -I$(top_srcdir)/include \
- -I$(top_srcdir)/src/mapi \
- -I$(top_srcdir)/src/mesa/ \
- $(VISIBILITY_CFLAGS) \
- $(DEFINES) \
- $(API_DEFINES)
-
-AM_YFLAGS = -v -d -p "glcpp_parser_"
-AM_LFLAGS = --nounistd -o$(LEX_OUTPUT_ROOT).c
-
-noinst_LTLIBRARIES = libglcpp.la
-noinst_PROGRAMS = glcpp
-
-libglcpp_la_SOURCES = \
- glcpp-lex.l \
- glcpp-parse.y \
- $(LIBGLCPP_FILES)
-
-glcpp_SOURCES = \
- ../ralloc.c \
- $(top_srcdir)/src/mesa/program/prog_hash_table.c \
- glcpp.c
-
-glcpp_LDADD = libglcpp.la
-
-BUILT_SOURCES = glcpp-lex.c glcpp-parse.c glcpp-parse.h
-CLEANFILES = $(BUILT_SOURCES)
diff --git a/src/glsl/glcpp/tests/glcpp-test b/src/glsl/glcpp/tests/glcpp-test
index d12db6f..2d2687f 100755
--- a/src/glsl/glcpp/tests/glcpp-test
+++ b/src/glsl/glcpp/tests/glcpp-test
@@ -1,8 +1,8 @@
#!/bin/sh
if [ ! -z "$srcdir" ]; then
- testdir=$srcdir/tests
- glcpp=`pwd`/glcpp
+ testdir=$srcdir/glcpp/tests
+ glcpp=`pwd`/glcpp/glcpp
else
testdir=.
glcpp=../glcpp
--
1.7.8.6
More information about the mesa-dev
mailing list