summaryrefslogtreecommitdiffstats
path: root/src/glx/apple/Makefile
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2014-03-02 14:30:37 +0000
committerEmil Velikov <[email protected]>2014-03-11 12:50:43 +0000
commit3c5599b276902fce52752e0f20a0dc52b7ec2aff (patch)
tree70f57656dbb22290fd4954c3bcca530904ff714d /src/glx/apple/Makefile
parent49d7bcea8203a5e5398f3a10b3ac1e63d07128a0 (diff)
configure: remove old makefile variables
All the variables were used before the automake conversion and do not make sense (nor are used) currently. Replace GL_LIB_NAME with lib$(GL_LIB).$(LIB_EXTENSION) for apple-glx. The build has been broken for ages, but this will ease the recovery process as it happens. Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Jon TURNEY <[email protected]>
Diffstat (limited to 'src/glx/apple/Makefile')
-rw-r--r--src/glx/apple/Makefile9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/glx/apple/Makefile b/src/glx/apple/Makefile
index 7dab068b252..39cfec3ad6b 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)/$(GL_LIB_NAME)
+default: $(TOP)/$(LIB_DIR)/lib$(GL_LIB).$(LIB_EXTENSION)
SOURCES = \
apple_cgl.c \
@@ -88,10 +88,10 @@ INCLUDES = -I. -Iinclude -I..\
##### TARGETS #####
-default: depend $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
+default: depend $(TOP)/$(LIB_DIR)/lib$(GL_LIB).$(LIB_EXTENSION)
# Make libGL
-$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) $(GLAPI_LIB) Makefile
+$(TOP)/$(LIB_DIR)/lib$(GL_LIB).$(LIB_EXTENSION): $(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)/$(GL_LIB_NAME)
+install_libraries: $(TOP)/$(LIB_DIR)/lib$(GL_LIB).$(LIB_EXTENSION)
$(MAKE) -C $(TOP)/src/mesa install-libgl
install: install_libraries
@@ -125,7 +125,6 @@ clean:
-rm -f *.c~ *.h~
-rm -f *.dylib
-rm -f include/GL/gl.h
- -rm -f $(TOP)/$(LIB_DIR)/$(GL_LIB_GLOB)
-rm -f *.o *~
-rm -f depend depend.bak