70 lines
2.3 KiB
Plaintext
70 lines
2.3 KiB
Plaintext
$NetBSD: patch-Makefile,v 1.1 2014/04/02 17:25:44 wiedi Exp $
|
|
add DESTDIR and use libtool
|
|
|
|
--- Makefile.orig 2012-08-28 06:55:52.000000000 +0000
|
|
+++ Makefile
|
|
@@ -27,6 +27,8 @@ DYLIB_MAKE_CMD=$(CC) -shared -Wl,-soname
|
|
STLIBNAME=$(LIBNAME).$(STLIBSUFFIX)
|
|
STLIB_MAKE_CMD=ar rcs $(STLIBNAME)
|
|
|
|
+LANAME=$(LIBNAME).la
|
|
+
|
|
# Platform-specific overrides
|
|
uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
|
|
ifeq ($(uname_S),SunOS)
|
|
@@ -41,7 +43,7 @@ ifeq ($(uname_S),Darwin)
|
|
DYLIB_MAKE_CMD=$(CC) -shared -Wl,-install_name,$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(LDFLAGS)
|
|
endif
|
|
|
|
-all: $(DYLIBNAME) $(BINS)
|
|
+all: $(LANAME)
|
|
|
|
# Deps (use make dep to generate this)
|
|
net.o: net.c fmacros.h net.h hiredis.h
|
|
@@ -60,6 +62,13 @@ $(STLIBNAME): $(OBJ)
|
|
dynamic: $(DYLIBNAME)
|
|
static: $(STLIBNAME)
|
|
|
|
+$(LANAME): $(OBJ)
|
|
+ $(LIBTOOL) --mode=link \
|
|
+ $(CC) -o $(LANAME) \
|
|
+ $(OBJ:.o=.lo) \
|
|
+ -rpath $(PREFIX)/lib \
|
|
+ -version-number $(HIREDIS_MAJOR):$(HIREDIS_MINOR)
|
|
+
|
|
# Binaries:
|
|
hiredis-example-libevent: example-libevent.c adapters/libevent.h $(STLIBNAME)
|
|
$(CC) -o $@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -levent example-libevent.c $(STLIBNAME)
|
|
@@ -95,7 +104,7 @@ check: hiredis-test
|
|
kill `cat /tmp/hiredis-test-redis.pid`
|
|
|
|
.c.o:
|
|
- $(CC) -std=c99 -pedantic -c $(REAL_CFLAGS) $<
|
|
+ $(LIBTOOL) --mode=compile $(CC) -std=c99 -pedantic -c $(REAL_CFLAGS) $<
|
|
|
|
clean:
|
|
rm -rf $(DYLIBNAME) $(STLIBNAME) $(BINS) hiredis-example* *.o *.gcda *.gcno *.gcov
|
|
@@ -107,8 +116,8 @@ dep:
|
|
PREFIX?=/usr/local
|
|
INCLUDE_PATH?=include/hiredis
|
|
LIBRARY_PATH?=lib
|
|
-INSTALL_INCLUDE_PATH= $(PREFIX)/$(INCLUDE_PATH)
|
|
-INSTALL_LIBRARY_PATH= $(PREFIX)/$(LIBRARY_PATH)
|
|
+INSTALL_INCLUDE_PATH= $(DESTDIR)$(PREFIX)/$(INCLUDE_PATH)
|
|
+INSTALL_LIBRARY_PATH= $(DESTDIR)$(PREFIX)/$(LIBRARY_PATH)
|
|
|
|
ifeq ($(uname_S),SunOS)
|
|
INSTALL?= cp -r
|
|
@@ -119,10 +128,7 @@ INSTALL?= cp -a
|
|
install: $(DYLIBNAME) $(STLIBNAME)
|
|
mkdir -p $(INSTALL_INCLUDE_PATH) $(INSTALL_LIBRARY_PATH)
|
|
$(INSTALL) hiredis.h async.h adapters $(INSTALL_INCLUDE_PATH)
|
|
- $(INSTALL) $(DYLIBNAME) $(INSTALL_LIBRARY_PATH)/$(DYLIB_MINOR_NAME)
|
|
- cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MINOR_NAME) $(DYLIB_MAJOR_NAME)
|
|
- cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MAJOR_NAME) $(DYLIBNAME)
|
|
- $(INSTALL) $(STLIBNAME) $(INSTALL_LIBRARY_PATH)
|
|
+ $(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) $(LANAME) $(DESTDIR)$(PREFIX)/lib
|
|
|
|
32bit:
|
|
@echo ""
|