diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/.gitignore | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/Makefile | 21 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/Makefile.am | 41 |
4 files changed, 43 insertions, 21 deletions
diff --git a/configure.ac b/configure.ac index ee365288148..05dbc733e52 100644 --- a/configure.ac +++ b/configure.ac @@ -2018,6 +2018,7 @@ AC_CONFIG_FILES([configs/current src/gallium/drivers/nvc0/Makefile src/gallium/drivers/r300/Makefile src/gallium/drivers/r600/Makefile + src/gallium/drivers/radeonsi/Makefile src/gallium/drivers/rbug/Makefile src/gallium/drivers/softpipe/Makefile src/gallium/drivers/svga/Makefile diff --git a/src/gallium/drivers/radeonsi/.gitignore b/src/gallium/drivers/radeonsi/.gitignore new file mode 100644 index 00000000000..f3c7a7c5da6 --- /dev/null +++ b/src/gallium/drivers/radeonsi/.gitignore @@ -0,0 +1 @@ +Makefile diff --git a/src/gallium/drivers/radeonsi/Makefile b/src/gallium/drivers/radeonsi/Makefile deleted file mode 100644 index 5d16b41ed0e..00000000000 --- a/src/gallium/drivers/radeonsi/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -TOP = ../../../.. -include $(TOP)/configs/current - -LIBNAME = radeonsi - -LIBRARY_INCLUDES = \ - -I$(TOP)/include \ - -I$(TOP)/src/gallium/drivers/radeon/ - - -# get C_SOURCES -include Makefile.sources - -LIBRADEON = $(TOP)/src/gallium/drivers/radeon/libradeon.a - -EXTRA_OBJECTS = \ - $(LIBRADEON) - -CFLAGS+=$(RADEON_CFLAGS) - -include ../../Makefile.template diff --git a/src/gallium/drivers/radeonsi/Makefile.am b/src/gallium/drivers/radeonsi/Makefile.am new file mode 100644 index 00000000000..7906fb6aa5f --- /dev/null +++ b/src/gallium/drivers/radeonsi/Makefile.am @@ -0,0 +1,41 @@ +# Copyright © 2012 Intel Corporation +# +# 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 + +noinst_LIBRARIES = libradeonsi.a + +AM_CPPFLAGS = \ + -I$(top_srcdir)/src/gallium/drivers/radeon \ + -I$(top_srcdir)/src/gallium/drivers \ + -I$(top_srcdir)/include \ + $(GALLIUM_CFLAGS) +AM_CFLAGS = $(LLVM_CFLAGS) + +# This is a hack until we can move the backend into the LLVM project. +# We need to use mklib, because it splits up libradeon.a into object files +# so that we can link it with the radeonsi objects. +libradeonsi_a_AR = $(top_srcdir)/bin/mklib -o radeonsi -static + +libradeonsi_a_SOURCES = $(C_SOURCES) +libradeonsi_a_LIBADD = ../radeon/libradeon.a |