summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPieter Noordhuis <pcnoordhuis@gmail.com>2011-04-22 12:01:46 +0200
committerPieter Noordhuis <pcnoordhuis@gmail.com>2011-04-22 12:01:46 +0200
commit1381e22db1c1acd6f4b308570ce594eb59f7df76 (patch)
tree7f47ce386b67c82740214d30f519f552bacea7c5
parent595f2f88ddbaf35194e38aac21467946ea41eeb8 (diff)
Move OBJ argument
-rw-r--r--Makefile16
1 files changed, 8 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 11310d4..6c52299 100644
--- a/Makefile
+++ b/Makefile
@@ -15,9 +15,9 @@ ifeq ($(uname_S),SunOS)
DYLIBSUFFIX=so
STLIBSUFFIX=a
DYLIBNAME?=$(LIBNAME).$(DYLIBSUFFIX)
- DYLIB_MAKE_CMD?=$(CC) -G -o $(DYLIBNAME) $(OBJ)
+ DYLIB_MAKE_CMD?=$(CC) -G -o $(DYLIBNAME)
STLIBNAME?=$(LIBNAME).$(STLIBSUFFIX)
- STLIB_MAKE_CMD?=ar rcs $(STLIBNAME) $(OBJ)
+ STLIB_MAKE_CMD?=ar rcs $(STLIBNAME)
else
ifeq ($(uname_S),Darwin)
CFLAGS?=$(OPTIMIZATION) -fPIC -Wall -W -Wstrict-prototypes -Wwrite-strings $(ARCH) $(PROF)
@@ -27,9 +27,9 @@ ifeq ($(uname_S),Darwin)
DYLIBSUFFIX=dylib
STLIBSUFFIX=a
DYLIBNAME?=$(LIBNAME).$(DYLIBSUFFIX)
- DYLIB_MAKE_CMD?=libtool -dynamic -o $(DYLIBNAME) -lm $(DEBUG) - $(OBJ)
+ DYLIB_MAKE_CMD?=libtool -dynamic -o $(DYLIBNAME) -lm $(DEBUG) -
STLIBNAME?=$(LIBNAME).$(STLIBSUFFIX)
- STLIB_MAKE_CMD?=libtool -static -o $(STLIBNAME) - $(OBJ)
+ STLIB_MAKE_CMD?=libtool -static -o $(STLIBNAME) -
else
CFLAGS?=$(OPTIMIZATION) -fPIC -Wall -W -Wstrict-prototypes -Wwrite-strings $(ARCH) $(PROF)
CCLINK?=-lm -pthread
@@ -37,9 +37,9 @@ else
DYLIBSUFFIX=so
STLIBSUFFIX=a
DYLIBNAME?=$(LIBNAME).$(DYLIBSUFFIX)
- DYLIB_MAKE_CMD?=gcc -shared -Wl,-soname,$(DYLIBNAME) -o $(DYLIBNAME) $(OBJ)
+ DYLIB_MAKE_CMD?=gcc -shared -Wl,-soname,$(DYLIBNAME) -o $(DYLIBNAME)
STLIBNAME?=$(LIBNAME).$(STLIBSUFFIX)
- STLIB_MAKE_CMD?=ar rcs $(STLIBNAME) $(OBJ)
+ STLIB_MAKE_CMD?=ar rcs $(STLIBNAME)
endif
endif
@@ -64,10 +64,10 @@ sds.o: sds.c sds.h
test.o: test.c hiredis.h
$(DYLIBNAME): $(OBJ)
- $(DYLIB_MAKE_CMD)
+ $(DYLIB_MAKE_CMD) $(OBJ)
$(STLIBNAME): $(OBJ)
- $(STLIB_MAKE_CMD)
+ $(STLIB_MAKE_CMD) $(OBJ)
dynamic: $(DYLIBNAME)
static: $(STLIBNAME)