[Mesa-dev] [PATCH 1/6] glx: Convert to automake.

[Eric Anholt]

On Mon, 19 Mar 2012 18:32:57 -0400, Matt Turner <mattst88 at gmail.com> wrote:
> On Wed, Feb 8, 2012 at 9:09 PM, Eric Anholt <eric at anholt.net> wrote:

> This piece looks odd. If we've got shared glapi, we're linking in both
> shared and static glapi. I tried removing $(GLAPI_LIB) from this, and
> it did shrink libGL from 2.3 -> 1.8 MB, but it caused undefined
> references to _glapi_Dispatch. Not sure if this is related to the SC2
> problem, but maybe so.

I agree that it looks odd, but it looks to me like what was there
before:

-ifeq ($(SHARED_GLAPI),1)
-GL_LIB_DEPS := -L$(TOP)/$(LIB_DIR) -l$(GLAPI_LIB) $(GL_LIB_DEPS)
-EXTRA_DEFINES += -DGLX_SHARED_GLAPI
-endif
-
-# override GLAPI_LIB
-GLAPI_LIB = $(TOP)/src/mapi/glapi/libglapi.a

-# Make libGL
-$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): libglx.a $(OBJECTS) $(GLAPI_LIB) Makefile
-       $(MKLIB) -o $(GL_LIB) -linker '$(CXX)' -ldflags '$(LDFLAGS)' \
-               -major 1 -minor 2 \
-               -cplusplus $(MKLIB_OPTIONS) \
-               -install $(TOP)/$(LIB_DIR) -id $(INSTALL_LIB_DIR)/lib$(GL_LIB).1.dylib \
-               $(GL_LIB_DEPS) $(OBJECTS) $(GLAPI_LIB)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20120320/3af1d360/attachment.pgp>