fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-27 01:50:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

vc4: Drop subdirectory in vc4 build.

Browse source 
Just because we put the source in a subdir, doesn't mean we need helper
libraries in the build.  This will also simplify the Android build setup.
This commit is contained in:
Eric Anholt 2015-06-03 10:18:04 -07:00
parent e67b12eaf8
commit 8d10b2a046
5 changed files with 5 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
configure.ac
View file

@ -2350,7 +2350,6 @@ AC_CONFIG_FILES([Makefile
src/gallium/drivers/svga/Makefile
src/gallium/drivers/trace/Makefile
src/gallium/drivers/vc4/Makefile
src/gallium/drivers/vc4/kernel/Makefile
src/gallium/state_trackers/clover/Makefile
src/gallium/state_trackers/dri/Makefile
src/gallium/state_trackers/glx/xlib/Makefile

4
src/gallium/drivers/vc4/Makefile.am
View file

@ -19,8 +19,6 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE.
SUBDIRS = kernel
include Makefile.sources
include $(top_srcdir)/src/gallium/Automake.inc
@ -39,5 +37,5 @@ AM_CFLAGS = \
noinst_LTLIBRARIES = libvc4.la
libvc4_la_SOURCES = $(C_SOURCES)
libvc4_la_LIBADD = $(SIM_LIB) kernel/libvc4_kernel.la
libvc4_la_LIBADD = $(SIM_LIB)
libvc4_la_LDFLAGS = $(SIM_LDFLAGS)

4
src/gallium/drivers/vc4/Makefile.sources
View file

@ -1,4 +1,8 @@
C_SOURCES := \
kernel/vc4_drv.h \
kernel/vc4_gem.c \
kernel/vc4_validate.c \
kernel/vc4_validate_shaders.c \
vc4_blit.c \
vc4_bufmgr.c \
vc4_bufmgr.h \

40
src/gallium/drivers/vc4/kernel/Makefile.am
View file

@ -1,40 +0,0 @@
# Copyright © 2014 Broadcom
#
# 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
include $(top_srcdir)/src/gallium/Automake.inc
if USE_VC4_SIMULATOR
SIM_CFLAGS = -DUSE_VC4_SIMULATOR=1
endif
AM_CFLAGS = \
$(LIBDRM_CFLAGS) \
$(GALLIUM_DRIVER_CFLAGS) \
$(SIM_CFLAGS) \
-I$(top_srcdir)/src/mesa/ \
-I$(srcdir)/../ \
$()
noinst_LTLIBRARIES = libvc4_kernel.la
libvc4_kernel_la_SOURCES = $(C_SOURCES)
libvc4_kernel_la_LDFLAGS = $(SIM_LDFLAGS)

6
src/gallium/drivers/vc4/kernel/Makefile.sources
View file

@ -1,6 +0,0 @@
C_SOURCES := \
vc4_drv.h \
vc4_gem.c \
vc4_validate.c \
vc4_validate_shaders.c \
$()