Commit aee8b6ff authored by BastiaanOlij's avatar BastiaanOlij
Browse files

Renamed ARFLAGS.STATIC to simply ARFLAGS

parent 69cbc353
...@@ -65,7 +65,7 @@ DIST_DIR := $(shell mktemp -d /tmp/glew.XXXXXX)/$(DIST_NAME) ...@@ -65,7 +65,7 @@ DIST_DIR := $(shell mktemp -d /tmp/glew.XXXXXX)/$(DIST_NAME)
# - use LN= on gmake command-line # - use LN= on gmake command-line
AR ?= ar AR ?= ar
ARFLAGS.STATIC ?= cr ARFLAGS ?= cr
INSTALL ?= install INSTALL ?= install
STRIP ?= strip STRIP ?= strip
RM ?= rm -f RM ?= rm -f
...@@ -105,7 +105,7 @@ lib: ...@@ -105,7 +105,7 @@ lib:
mkdir lib mkdir lib
lib/$(LIB.STATIC): $(LIB.OBJS) lib/$(LIB.STATIC): $(LIB.OBJS)
$(AR) $(ARFLAGS.STATIC) $@ $^ $(AR) $(ARFLAGS) $@ $^
ifneq ($(STRIP),) ifneq ($(STRIP),)
$(STRIP) -x $@ $(STRIP) -x $@
endif endif
...@@ -149,7 +149,7 @@ glew.pc: glew.pc.in ...@@ -149,7 +149,7 @@ glew.pc: glew.pc.in
glew.lib.mx: lib lib/$(LIB.SHARED.MX) lib/$(LIB.STATIC.MX) glewmx.pc glew.lib.mx: lib lib/$(LIB.SHARED.MX) lib/$(LIB.STATIC.MX) glewmx.pc
lib/$(LIB.STATIC.MX): $(LIB.OBJS.MX) lib/$(LIB.STATIC.MX): $(LIB.OBJS.MX)
$(AR) $(ARFLAGS.STATIC) $@ $^ $(AR) $(ARFLAGS) $@ $^
lib/$(LIB.SHARED.MX): $(LIB.SOBJS.MX) lib/$(LIB.SHARED.MX): $(LIB.SOBJS.MX)
$(LD) $(LDFLAGS.SO.MX) -o $@ $^ $(LIB.LDFLAGS) $(LIB.LIBS) $(LD) $(LDFLAGS.SO.MX) -o $@ $^ $(LIB.LDFLAGS) $(LIB.LIBS)
......
...@@ -2,6 +2,7 @@ NAME = $(GLEW_NAME) ...@@ -2,6 +2,7 @@ NAME = $(GLEW_NAME)
CC = cc CC = cc
LD = cc LD = cc
AR = LIBTOOL AR = LIBTOOL
ARFLAGS = -static -o
STRIP = STRIP =
CFLAGS.EXTRA = -dynamic -fno-common CFLAGS.EXTRA = -dynamic -fno-common
#CFLAGS.EXTRA += -no-cpp-precomp #CFLAGS.EXTRA += -no-cpp-precomp
...@@ -13,7 +14,6 @@ LDFLAGS.GL = -L/usr/X11R6/lib -lGL -lX11 ...@@ -13,7 +14,6 @@ LDFLAGS.GL = -L/usr/X11R6/lib -lGL -lX11
else else
LDFLAGS.GL = -framework AGL -framework OpenGL LDFLAGS.GL = -framework AGL -framework OpenGL
endif endif
ARFLAGS.STATIC = -static -o
LDFLAGS.DYNAMIC = LDFLAGS.DYNAMIC =
WARN = -Wall -W WARN = -Wall -W
POPT = -O2 POPT = -O2
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment