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

build: Only build libmesagallium.la if building Gallium

Browse Source 
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Matt Turner
2012-08-17 15:51:59 -07:00
parent f9786394e5
commit bfd7d6f58b
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@@ -1530,6 +1530,7 @@ dnl
if test "x$with_gallium_drivers" != x; then if test "x$with_gallium_drivers" != x; then
SRC_DIRS="$SRC_DIRS gallium gallium/winsys gallium/targets" SRC_DIRS="$SRC_DIRS gallium gallium/winsys gallium/targets"
fi fi
AM_CONDITIONAL(HAVE_GALLIUM, test "x$with_gallium_drivers" != x)
AC_SUBST([LLVM_BINDIR]) AC_SUBST([LLVM_BINDIR])
AC_SUBST([LLVM_CFLAGS]) AC_SUBST([LLVM_CFLAGS])

9
src/mesa/Makefile.am
View File

@@ -92,7 +92,10 @@ program/lex.yy.c: program/program_lexer.l
$(MKDIR_P) program $(MKDIR_P) program
$(AM_V_GEN) $(LEX) --never-interactive --outfile=$@ $< $(AM_V_GEN) $(LEX) --never-interactive --outfile=$@ $<
noinst_LTLIBRARIES = libmesa.la libmesagallium.la noinst_LTLIBRARIES = libmesa.la
if HAVE_GALLIUM
noinst_LTLIBRARIES += libmesagallium.la
endif
SRCDIR = $(top_srcdir)/src/mesa/ SRCDIR = $(top_srcdir)/src/mesa/
BUILDDIR = $(top_builddir)/src/mesa/ BUILDDIR = $(top_builddir)/src/mesa/
@@ -142,9 +145,11 @@ libmesagallium_la_LDFLAGS =
# Provide compatibility with scripts for the old Mesa build system for # Provide compatibility with scripts for the old Mesa build system for
# a while by putting a link to the library in the current directory. # a while by putting a link to the library in the current directory.
all-local: libmesa.la libmesagallium.la all-local: $(noinst_LTLIBRARIES)
ln -f .libs/libmesa.a . ln -f .libs/libmesa.a .
if HAVE_GALLIUM
ln -f .libs/libmesagallium.a . ln -f .libs/libmesagallium.a .
endif
CLEANFILES += libmesa.a libmesagallium.a CLEANFILES += libmesa.a libmesagallium.a