Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=9b5... Commit: 9b58afaa4700a7d03b941343fe74a5b1db113ac6 Parent: 6502e1ed197687598872e6ac3af30e4a921ff21e Author: Fabio M. Di Nitto fdinitto@redhat.com AuthorDate: Tue Nov 2 21:21:27 2010 +0100 Committer: Fabio M. Di Nitto fdinitto@redhat.com CommitterDate: Tue Nov 2 21:21:27 2010 +0100
build: clean dlm_controld Makefile
Signed-off-by: Fabio M. Di Nitto fdinitto@redhat.com --- group/dlm_controld/Makefile | 38 +++++++++++++++++--------------------- 1 files changed, 17 insertions(+), 21 deletions(-)
diff --git a/group/dlm_controld/Makefile b/group/dlm_controld/Makefile index ee061cb..bb5c82e 100644 --- a/group/dlm_controld/Makefile +++ b/group/dlm_controld/Makefile @@ -1,7 +1,7 @@ include ../../make/defines.mk
TARGET = dlm_controld -SBINDIRT = dlm_controld +SBINDIRT = ${TARGET}
all: depends ${TARGET}
@@ -10,19 +10,17 @@ include $(OBJDIR)/make/clean.mk include $(OBJDIR)/make/install.mk include $(OBJDIR)/make/uninstall.mk
-SHAREDOBJS= action.o \ - cpg.o \ - crc.o \ - deadlock.o \ - main.o \ - netlink.o \ - plock.o \ - group.o - -OBJS= $(SHAREDOBJS) \ - config.o \ - member_cman.o \ - logging.o +OBJS= action.o \ + cpg.o \ + crc.o \ + deadlock.o \ + main.o \ + netlink.o \ + plock.o \ + group.o \ + config.o \ + member_cman.o \ + logging.o
CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${logtincdir} CFLAGS += -I${dlmincdir} -I${dlmcontrolincdir} @@ -32,21 +30,19 @@ CFLAGS += -I${KERNEL_SRC}/include/ CFLAGS += -I$(S)/../lib/ -I$(S)/../include/ CFLAGS += -I${incdir}
-LDFLAGS += -lpthread -LDFLAGS += -L${dlmlibdir} -ldlm LDFLAGS += -L${logtlibdir} -llogthread +LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -lccs -lcman +LDFLAGS += -L${dlmlibdir} -L${fencedlibdir} -ldlm -lfenced LDFLAGS += -L${openaislibdir} -lSaCkpt LDFLAGS += -L${corosynclibdir} -lcpg -lconfdb +LDFLAGS += -lpthread LDFLAGS += -L../lib -lgroup LDFLAGS += -L${libdir}
LDDEPS += ../lib/libgroup.a
-CMAN_LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -lccs -lcman -CMAN_LDFLAGS += -L${fencedlibdir} -lfenced - -dlm_controld: ${OBJS} ${LDDEPS} - $(CC) -o $@ $^ $(LDFLAGS) $(CMAN_LDFLAGS) +${TARGET}: ${OBJS} ${LDDEPS} + $(CC) -o $@ $^ $(LDFLAGS)
depends: $(MAKE) -C ../lib all