Move OBJ argument
This commit is contained in:
parent
595f2f88dd
commit
1381e22db1
16
Makefile
16
Makefile
@ -15,9 +15,9 @@ ifeq ($(uname_S),SunOS)
|
|||||||
DYLIBSUFFIX=so
|
DYLIBSUFFIX=so
|
||||||
STLIBSUFFIX=a
|
STLIBSUFFIX=a
|
||||||
DYLIBNAME?=$(LIBNAME).$(DYLIBSUFFIX)
|
DYLIBNAME?=$(LIBNAME).$(DYLIBSUFFIX)
|
||||||
DYLIB_MAKE_CMD?=$(CC) -G -o $(DYLIBNAME) $(OBJ)
|
DYLIB_MAKE_CMD?=$(CC) -G -o $(DYLIBNAME)
|
||||||
STLIBNAME?=$(LIBNAME).$(STLIBSUFFIX)
|
STLIBNAME?=$(LIBNAME).$(STLIBSUFFIX)
|
||||||
STLIB_MAKE_CMD?=ar rcs $(STLIBNAME) $(OBJ)
|
STLIB_MAKE_CMD?=ar rcs $(STLIBNAME)
|
||||||
else
|
else
|
||||||
ifeq ($(uname_S),Darwin)
|
ifeq ($(uname_S),Darwin)
|
||||||
CFLAGS?=$(OPTIMIZATION) -fPIC -Wall -W -Wstrict-prototypes -Wwrite-strings $(ARCH) $(PROF)
|
CFLAGS?=$(OPTIMIZATION) -fPIC -Wall -W -Wstrict-prototypes -Wwrite-strings $(ARCH) $(PROF)
|
||||||
@ -27,9 +27,9 @@ ifeq ($(uname_S),Darwin)
|
|||||||
DYLIBSUFFIX=dylib
|
DYLIBSUFFIX=dylib
|
||||||
STLIBSUFFIX=a
|
STLIBSUFFIX=a
|
||||||
DYLIBNAME?=$(LIBNAME).$(DYLIBSUFFIX)
|
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)
|
STLIBNAME?=$(LIBNAME).$(STLIBSUFFIX)
|
||||||
STLIB_MAKE_CMD?=libtool -static -o $(STLIBNAME) - $(OBJ)
|
STLIB_MAKE_CMD?=libtool -static -o $(STLIBNAME) -
|
||||||
else
|
else
|
||||||
CFLAGS?=$(OPTIMIZATION) -fPIC -Wall -W -Wstrict-prototypes -Wwrite-strings $(ARCH) $(PROF)
|
CFLAGS?=$(OPTIMIZATION) -fPIC -Wall -W -Wstrict-prototypes -Wwrite-strings $(ARCH) $(PROF)
|
||||||
CCLINK?=-lm -pthread
|
CCLINK?=-lm -pthread
|
||||||
@ -37,9 +37,9 @@ else
|
|||||||
DYLIBSUFFIX=so
|
DYLIBSUFFIX=so
|
||||||
STLIBSUFFIX=a
|
STLIBSUFFIX=a
|
||||||
DYLIBNAME?=$(LIBNAME).$(DYLIBSUFFIX)
|
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)
|
STLIBNAME?=$(LIBNAME).$(STLIBSUFFIX)
|
||||||
STLIB_MAKE_CMD?=ar rcs $(STLIBNAME) $(OBJ)
|
STLIB_MAKE_CMD?=ar rcs $(STLIBNAME)
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@ -64,10 +64,10 @@ sds.o: sds.c sds.h
|
|||||||
test.o: test.c hiredis.h
|
test.o: test.c hiredis.h
|
||||||
|
|
||||||
$(DYLIBNAME): $(OBJ)
|
$(DYLIBNAME): $(OBJ)
|
||||||
$(DYLIB_MAKE_CMD)
|
$(DYLIB_MAKE_CMD) $(OBJ)
|
||||||
|
|
||||||
$(STLIBNAME): $(OBJ)
|
$(STLIBNAME): $(OBJ)
|
||||||
$(STLIB_MAKE_CMD)
|
$(STLIB_MAKE_CMD) $(OBJ)
|
||||||
|
|
||||||
dynamic: $(DYLIBNAME)
|
dynamic: $(DYLIBNAME)
|
||||||
static: $(STLIBNAME)
|
static: $(STLIBNAME)
|
||||||
|
Loading…
Reference in New Issue
Block a user