diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/gallium/targets/dri-nouveau/.gitignore | 1 | ||||
| -rw-r--r-- | src/gallium/targets/dri-nouveau/Makefile | 28 | ||||
| -rw-r--r-- | src/gallium/targets/dri-nouveau/Makefile.am | 73 |
4 files changed, 75 insertions, 28 deletions
diff --git a/configure.ac b/configure.ac index 6ff17cc05e6..fe5eccf0a52 100644 --- a/configure.ac +++ b/configure.ac @@ -2055,6 +2055,7 @@ AC_CONFIG_FILES([configs/current src/gallium/state_trackers/xvmc/Makefile src/gallium/targets/Makefile src/gallium/targets/dri-i915/Makefile + src/gallium/targets/dri-nouveau/Makefile src/gallium/targets/opencl/Makefile src/gallium/winsys/Makefile src/gallium/winsys/i915/drm/Makefile diff --git a/src/gallium/targets/dri-nouveau/.gitignore b/src/gallium/targets/dri-nouveau/.gitignore new file mode 100644 index 00000000000..f3c7a7c5da6 --- /dev/null +++ b/src/gallium/targets/dri-nouveau/.gitignore @@ -0,0 +1 @@ +Makefile diff --git a/src/gallium/targets/dri-nouveau/Makefile b/src/gallium/targets/dri-nouveau/Makefile deleted file mode 100644 index 25e6aea5489..00000000000 --- a/src/gallium/targets/dri-nouveau/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -TOP = ../../../.. -include $(TOP)/configs/current - -LIBNAME = nouveau_dri.so - -PIPE_DRIVERS = \ - $(TOP)/src/gallium/state_trackers/dri/drm/libdridrm.a \ - $(TOP)/src/gallium/winsys/nouveau/drm/libnouveaudrm.a \ - $(TOP)/src/gallium/drivers/trace/libtrace.a \ - $(TOP)/src/gallium/drivers/rbug/librbug.a \ - $(TOP)/src/gallium/drivers/nv30/libnv30.a \ - $(TOP)/src/gallium/drivers/nv50/libnv50.a \ - $(TOP)/src/gallium/drivers/nvc0/libnvc0.a \ - $(TOP)/src/gallium/drivers/nouveau/libnouveau.a - -C_SOURCES = \ - target.c \ - $(COMMON_GALLIUM_SOURCES) \ - $(DRIVER_SOURCES) - -DRIVER_DEFINES = \ - -DGALLIUM_RBUG -DGALLIUM_TRACE - -include ../Makefile.dri - -GALLIUM_DRI_LIB_DEPS += $(shell $(PKG_CONFIG) libdrm_nouveau --libs) - -symlinks: diff --git a/src/gallium/targets/dri-nouveau/Makefile.am b/src/gallium/targets/dri-nouveau/Makefile.am new file mode 100644 index 00000000000..a232bb7cfa7 --- /dev/null +++ b/src/gallium/targets/dri-nouveau/Makefile.am @@ -0,0 +1,73 @@ +# 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 $(top_srcdir)/src/gallium/Automake.inc + +AM_CFLAGS = \ + $(GALLIUM_CFLAGS) \ + $(PTHREAD_CFLAGS) \ + $(LIBDRM_CFLAGS) +AM_CPPFLAGS = \ + -I$(top_srcdir)/src/gallium/drivers \ + -I$(top_srcdir)/src/gallium/winsys \ + -I$(top_srcdir)/src/mesa \ + -I$(top_srcdir)/src/mapi \ + -DGALLIUM_RBUG \ + -DGALLIUM_TRACE + +dridir = $(DRI_DRIVER_INSTALL_DIR) +dri_LTLIBRARIES = nouveau_dri.la + +nodist_EXTRA_nouveau_dri_la_SOURCES = dummy.cpp +nouveau_dri_la_SOURCES = \ + target.c \ + $(top_srcdir)/src/mesa/drivers/dri/common/utils.c \ + $(top_srcdir)/src/mesa/drivers/dri/common/dri_util.c \ + $(top_srcdir)/src/mesa/drivers/dri/common/xmlconfig.c + +nouveau_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined + +nouveau_dri_la_LIBADD = \ + $(top_builddir)/src/mesa/libmesagallium.la \ + $(top_builddir)/src/gallium/auxiliary/libgallium.la \ + $(top_builddir)/src/gallium/state_trackers/dri/drm/libdridrm.la \ + $(top_builddir)/src/gallium/winsys/nouveau/drm/libnouveaudrm.la \ + $(top_builddir)/src/gallium/drivers/trace/libtrace.la \ + $(top_builddir)/src/gallium/drivers/rbug/librbug.la \ + $(top_builddir)/src/gallium/drivers/nv30/libnv30.la \ + $(top_builddir)/src/gallium/drivers/nv50/libnv50.la \ + $(top_builddir)/src/gallium/drivers/nvc0/libnvc0.la \ + $(top_builddir)/src/gallium/drivers/nouveau/libnouveau.la \ + $(GALLIUM_DRI_LIB_DEPS) \ + $(LIBDRM_LIBS) \ + $(NOUVEAU_LIBS) + +if HAVE_MESA_LLVM +nouveau_dri_la_LDFLAGS += $(LLVM_LDFLAGS) +nouveau_dri_la_LIBADD += $(LLVM_LIBS) +endif + +# Provide compatibility with scripts for the old Mesa build system for +# a while by putting a link to the driver into /lib of the build tree. +all-local: nouveau_dri.la + $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium + ln -f .libs/nouveau_dri.so $(top_builddir)/$(LIB_DIR)/gallium/nouveau_dri.so |