From ff74a2144e02af11373375f8d40e9b312a0dd0c6 Mon Sep 17 00:00:00 2001 From: Prasanna Kumar Kalever Date: Mon, 30 Jan 2017 14:52:04 +0530 Subject: gluster-block: walk through the cleanups better naming of variables and functions, variable initialization, also fix few leaks Signed-off-by: Prasanna Kumar Kalever --- Makefile | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index e37b737..cb9e5a2 100644 --- a/Makefile +++ b/Makefile @@ -10,13 +10,16 @@ # # ######################################################################## + CC = gcc +COMMON = utils.o common.o rpc/block_xdr.o + CLIENT = gluster-block -CDEP = glfs-operations.o utils.o common.o rpc/block_clnt.c rpc/block_xdr.c gluster-block.o +CDEP = rpc/block_clnt.o gluster-block.o SERVER = gluster-blockd -SDEP = rpc/block_svc.o rpc/block_clnt.c rpc/block_xdr.o gluster-blockd.o utils.o common.o glfs-operations.o +SDEP = glfs-operations.o rpc/block_svc.o rpc/block_clnt.o gluster-blockd.o CFLAGS = -g -ggdb -Wall -lpthread LIBS := $(shell pkg-config --libs uuid glusterfs-api) @@ -28,16 +31,16 @@ MKDIR_P = mkdir -p INSTALL = /usr/bin/install -c INSTALLDATA = /usr/bin/install -c -m 644 SYSTEMD_DIR = /usr/lib/systemd/system -LOGDIR = /var/log/ +LOGDIR = /var/log/gluster-block -all: $(CLIENT) $(SERVER) +all: $(SERVER) $(CLIENT) -$(CLIENT): $(CDEP) +$(CLIENT): $(CDEP) $(COMMON) @$(MKDIR_P) $(LOGDIR)$@ $(CC) $(CFLAGS) $(LIBS) $^ -o $@ -$(SERVER): $(SDEP) +$(SERVER): $(SDEP) $(COMMON) $(CC) $(CFLAGS) $(LIBS) $^ -o $@ glfs-operations.o: glfs-operations.c glfs-operations.h @@ -51,7 +54,7 @@ glfs-operations.o: glfs-operations.c glfs-operations.h $(CLIENT).o: $(CLIENT).c $(CC) $(CFLAGS) -c $< -o $@ -install: $(CLIENT) $(SERVER) +install: $(SERVER) $(CLIENT) $(INSTALL) $^ $(PREFIX)/ @if [ -d $(SYSTEMD_DIR) ]; then \ $(MKDIR_P) $(SYSTEMD_DIR); \ -- cgit