summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMatt Turner <[email protected]>2013-01-19 00:09:36 -0800
committerMatt Turner <[email protected]>2013-04-15 12:04:26 -0700
commit70531b4a25111821935c33962abfb5b526c5a817 (patch)
tree00dccee7b3eebed8c500db9892adba5b759763d4 /src
parenta9676ae44ae96a9e222ed5c4fc798315d5a0f445 (diff)
build: Remove GALLIUM_DIRS
It's always constant anyway. Tested-by: Emil Velikov <[email protected]> Reviewed-and-Tested-by: Andreas Boll <[email protected]> Reviewed-by: Jordan Justen <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am4
-rw-r--r--src/gallium/Makefile.am22
2 files changed, 3 insertions, 23 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index b6449b967b3..b3dc44d6fd6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -39,7 +39,9 @@ endif
if HAVE_GALLIUM
SUBDIRS += \
- gallium \
+ gallium/auxiliary \
+ gallium/drivers \
+ gallium/state_trackers \
gallium/winsys \
gallium/targets
diff --git a/src/gallium/Makefile.am b/src/gallium/Makefile.am
deleted file mode 100644
index e7cff892058..00000000000
--- a/src/gallium/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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)