fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 09:18:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

mesa: Build with subdir-objects.

Browse source
This commit is contained in:
Matt Turner 2014-12-18 11:44:07 -08:00
parent 145919b2ab
commit dd6f641303
5 changed files with 562 additions and 573 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/Android.libmesa_dricore.mk
View file

@ -32,8 +32,6 @@ LOCAL_PATH := $(call my-dir)
# MESA_FILES
# X86_FILES
include $(LOCAL_PATH)/Makefile.sources
SRCDIR :=
BUILDDIR :=
include $(CLEAR_VARS)

2
src/mesa/Android.libmesa_st_mesa.mk
View file

@ -32,8 +32,6 @@ LOCAL_PATH := $(call my-dir)
# MESA_GALLIUM_FILES.
# X86_FILES
include $(LOCAL_PATH)/Makefile.sources
SRCDIR :=
BUILDDIR :=
include $(CLEAR_VARS)

25
src/mesa/Makefile.am
View file

@ -19,6 +19,8 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE.
AUTOMAKE_OPTIONS = subdir-objects
SUBDIRS = . main/tests
if HAVE_X11_DRIVER
@ -36,8 +38,8 @@ endif
gldir = $(includedir)/GL
gl_HEADERS = $(top_srcdir)/include/GL/*.h
.PHONY: $(BUILDDIR)main/git_sha1.h.tmp
$(BUILDDIR)main/git_sha1.h.tmp:
.PHONY: main/git_sha1.h.tmp
main/git_sha1.h.tmp:
@touch main/git_sha1.h.tmp
@if test -d $(top_srcdir)/.git; then \
if which git > /dev/null; then \
@ -47,7 +49,7 @@ $(BUILDDIR)main/git_sha1.h.tmp:
fi \
fi
$(BUILDDIR)main/git_sha1.h: $(BUILDDIR)main/git_sha1.h.tmp
main/git_sha1.h: main/git_sha1.h.tmp
@echo "updating main/git_sha1.h"
@if ! cmp -s main/git_sha1.h.tmp main/git_sha1.h; then \
mv main/git_sha1.h.tmp main/git_sha1.h ;\
@ -55,7 +57,6 @@ $(BUILDDIR)main/git_sha1.h: $(BUILDDIR)main/git_sha1.h.tmp
rm main/git_sha1.h.tmp ;\
fi
BUILDDIR = $(builddir)/
include Makefile.sources
EXTRA_DIST = \
@ -80,15 +81,15 @@ EXTRA_DIST = \
BUILT_SOURCES = \
main/get_hash.h \
main/format_info.c \
$(BUILDDIR)main/git_sha1.h \
main/git_sha1.h \
main/format_pack.c \
main/format_unpack.c \
$(BUILDDIR)program/program_parse.tab.c \
$(BUILDDIR)program/lex.yy.c
program/program_parse.tab.c \
program/lex.yy.c
CLEANFILES = \
$(BUILT_SOURCES) \
$(BUILDDIR)program/program_parse.tab.h \
$(BUILDDIR)main/git_sha1.h.tmp
program/program_parse.tab.h \
main/git_sha1.h.tmp
GET_HASH_GEN = main/get_hash_generator.py
@ -193,13 +194,13 @@ libmesa_sse41_la_CFLAGS = $(AM_CFLAGS) $(SSE41_CFLAGS)
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gl.pc
$(BUILDDIR)program/lex.yy.c: program/program_lexer.l
program/lex.yy.c: program/program_lexer.l
$(AM_V_at)$(MKDIR_P) program
$(AM_V_GEN) $(LEX) --never-interactive --outfile=$@ $<
$(BUILDDIR)program/program_parse.tab.c $(BUILDDIR)program/program_parse.tab.h: program/program_parse.y
program/program_parse.tab.c program/program_parse.tab.h: program/program_parse.y
$(AM_V_at)$(MKDIR_P) program
$(AM_V_GEN) $(YACC) -p "_mesa_program_" -v -d --output=$(BUILDDIR)program/program_parse.tab.c $<
$(AM_V_GEN) $(YACC) -p "_mesa_program_" -v -d --output=program/program_parse.tab.c $<
if GEN_ASM_OFFSETS
matypes.h: $(gen_matypes_SOURCES)

1104
src/mesa/Makefile.sources
View file

File diff suppressed because it is too large Load diff

2
src/mesa/program/Android.mk
View file

@ -39,8 +39,6 @@ endef
# Import the following variables:
# PROGRAM_FILES
include $(MESA_TOP)/src/mesa/Makefile.sources
SRCDIR :=
BUILDDIR :=
include $(CLEAR_VARS)