From 2d4b77c7c6c76b3c2083471a1afa4f19dfbb3d5f Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 12 Jun 2012 11:38:19 -0700 Subject: [PATCH] automake: Convert src/mesa/drivers/x11/Makefile to automake. The weird versioning of the libGL where the package version was sort of expressed as a big integer is dropped. libtool didn't like the 0 prefix, and it didn't really make sense anyway -- if you interpret it as an integer version number, old Mesa 071200 was bigger than current Mesa 08100. Instead, just bump the minor version and drop the patchlevel. --- configure.ac | 3 +- src/mesa/Makefile | 6 +-- src/mesa/drivers/x11/.gitignore | 1 + src/mesa/drivers/x11/Makefile | 81 -------------------------------- src/mesa/drivers/x11/Makefile.am | 74 +++++++++++++++++++++++++++++ 5 files changed, 78 insertions(+), 87 deletions(-) create mode 100644 src/mesa/drivers/x11/.gitignore delete mode 100644 src/mesa/drivers/x11/Makefile create mode 100644 src/mesa/drivers/x11/Makefile.am diff --git a/configure.ac b/configure.ac index 6d4d6d2c812..532feaafa8b 100644 --- a/configure.ac +++ b/configure.ac @@ -2184,7 +2184,8 @@ AC_CONFIG_FILES([configs/current src/mesa/drivers/dri/nouveau/Makefile src/mesa/drivers/dri/r200/Makefile src/mesa/drivers/dri/radeon/Makefile - src/mesa/drivers/dri/swrast/Makefile]) + src/mesa/drivers/dri/swrast/Makefile + src/mesa/drivers/x11/Makefile]) dnl Sort the dirs alphabetically GALLIUM_TARGET_DIRS=`echo $GALLIUM_TARGET_DIRS|tr " " "\n"|sort -u|tr "\n" " "` diff --git a/src/mesa/Makefile b/src/mesa/Makefile index 7783ebec85a..b17696df4d2 100644 --- a/src/mesa/Makefile +++ b/src/mesa/Makefile @@ -157,7 +157,7 @@ install: default $(DRICORE_INSTALL_TARGET) $(MAKE) install-osmesa || exit 1 ; \ fi ;; \ dri) $(MAKE) install-libgl-pc install-dri || exit 1 ;; \ - *) $(MAKE) install-libgl-pc install-libgl || exit 1 ;; \ + *) $(MAKE) install-libgl-pc || exit 1 ;; \ esac ; \ done @@ -193,10 +193,6 @@ install-headers: $(INSTALL) -m 644 $(TOP)/include/GL/*.h \ $(DESTDIR)$(INSTALL_INC_DIR)/GL -install-libgl: default - $(MINSTALL) $(TOP)/$(LIB_DIR)/$(GL_LIB_GLOB) \ - $(DESTDIR)$(INSTALL_LIB_DIR) - install-libgl-pc: gl.pc install-headers $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR) $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig diff --git a/src/mesa/drivers/x11/.gitignore b/src/mesa/drivers/x11/.gitignore new file mode 100644 index 00000000000..5fc607b9e2f --- /dev/null +++ b/src/mesa/drivers/x11/.gitignore @@ -0,0 +1 @@ +/Makefile diff --git a/src/mesa/drivers/x11/Makefile b/src/mesa/drivers/x11/Makefile deleted file mode 100644 index 437c4f31820..00000000000 --- a/src/mesa/drivers/x11/Makefile +++ /dev/null @@ -1,81 +0,0 @@ -# src/mesa/drivers/x11/Makefile for libGL.so - -# This builds "stand-alone" Mesa, a version of libGL that does not need the -# GLX extension. All rendering is converted to Xlib calls. No hardware -# acceleration. - - -TOP = ../../../.. - -include $(TOP)/configs/current - - -GL_MAJOR = 1 -GL_MINOR = 5 -GL_TINY = 0$(MESA_MAJOR)$(MESA_MINOR)0$(MESA_TINY) - - -HEADERS = \ - glxapi.h \ - glxheader.h \ - xfonts.h \ - xmesaP.h \ - xm_image.h - -SOURCES = \ - fakeglx.c \ - glxapi.c \ - xfonts.c \ - xm_api.c \ - xm_buffer.c \ - xm_dd.c \ - xm_line.c \ - xm_tri.c - -OBJECTS = $(SOURCES:.c=.o) - -INCLUDE_DIRS = \ - -I$(TOP)/include \ - -I$(TOP)/src/mapi \ - -I$(TOP)/src/mesa \ - -I$(TOP)/src/mesa/main \ - $(X11_INCLUDES) - -CORE_MESA = $(TOP)/src/mesa/libmesa.a $(TOP)/src/mapi/glapi/libglapi.a - -ifeq ($(SHARED_GLAPI),1) -GL_LIB_DEPS := -L$(TOP)/$(LIB_DIR) -l$(GLAPI_LIB) $(GL_LIB_DEPS) -endif - - -.c.o: - $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@ - - -default: $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) - - -$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) $(CORE_MESA) - @ $(MKLIB) -o $(GL_LIB) -linker '$(CXX)' -ldflags '$(LDFLAGS)' \ - -major $(GL_MAJOR) -minor $(GL_MINOR) -patch $(GL_TINY) \ - -install $(TOP)/$(LIB_DIR) \ - -cplusplus $(MKLIB_OPTIONS) \ - -id $(INSTALL_LIB_DIR)/lib$(GL_LIB).$(GL_MAJOR).dylib \ - $(GL_LIB_DEPS) $(OBJECTS) $(CORE_MESA) - - - -clean: - -rm -f *.o *~ - -rm -f depend depend.bak - - - -depend: $(SOURCES) $(HEADERS) - @ echo "running $(MKDEP)" - @ touch depend - @$(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDE_DIRS) $(SOURCES) $(HEADERS) \ - > /dev/null 2>/dev/null - - --include depend diff --git a/src/mesa/drivers/x11/Makefile.am b/src/mesa/drivers/x11/Makefile.am new file mode 100644 index 00000000000..cced2388491 --- /dev/null +++ b/src/mesa/drivers/x11/Makefile.am @@ -0,0 +1,74 @@ +# 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. + +# This builds "stand-alone" Mesa, a version of libGL that does not need the +# GLX extension. All rendering is converted to Xlib calls. No hardware +# acceleration. + +AM_CPPFLAGS = \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/mapi \ + -I$(top_srcdir)/src/mesa \ + -I$(top_srcdir)/src/mesa/main \ + $(X11_INCLUDES) \ + $(API_DEFINES) \ + $(DEFINES) + +if HAVE_X11_DRIVER +lib_LTLIBRARIES = libGL.la +endif + +libGL_la_SOURCES = \ + glxapi.h \ + glxheader.h \ + xfonts.h \ + xmesaP.h \ + xm_image.h \ + fakeglx.c \ + glxapi.c \ + xfonts.c \ + xm_api.c \ + xm_buffer.c \ + xm_dd.c \ + xm_line.c \ + xm_tri.c + +GL_MAJOR = 1 +GL_MINOR = 6 +GL_PATCH = 0 + +libGL_la_LIBADD = \ + $(top_builddir)/src/mesa/libmesa.a \ + $(top_builddir)/src/mapi/glapi/libglapi.a +libGL_la_LDFLAGS = \ + -version-number $(GL_MAJOR):$(GL_MINOR):$(GL_PATCH) \ + $(GL_LIB_DEPS) + +if HAVE_SHARED_GLAPI +libGL_la_LDFLAGS += -L$(top_builddir)/$(LIB_DIR) -l$(GLAPI_LIB) +endif + +# Provide compatibility with scripts for the old Mesa build system for +# a while by putting a link to the driver into /lib of the build tree. +all-local: libGL.la + $(MKDIR_P) $(top_builddir)/$(LIB_DIR); + ln -f .libs/libGL.so.$(GL_MAJOR).$(GL_MINOR).$(GL_PATCH) $(top_builddir)/$(LIB_DIR)/libGL.so.1 + ln -sf libGL.so.1 $(top_builddir)/$(LIB_DIR)/libGL.so