From 1381e22db1c1acd6f4b308570ce594eb59f7df76 Mon Sep 17 00:00:00 2001 From: Pieter Noordhuis Date: Fri, 22 Apr 2011 12:01:46 +0200 Subject: Move OBJ argument --- Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'Makefile') 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) -- cgit v1.2.3