diff options
| author | Eric Anholt <[email protected]> | 2012-06-12 12:10:58 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2012-06-21 10:10:46 -0700 |
| commit | 417c1a642141abac2f0a58d044893c93576bb9a3 (patch) | |
| tree | 8956af3951cd393de346ab77563741a6666c824d | |
| parent | bd18a236dead98ae34467d59f76c77d94226399e (diff) | |
automake: Move the master Mesa makefile to Makefile.old.
This will let me incrementally move stuff to automake without
converting libmesa.a all at once.
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/mesa/.gitignore | 6 | ||||
| -rw-r--r-- | src/mesa/Makefile.am | 29 | ||||
| -rw-r--r-- | src/mesa/Makefile.old (renamed from src/mesa/Makefile) | 8 |
4 files changed, 35 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index e41a73d5e53..b2f561d6bf4 100644 --- a/configure.ac +++ b/configure.ac @@ -2171,6 +2171,7 @@ AC_CONFIG_FILES([configs/current src/mapi/shared-glapi/Makefile src/mapi/glapi/tests/Makefile src/gtest/Makefile + src/mesa/Makefile src/mesa/libdricore/Makefile src/mesa/main/tests/Makefile src/mesa/x86/Makefile diff --git a/src/mesa/.gitignore b/src/mesa/.gitignore index ce83eaf47e0..5fc607b9e2f 100644 --- a/src/mesa/.gitignore +++ b/src/mesa/.gitignore @@ -1,5 +1 @@ -*/gen_matypes -*/matypes.h -depend.es* -depend.es* -objs-es* +/Makefile diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am new file mode 100644 index 00000000000..b877b5d50d1 --- /dev/null +++ b/src/mesa/Makefile.am @@ -0,0 +1,29 @@ +# 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. + +all-local: + $(MAKE) -f Makefile.old + +install-exec-local: + $(MAKE) -f Makefile.old install + +clean-local: + $(MAKE) -f Makefile.old clean diff --git a/src/mesa/Makefile b/src/mesa/Makefile.old index 6a6be276fd0..c500a8c6849 100644 --- a/src/mesa/Makefile +++ b/src/mesa/Makefile.old @@ -152,12 +152,12 @@ install: default $(DRICORE_INSTALL_TARGET) @for driver in $(DRIVER_DIRS) ; do \ case "$$driver" in \ osmesa) if [ "$(DRIVER_DIRS)" = osmesa ]; then \ - $(MAKE) install-headers install-osmesa || exit 1 ; \ + $(MAKE) -f Makefile.old install-headers install-osmesa || exit 1 ; \ else \ - $(MAKE) install-osmesa || exit 1 ; \ + $(MAKE) -f Makefile.old install-osmesa || exit 1 ; \ fi ;; \ - dri) $(MAKE) install-libgl-pc install-dri || exit 1 ;; \ - *) $(MAKE) install-libgl-pc || exit 1 ;; \ + dri) $(MAKE) -f Makefile.old install-libgl-pc install-dri || exit 1 ;; \ + *) $(MAKE) -f Makefile.old install-libgl-pc || exit 1 ;; \ esac ; \ done |