From bba9c28215f96a6570c290906b64eea83383beb8 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Sat, 8 Mar 2014 19:48:04 +0000 Subject: configure: use LIB_EXT rather than hardcoded .so Some platforms different library extension - dll, dylib, a. Honor that when we are creating the required links. Rename LIB_EXTENSION to LIB_EXT while we're here. With libglapi linking aside, building classic drivers on non-linux platforms should be possible now. v2: Resolve conflicts. Signed-off-by: Emil Velikov Reviewed-by: Jon TURNEY --- src/glx/apple/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/glx/apple') diff --git a/src/glx/apple/Makefile b/src/glx/apple/Makefile index 39cfec3ad6b..91a72189253 100644 --- a/src/glx/apple/Makefile +++ b/src/glx/apple/Makefile @@ -23,7 +23,7 @@ RM=rm #The directory with the final binaries. BUILD_DIR=builds -default: $(TOP)/$(LIB_DIR)/lib$(GL_LIB).$(LIB_EXTENSION) +default: $(TOP)/$(LIB_DIR)/lib$(GL_LIB).$(LIB_EXT) SOURCES = \ apple_cgl.c \ @@ -88,10 +88,10 @@ INCLUDES = -I. -Iinclude -I..\ ##### TARGETS ##### -default: depend $(TOP)/$(LIB_DIR)/lib$(GL_LIB).$(LIB_EXTENSION) +default: depend $(TOP)/$(LIB_DIR)/lib$(GL_LIB).$(LIB_EXT) # Make libGL -$(TOP)/$(LIB_DIR)/lib$(GL_LIB).$(LIB_EXTENSION): $(OBJECTS) $(GLAPI_LIB) Makefile +$(TOP)/$(LIB_DIR)/lib$(GL_LIB).$(LIB_EXT): $(OBJECTS) $(GLAPI_LIB) Makefile $(MKLIB) -o $(GL_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \ -major 1 -minor 2 $(MKLIB_OPTIONS) \ -install $(TOP)/$(LIB_DIR) -id $(INSTALL_LIB_DIR)/lib$(GL_LIB).1.dylib \ @@ -114,7 +114,7 @@ install_headers: include/GL/gl.h $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/include/GL $(INSTALL) -m 644 include/GL/gl.h $(DESTDIR)$(INSTALL_DIR)/include/GL -install_libraries: $(TOP)/$(LIB_DIR)/lib$(GL_LIB).$(LIB_EXTENSION) +install_libraries: $(TOP)/$(LIB_DIR)/lib$(GL_LIB).$(LIB_EXT) $(MAKE) -C $(TOP)/src/mesa install-libgl install: install_libraries -- cgit v1.2.3