Commit 784f2901 authored by Greg Williams's avatar Greg Williams
Browse files

Merge pull request #3 from dalgaaf/wip-da-build-fixes 

Fixes for build/make
parents 7672f5a0 884aa87a

Makefile

+37 −8
Original line number Diff line number Diff line
@@ -21,6 +21,9 @@ LDFLAGS += -lm -l crypto -l ssl 


PROJECT = kinetic-c-client



PREFIX ?= /usr/local

LIBDIR ?= /lib



LIB_DIR = ./src/lib

VENDOR = ./vendor

PROTOBUFC = $(VENDOR)/protobuf-c
@@ -31,9 +34,36 @@ VERSION = ${shell head -n1 $(VERSION_FILE)} 
KINETIC_LIB_NAME = $(PROJECT).$(VERSION)

KINETIC_LIB = $(BIN_DIR)/lib$(KINETIC_LIB_NAME).a

LIB_INCS = -I$(LIB_DIR) -I$(PUB_INC) -I$(PROTOBUFC) -I$(VENDOR)

LIB_DEPS = $(PUB_INC)/kinetic_client.h $(PUB_INC)/byte_array.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 $(LIB_DIR)/kinetic_types_internal.h

LIB_DEPS = $(PUB_INC)/kinetic_client.h \

	   $(PUB_INC)/byte_array.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 \

	   $(LIB_DIR)/kinetic_types_internal.h

# LIB_OBJ = $(patsubst %,$(OUT_DIR)/%,$(LIB_OBJS))

LIB_OBJS = $(OUT_DIR)/kinetic_allocator.o $(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_types_internal.o $(OUT_DIR)/byte_array.o $(OUT_DIR)/kinetic_client.o $(OUT_DIR)/socket99.o $(OUT_DIR)/protobuf-c.o

LIB_OBJS = $(OUT_DIR)/kinetic_allocator.o \

   	   $(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_types_internal.o \

   	   $(OUT_DIR)/byte_array.o \

   	   $(OUT_DIR)/kinetic_client.o \

   	   $(OUT_DIR)/socket99.o \

   	   $(OUT_DIR)/protobuf-c.o

KINETIC_LIB_OTHER_DEPS = Makefile Rakefile $(VERSION_FILE)



default: $(KINETIC_LIB)
@@ -103,7 +133,6 @@ $(OUT_DIR)/kinetic_client.o: $(LIB_DIR)/kinetic_client.c $(LIB_DEPS) 
# Static and Dynamic Library Build Support

#-------------------------------------------------------------------------------



PREFIX ?= /usr/local

KINETIC_SO_DEV = $(BIN_DIR)/lib$(KINETIC_LIB_NAME).so

KINETIC_SO_RELEASE = $(PREFIX)/lib$(KINETIC_LIB_NAME).so
@@ -138,8 +167,8 @@ install: $(KINETIC_LIB) $(KINETIC_SO_DEV) 
	@echo Installing $(PROJECT) v$(VERSION) into $(PREFIX)

	@echo --------------------------------------------------------------------------------

	@echo

	$(INSTALL) -d $(PREFIX)/lib/

	$(INSTALL) -c $(KINETIC_LIB) $(PREFIX)/lib/

	$(INSTALL) -d $(PREFIX)${LIBDIR}

	$(INSTALL) -c $(KINETIC_LIB) $(PREFIX)${LIBDIR}/

	$(INSTALL) -d $(PREFIX)/include/

	$(INSTALL) -c $(PUB_INC)/$(API_NAME).h $(PREFIX)/include/

	$(INSTALL) -c $(PUB_INC)/kinetic_types.h $(PREFIX)/include/
@@ -150,9 +179,9 @@ uninstall: 
	@echo Uninstalling $(PROJECT) from $(PREFIX)

	@echo --------------------------------------------------------------------------------

	@echo

	$(RM) -f $(PREFIX)/lib/lib$(PROJECT)*.a

	$(RM) -f $(PREFIX)/lib/lib$(PROJECT)*.so

	$(RM) -f $(PREFIX)/include/${PUBLIC_API}.h

	$(RM) -f $(PREFIX)${LIBDIR}/lib$(PROJECT)*.a

	$(RM) -f $(PREFIX)${LIBDIR}/lib$(PROJECT)*.so

	$(RM) -f $(PREFIX)/include/${API_NAME}.h

	$(RM) -f $(PREFIX)/include/kinetic_types.h

	$(RM) -f $(PREFIX)/include/kinetic_proto.h

	$(RM) -f $(PREFIX)/include/protobuf-c/protobuf-c.h