kinetic-c-make.patch

   1 --- kinetic-c-0.6.0/Makefile.orig       2014-10-07 00:54:46.000000000 +0200
   2 +++ kinetic-c-0.6.0/Makefile    2014-10-14 22:04:07.222209100 +0200
   3 @@ -12,9 +12,10 @@
   4  SOCKET99 = ./vendor/socket99
   5  VND_INC = ./vendor
   6  BIN = $(BIN_DIR)/kinetic_client
   7 -LDFLAGS += -lm -l ssl -l kinetic-c-client -l crypto
   8 +LDFLAGS += -lm -lssl -lcrypto -lsocket99 -lprotobuf-c
   9
  10  PREFIX ?= /usr/local
  11 +LIB ?= lib
  12  INSTALL ?= install
  13  RM ?= rm
  14
  15 @@ -39,10 +40,9 @@
  16  LIB_INCS = -I$(LIB_DIR) -I$(PUB_INC) -I$(PBC_INC) -I$(VND_INC)
  17  LIB_DEPS = $(PUB_INC)/kinetic_client.h $(PUB_INC)/kinetic_types.h $(LIB_DIR)/kinetic_connection.h $(LIB_DIR)/kinetic_hmac.h $(LIB_DIR)/kinetic_logger.h $(LIB_DIR)/kinetic_message.h $(LIB_DIR)/kinetic_nbo.h $(LIB_DIR)/kinetic_operation.h $(LIB_DIR)/kinetic_pdu.h $(LIB_DIR)/kinetic_proto.h $(LIB_DIR)/kinetic_socket.h
  18  # LIB_OBJ = $(patsubst %,$(OUT_DIR)/%,$(LIB_OBJS))
  19 -LIB_OBJS = $(OUT_DIR)/kinetic_nbo.o $(OUT_DIR)/kinetic_operation.o $(OUT_DIR)/kinetic_pdu.o $(OUT_DIR)/kinetic_proto.o $(OUT_DIR)/kinetic_socket.o $(OUT_DIR)/kinetic_message.o $(OUT_DIR)/kinetic_logger.o $(OUT_DIR)/kinetic_hmac.o $(OUT_DIR)/kinetic_connection.o $(OUT_DIR)/kinetic_types.o $(OUT_DIR)/kinetic_client.o $(OUT_DIR)/socket99.o $(OUT_DIR)/protobuf-c.o
  20 +LIB_OBJS = $(OUT_DIR)/kinetic_nbo.o $(OUT_DIR)/kinetic_operation.o $(OUT_DIR)/kinetic_pdu.o $(OUT_DIR)/kinetic_proto.o $(OUT_DIR)/kinetic_socket.o $(OUT_DIR)/kinetic_message.o $(OUT_DIR)/kinetic_logger.o $(OUT_DIR)/kinetic_hmac.o $(OUT_DIR)/kinetic_connection.o $(OUT_DIR)/kinetic_types.o $(OUT_DIR)/kinetic_client.o
  21
  22 -# default: $(KINETIC_SO)
  23 -default: $(KINETIC_LIB)
  24 +default: $(KINETIC_LIB) $(KINETIC_SO)
  25
  26  test_all: Rakefile $(LIB_OBJS)
  27         @echo
  28 @@ -101,7 +101,7 @@
  29         @echo --------------------------------------------------------------------------------
  30         @echo Building $(KINETIC_SO) dynamic library
  31         @echo --------------------------------------------------------------------------------
  32 -       $(CC) $(LIB_OBJS) -shared ${LDFLAGS} -o ${KINETIC_SO}
  33 +       $(CC) $(LIB_OBJS) -shared ${LDFLAGS} -Wl,-soname,${KINETIC_SO} -o ${KINETIC_SO}
  34
  35  libso: $(KINETIC_SO)
  36
  37 @@ -170,7 +171,7 @@
  38
  39  # Installation
  40  # Need to re-add ${KINETIC_SO}, once ready
  41 -install: ${KINETIC_LIB} VERSION
  42 +install: ${KINETIC_SO} ${KINETIC_LIB} VERSION
  43         @echo
  44         @echo --------------------------------------------------------------------------------
  45         @echo Installing $(PROJECT) v$(VERSION) into $(PREFIX)
  46 @@ -178,15 +179,13 @@
  47         @echo
  48         @echo You may be prompted for your password in order to proceed.
  49         @echo
  50 -       ${INSTALL} -d ${PREFIX}/lib/
  51 -       ${INSTALL} -c ${KINETIC_LIB} ${PREFIX}/lib/
  52 -       # ${INSTALL} -c ${KINETIC_SO} ${PREFIX}/lib/
  53 +       ${INSTALL} -d ${PREFIX}/${LIB}/
  54 +       ${INSTALL} -c ${KINETIC_LIB} ${PREFIX}/${LIB}/
  55 +       ${INSTALL} -c ${KINETIC_SO} ${PREFIX}/${LIB}/ ; ln -s ${KINETIC_SO} ${PREFIX}/${LIB}/libkinetic-c-client.so
  56         ${INSTALL} -d ${PREFIX}/include/
  57         ${INSTALL} -c ./include/${API_NAME}.h ${PREFIX}/include/
  58         ${INSTALL} -c ./include/kinetic_types.h ${PREFIX}/include/
  59         ${INSTALL} -c ./src/lib/kinetic_proto.h ${PREFIX}/include/
  60 -       ${INSTALL} -d ${PREFIX}/include/protobuf-c
  61 -       ${INSTALL} -c ./vendor/protobuf-c/protobuf-c/protobuf-c.h ${PREFIX}/include/protobuf-c/
  62
  63  uninstall:
  64         @echo
  65 --- ../BUILD/kinetic-c-0.6.0/Makefile.orig      2014-10-17 18:57:11.958468832 +0200
  66 +++ ../BUILD/kinetic-c-0.6.0/Makefile   2014-10-17 21:53:09.594692437 +0200