From aee8b6ff6945074e5b2f3b495332cd627c3ed2c3 Mon Sep 17 00:00:00 2001 From: BastiaanOlij Date: Thu, 26 Mar 2015 13:24:03 +1100 Subject: [PATCH] Renamed ARFLAGS.STATIC to simply ARFLAGS --- Makefile | 6 +++--- config/Makefile.darwin-universal | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 3947b29..45bc9a4 100644 --- a/Makefile +++ b/Makefile @@ -65,7 +65,7 @@ DIST_DIR := $(shell mktemp -d /tmp/glew.XXXXXX)/$(DIST_NAME) # - use LN= on gmake command-line AR ?= ar -ARFLAGS.STATIC ?= cr +ARFLAGS ?= cr INSTALL ?= install STRIP ?= strip RM ?= rm -f @@ -105,7 +105,7 @@ lib: mkdir lib lib/$(LIB.STATIC): $(LIB.OBJS) - $(AR) $(ARFLAGS.STATIC) $@ $^ + $(AR) $(ARFLAGS) $@ $^ ifneq ($(STRIP),) $(STRIP) -x $@ endif @@ -149,7 +149,7 @@ glew.pc: glew.pc.in glew.lib.mx: lib lib/$(LIB.SHARED.MX) lib/$(LIB.STATIC.MX) glewmx.pc lib/$(LIB.STATIC.MX): $(LIB.OBJS.MX) - $(AR) $(ARFLAGS.STATIC) $@ $^ + $(AR) $(ARFLAGS) $@ $^ lib/$(LIB.SHARED.MX): $(LIB.SOBJS.MX) $(LD) $(LDFLAGS.SO.MX) -o $@ $^ $(LIB.LDFLAGS) $(LIB.LIBS) diff --git a/config/Makefile.darwin-universal b/config/Makefile.darwin-universal index 17e7e4a..b2ba4af 100644 --- a/config/Makefile.darwin-universal +++ b/config/Makefile.darwin-universal @@ -2,6 +2,7 @@ NAME = $(GLEW_NAME) CC = cc LD = cc AR = LIBTOOL +ARFLAGS = -static -o STRIP = CFLAGS.EXTRA = -dynamic -fno-common #CFLAGS.EXTRA += -no-cpp-precomp @@ -13,7 +14,6 @@ LDFLAGS.GL = -L/usr/X11R6/lib -lGL -lX11 else LDFLAGS.GL = -framework AGL -framework OpenGL endif -ARFLAGS.STATIC = -static -o LDFLAGS.DYNAMIC = WARN = -Wall -W POPT = -O2