aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/gallium
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-06-22 08:30:33 +0200
committermarha <marha@users.sourceforge.net>2012-06-22 08:30:33 +0200
commite1a407256a5c1571d8f4871fd981a51cfbd46e37 (patch)
tree9f8327deb05890b77137d57c0416d392beaa7fac /mesalib/src/gallium
parentda6ea6d64418710cbf7e0639dfefd2d856d53f1a (diff)
downloadvcxsrv-e1a407256a5c1571d8f4871fd981a51cfbd46e37.tar.gz
vcxsrv-e1a407256a5c1571d8f4871fd981a51cfbd46e37.tar.bz2
vcxsrv-e1a407256a5c1571d8f4871fd981a51cfbd46e37.zip
mesa xserver libxcb fontconfig
Diffstat (limited to 'mesalib/src/gallium')
-rw-r--r--mesalib/src/gallium/.gitignore1
-rw-r--r--mesalib/src/gallium/Makefile12
-rw-r--r--mesalib/src/gallium/Makefile.am22
3 files changed, 23 insertions, 12 deletions
diff --git a/mesalib/src/gallium/.gitignore b/mesalib/src/gallium/.gitignore
new file mode 100644
index 000000000..5fc607b9e
--- /dev/null
+++ b/mesalib/src/gallium/.gitignore
@@ -0,0 +1 @@
+/Makefile
diff --git a/mesalib/src/gallium/Makefile b/mesalib/src/gallium/Makefile
deleted file mode 100644
index 79ca767f7..000000000
--- a/mesalib/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/mesalib/src/gallium/Makefile.am b/mesalib/src/gallium/Makefile.am
new file mode 100644
index 000000000..e7cff8920
--- /dev/null
+++ b/mesalib/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)