From f81bf47d1c3dcb69ec1f2be6f24f2b7fd9737111 Mon Sep 17 00:00:00 2001 From: Anoop C S Date: Thu, 29 Aug 2019 14:27:12 +0530 Subject: build: Fix libglusterd Makefile target * Fix libglusterd.la target path in cli/src/Makefile.am * Like libglusterfs, libgfxdr and libgfrpc, libglusterd is also expected to be ready by the time xlators/mgmt/glusterd sources are compiled. Therefore this change removes the additional mentioning of libglusterd.la target in Makefile.am Change-Id: I1b787316cfb6cd7487f49e661490b9788a0b80b3 Updates: bz#1193929 Signed-off-by: Anoop C S --- cli/src/Makefile.am | 2 +- xlators/mgmt/glusterd/src/Makefile.am | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/cli/src/Makefile.am b/cli/src/Makefile.am index cfbfca450c5..1e27edd9054 100644 --- a/cli/src/Makefile.am +++ b/cli/src/Makefile.am @@ -29,7 +29,7 @@ CLEANFILES = $(top_builddir)/libglusterfs/src/libglusterfs.la: $(MAKE) -C $(top_builddir)/libglusterfs/src/ all -$(top_builddir)/libglusterfs/src/libglusterd.la: +$(top_builddir)/libglusterd/src/libglusterd.la: $(MAKE) -C $(top_builddir)/libglusterd/src/ all install-data-hook: diff --git a/xlators/mgmt/glusterd/src/Makefile.am b/xlators/mgmt/glusterd/src/Makefile.am index fe90665ab8f..eaa61c435e5 100644 --- a/xlators/mgmt/glusterd/src/Makefile.am +++ b/xlators/mgmt/glusterd/src/Makefile.am @@ -27,7 +27,6 @@ glusterd_la_SOURCES = glusterd.c glusterd-handler.c glusterd-sm.c \ glusterd-reset-brick.c glusterd-shd-svc.c glusterd-shd-svc-helper.c \ glusterd-gfproxyd-svc.c glusterd-gfproxyd-svc-helper.c glusterd-ganesha.c - glusterd_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \ $(top_builddir)/libglusterd/src/libglusterd.la \ $(top_builddir)/rpc/xdr/src/libgfxdr.la \ @@ -76,6 +75,3 @@ if GF_INSTALL_GLUSTERD_WORKDIR (ln -sf $(DESTDIR)$(GLUSTERD_WORKDIR) $(sysconfdir)/glusterd) || true; endif endif - -$(top_builddir)/libglusterfs/src/libglusterd.la: - $(MAKE) -C $(top_builddir)/libglusterd/src/ all -- cgit