diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/.gitignore | 5 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/Makefile.am | 59 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/Makefile.sources (renamed from src/mesa/drivers/dri/nouveau/Makefile) | 25 |
3 files changed, 67 insertions, 22 deletions
diff --git a/src/mesa/drivers/dri/nouveau/.gitignore b/src/mesa/drivers/dri/nouveau/.gitignore new file mode 100644 index 00000000000..10917249417 --- /dev/null +++ b/src/mesa/drivers/dri/nouveau/.gitignore @@ -0,0 +1,5 @@ +.deps +.libs +Makefile +Makefile.in +nouveau_vieux_dri.la diff --git a/src/mesa/drivers/dri/nouveau/Makefile.am b/src/mesa/drivers/dri/nouveau/Makefile.am new file mode 100644 index 00000000000..77880fd5f83 --- /dev/null +++ b/src/mesa/drivers/dri/nouveau/Makefile.am @@ -0,0 +1,59 @@ + + +# Copyright © 2012 Matt Turner <[email protected]> +# +# 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 + +# Hack to make some of the non-automake variables work. +TOP=$(top_builddir) + +AM_CFLAGS = \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/ \ + -I$(top_srcdir)/src/mapi \ + -I$(top_srcdir)/src/mesa/ \ + -I$(top_srcdir)/src/mesa/drivers/dri/common \ + $(DEFINES) \ + $(ASM_FLAGS) \ + $(API_DEFINES) \ + $(NOUVEAU_CFLAGS) + +dridir = $(DRI_DRIVER_INSTALL_DIR) + +if HAVE_NOUVEAU_DRI +dri_LTLIBRARIES = nouveau_vieux_dri.la +endif + +nouveau_vieux_dri_la_SOURCES = \ + $(NOUVEAU_C_FILES) + +nouveau_vieux_dri_la_LDFLAGS = -module -avoid-version -shared +nouveau_vieux_dri_la_LIBADD = \ + $(DRI_LIB_DEPS) \ + $(DRICORE_LIB_DEPS) \ + $(NOUVEAU_LIBS) + +# 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_vieux_dri.la + $(MKDIR_P) $(top_builddir)/$(LIB_DIR); + ln -f .libs/nouveau_vieux_dri.so $(top_builddir)/$(LIB_DIR)/nouveau_vieux_dri.so; diff --git a/src/mesa/drivers/dri/nouveau/Makefile b/src/mesa/drivers/dri/nouveau/Makefile.sources index e485a98761f..aa7f79f7eb4 100644 --- a/src/mesa/drivers/dri/nouveau/Makefile +++ b/src/mesa/drivers/dri/nouveau/Makefile.sources @@ -1,13 +1,4 @@ -# src/mesa/drivers/dri/nouveau/Makefile - -TOP = ../../../../.. -include $(TOP)/configs/current - -LIBNAME = nouveau_vieux_dri.so - -include ../Makefile.defines - -DRIVER_SOURCES = \ +NOUVEAU_DRIVER_FILES = \ nouveau_screen.c \ nouveau_context.c \ nouveau_fbo.c \ @@ -44,15 +35,5 @@ DRIVER_SOURCES = \ nv20_state_frag.c \ nv20_state_tnl.c -C_SOURCES = \ - $(COMMON_SOURCES) \ - $(DRIVER_SOURCES) - -ASM_SOURCES = - -INCLUDES += $(NOUVEAU_CFLAGS) -DRI_LIB_DEPS += $(NOUVEAU_LIBS) - -include ../Makefile.targets - -symlinks: +NOUVEAU_C_FILES = \ + $(NOUVEAU_DRIVER_FILES) |