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.
This commit is contained in:
Eric Anholt 2012-06-12 12:10:58 -07:00
parent bd18a236de
commit 417c1a6421
4 changed files with 35 additions and 9 deletions

View file

@ -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

6
src/mesa/.gitignore vendored
View file

@ -1,5 +1 @@
*/gen_matypes
*/matypes.h
depend.es*
depend.es*
objs-es*
/Makefile

29
src/mesa/Makefile.am Normal file
View file

@ -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

View file

@ -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