diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/gallium/.gitignore | 1 | ||||
| -rw-r--r-- | src/gallium/Makefile | 12 | ||||
| -rw-r--r-- | src/gallium/Makefile.am | 22 |
4 files changed, 24 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index 7f2b694fc90..6d4d6d2c812 100644 --- a/configure.ac +++ b/configure.ac @@ -2145,6 +2145,7 @@ dnl Substitute the config AC_CONFIG_FILES([configs/current Makefile src/Makefile + src/gallium/Makefile src/gallium/auxiliary/pipe-loader/Makefile src/gallium/state_trackers/clover/Makefile src/gallium/drivers/Makefile diff --git a/src/gallium/.gitignore b/src/gallium/.gitignore new file mode 100644 index 00000000000..5fc607b9e2f --- /dev/null +++ b/src/gallium/.gitignore @@ -0,0 +1 @@ +/Makefile diff --git a/src/gallium/Makefile b/src/gallium/Makefile deleted file mode 100644 index 79ca767f7e6..00000000000 --- a/src/gallium/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# src/gallium/Makefile -TOP = ../.. -include $(TOP)/configs/current - -SUBDIRS = $(GALLIUM_DIRS) - -default install clean: - @for dir in $(SUBDIRS) ; do \ - if [ -d $$dir ] ; then \ - (cd $$dir && $(MAKE) $@) || exit 1; \ - fi \ - done diff --git a/src/gallium/Makefile.am b/src/gallium/Makefile.am new file mode 100644 index 00000000000..e7cff892058 --- /dev/null +++ b/src/gallium/Makefile.am @@ -0,0 +1,22 @@ +# 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 = $(GALLIUM_DIRS) |