diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/gallium/state_trackers/dri/.gitignore | 1 | ||||
| -rw-r--r-- | src/gallium/state_trackers/dri/Makefile | 12 | ||||
| -rw-r--r-- | src/gallium/state_trackers/dri/Makefile.am | 23 |
4 files changed, 25 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index 3903fd4b1fa..c15367e762e 100644 --- a/configure.ac +++ b/configure.ac @@ -2024,6 +2024,7 @@ AC_CONFIG_FILES([configs/current src/gallium/drivers/svga/Makefile src/gallium/drivers/trace/Makefile src/gallium/state_trackers/clover/Makefile + src/gallium/state_trackers/dri/Makefile src/gallium/targets/Makefile src/gallium/targets/opencl/Makefile src/gallium/winsys/Makefile diff --git a/src/gallium/state_trackers/dri/.gitignore b/src/gallium/state_trackers/dri/.gitignore new file mode 100644 index 00000000000..f3c7a7c5da6 --- /dev/null +++ b/src/gallium/state_trackers/dri/.gitignore @@ -0,0 +1 @@ +Makefile diff --git a/src/gallium/state_trackers/dri/Makefile b/src/gallium/state_trackers/dri/Makefile deleted file mode 100644 index 72e70577b3d..00000000000 --- a/src/gallium/state_trackers/dri/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# src/gallium/state_trackers/dri/Makefile -TOP = ../../../.. -include $(TOP)/configs/current - -SUBDIRS = drm sw - -default install clean: - @for dir in $(SUBDIRS) ; do \ - if [ -d $$dir ] ; then \ - (cd $$dir && $(MAKE) $@) || exit 1; \ - fi \ - done diff --git a/src/gallium/state_trackers/dri/Makefile.am b/src/gallium/state_trackers/dri/Makefile.am new file mode 100644 index 00000000000..485627cc5ea --- /dev/null +++ b/src/gallium/state_trackers/dri/Makefile.am @@ -0,0 +1,23 @@ +# 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. + +SUBDIRS = drm sw |