kinetic-c-make.patch

   1 --- kinetic-c-0.12.0/Makefile.orig      2015-03-13 21:12:09.000000000 +0100
   2 +++ kinetic-c-0.12.0/Makefile   2016-04-11 20:02:53.847011168 +0200
   3 @@ -27,7 +27,7 @@
   4  WARN += -Werror
   5  CDEFS += -D_POSIX_C_SOURCE=199309L -D_C99_SOURCE=1
   6  CFLAGS += -std=c99 -fPIC -g $(WARN) $(CDEFS) $(OPTIMIZE)
   7 -LDFLAGS += -lm -L${OPENSSL_PATH}/lib -lcrypto -lssl -lpthread -ljson-c
   8 +LDFLAGS += -lm -lcrypto -lssl -lpthread -ljson-c -lprotobuf-c -lsocket99
   9  NUM_SIMS ?= 2
  10
  11  #===============================================================================
  12 @@ -47,18 +47,19 @@
  13  VERSION = ${shell head -n1 $(VERSION_FILE)}
  14  THREADPOOL_PATH = ${LIB_DIR}/threadpool
  15  BUS_PATH = ${LIB_DIR}/bus
  16 -JSONC_LIB = ${OUT_DIR}/libjson-c.a
  17
  18  KINETIC_LIB_NAME = $(PROJECT).$(VERSION)
  19  KINETIC_LIB = $(BIN_DIR)/lib$(KINETIC_LIB_NAME).a
  20 -LIB_INCS = -I$(LIB_DIR) -I$(PUB_INC) -I$(PROTOBUFC) -I$(SOCKET99) -I$(VENDOR) \
  21 -       -I$(JSONC) -I$(THREADPOOL_PATH) -I$(BUS_PATH) -I${OPENSSL_PATH}/include
  22 +LIB_INCS = -I$(LIB_DIR) -I$(PUB_INC) -I/usr/include/protobuf-c -I/usr/include/socket99 -I$(VENDOR) \
  23 +       -I/usr/include/json-c -I$(THREADPOOL_PATH) -I$(BUS_PATH) -I${OPENSSL_PATH}/include
  24
  25 -C_SRC=${LIB_DIR}/*.[ch] $(SOCKET99)/socket99.[ch] $(PROTOBUFC)/protobuf-c/protobuf-c.[ch]
  26 +KINETIC_SO_NAME = lib$(KINETIC_LIB_NAME).so
  27 +KINETIC_SO_DEV = $(BIN_DIR)/$(KINETIC_SO_NAME)
  28 +KINETIC_SO_RELEASE = $(PREFIX)$(LIB_DIR)/$(KINETIC_SO_NAME)
  29 +
  30 +C_SRC=${LIB_DIR}/*.[ch]
  31
  32  LIB_OBJS = \
  33 -       $(OUT_DIR)/socket99.o \
  34 -       $(OUT_DIR)/protobuf-c.o \
  35         $(OUT_DIR)/kinetic_allocator.o \
  36         $(OUT_DIR)/kinetic_nbo.o \
  37         $(OUT_DIR)/kinetic_operation.o \
  38 @@ -105,7 +106,7 @@
  39  KINETIC_LIB_OTHER_DEPS = Makefile Rakefile $(VERSION_FILE) $(VERSION_INFO)
  40
  41
  42 -default: makedirs $(KINETIC_LIB)
  43 +default: makedirs $(KINETIC_LIB) $(KINETIC_SO_DEV)
  44
  45  makedirs:
  46         @echo; mkdir -p ./bin/examples &> /dev/null; mkdir -p ./bin/unit &> /dev/null; mkdir -p ./bin/systest &> /dev/null; mkdir -p ./out &> /dev/null
  47 @@ -259,10 +260,7 @@
  48  # Static and Dynamic Library Build Support
  49  #-------------------------------------------------------------------------------
  50
  51 -KINETIC_SO_DEV = $(BIN_DIR)/lib$(KINETIC_LIB_NAME).so
  52 -KINETIC_SO_RELEASE = $(PREFIX)/lib$(KINETIC_LIB_NAME).so
  53 -
  54 -$(KINETIC_LIB): $(KINETIC_LIB_OTHER_DEPS) $(LIB_OBJS) $(JSONC_LIB)
  55 +$(KINETIC_LIB): $(KINETIC_LIB_OTHER_DEPS) $(LIB_OBJS)
  56         @echo
  57         @echo --------------------------------------------------------------------------------
  58         @echo Building static library: $(KINETIC_LIB)
  59 @@ -270,12 +268,12 @@
  60         ar -rcs $@ $(LIB_OBJS)
  61         ar -t $@
  62
  63 -$(KINETIC_SO_DEV): $(LIB_OBJS) $(KINETIC_LIB_OTHER_DEPS) $(JSONC_LIB)
  64 +$(KINETIC_SO_DEV): $(LIB_OBJS) $(KINETIC_LIB_OTHER_DEPS)
  65         @echo
  66         @echo --------------------------------------------------------------------------------
  67         @echo Building dynamic library: $(KINETIC_SO_DEV)
  68         @echo --------------------------------------------------------------------------------
  69 -       $(CC) -o $@ -shared $(LDFLAGS) $(LIB_OBJS)
  70 +       $(CC) -o $@ -shared $(LDFLAGS) -Wl,-soname,$(KINETIC_SO_NAME) $(LIB_OBJS)
  71
  72
  73  #-------------------------------------------------------------------------------
  74 @@ -285,7 +283,7 @@
  75  INSTALL ?= install
  76  RM ?= rm
  77
  78 -install: ${JSONC_LIB} json_install $(KINETIC_LIB) $(KINETIC_SO_DEV)
  79 +install: $(KINETIC_LIB) $(KINETIC_SO_DEV)
  80         @echo
  81         @echo --------------------------------------------------------------------------------
  82         @echo Installing $(PROJECT) v$(VERSION) into $(PREFIX)
  83 @@ -293,6 +291,8 @@
  84         @echo
  85         $(INSTALL) -d $(PREFIX)${LIBDIR}
  86 -       $(INSTALL) -c $(KINETIC_LIB) $(PREFIX)${LIBDIR}/
  87 +       $(INSTALL) -c $(KINETIC_SO_DEV) $(PREFIX)${LIBDIR}/
  88 +       $(INSTALL) -c $(KINETIC_LIB) $(PREFIX)${LIBDIR}/libkinetic-c-client.a
  89 +       ln -s $(KINETIC_SO_NAME) $(PREFIX)$(LIBDIR)/libkinetic-c-client.so
  90         $(INSTALL) -d $(PREFIX)/include/
  91         $(INSTALL) -c $(PUB_INC)/kinetic_client.h $(PREFIX)/include/
  92         $(INSTALL) -c $(PUB_INC)/kinetic_admin_client.h $(PREFIX)/include/
  93 @@ -425,7 +425,7 @@
  94  $(OUT_DIR)/discovery.o: $(DISCOVERY_UTIL_DIR)/discovery.c
  95         $(CC) -c -o $@ $< $(CFLAGS) -I$(PUB_INC) -I$(DISCOVERY_UTIL_DIR) $(LIB_INCS)
  96
  97 -$(DISCOVERY_UTIL_EXEC): $(DISCOVERY_UTIL_OBJ) $(KINETIC_LIB) $(JSONC_LIB)
  98 +$(DISCOVERY_UTIL_EXEC): $(DISCOVERY_UTIL_OBJ) $(KINETIC_LIB)
  99         @echo
 100         @echo --------------------------------------------------------------------------------
 101         @echo Building service discovery utility: $(DISCOVERY_UTIL_EXEC)