From: Martin Wilck <mwilck@xxxxxxxx> Rely more on "make" functionality than on sequential command execution. --- libmpathcmd/Makefile | 8 +++++--- libmpathpersist/Makefile | 10 +++++++--- libmultipath/Makefile | 8 +++++--- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/libmpathcmd/Makefile b/libmpathcmd/Makefile index 0f6b816..08ccb81 100644 --- a/libmpathcmd/Makefile +++ b/libmpathcmd/Makefile @@ -8,13 +8,15 @@ CFLAGS += $(LIB_CFLAGS) OBJS = mpath_cmd.o -all: $(LIBS) +all: $(DEVLIB) $(LIBS): $(OBJS) $(CC) $(LDFLAGS) $(SHARED_FLAGS) -Wl,-soname=$@ -o $@ $(OBJS) $(LIBDEPS) - $(LN) $@ $(DEVLIB) -install: $(LIBS) +$(DEVLIB): $(LIBS) + $(LN) $(LIBS) $@ + +install: all $(INSTALL_PROGRAM) -d $(DESTDIR)$(syslibdir) $(INSTALL_PROGRAM) -m 755 $(LIBS) $(DESTDIR)$(syslibdir)/$(LIBS) $(LN) $(LIBS) $(DESTDIR)$(syslibdir)/$(DEVLIB) diff --git a/libmpathpersist/Makefile b/libmpathpersist/Makefile index 21fdad8..9e869fd 100644 --- a/libmpathpersist/Makefile +++ b/libmpathpersist/Makefile @@ -11,15 +11,19 @@ LIBDEPS += -lpthread -ldevmapper -ldl -L$(multipathdir) -lmultipath \ OBJS = mpath_persist.o mpath_updatepr.o mpath_pr_ioctl.o -all: $(LIBS) +all: $(DEVLIB) man $(LIBS): $(OBJS) $(CC) $(LDFLAGS) $(SHARED_FLAGS) $(LIBDEPS) -Wl,-soname=$@ -o $@ $(OBJS) - $(LN) $(LIBS) $(DEVLIB) + +$(DEVLIB): $(LIBS) + $(LN) $(LIBS) $@ + +man: $(GZIP) mpath_persistent_reserve_in.3 > mpath_persistent_reserve_in.3.gz $(GZIP) mpath_persistent_reserve_out.3 > mpath_persistent_reserve_out.3.gz -install: $(LIBS) +install: all $(INSTALL_PROGRAM) -d $(DESTDIR)$(syslibdir) $(INSTALL_PROGRAM) -m 755 $(LIBS) $(DESTDIR)$(syslibdir)/$(LIBS) $(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(syslibdir) diff --git a/libmultipath/Makefile b/libmultipath/Makefile index e5dac5e..af5bb77 100644 --- a/libmultipath/Makefile +++ b/libmultipath/Makefile @@ -50,7 +50,7 @@ OBJS = memory.o parser.o vector.o devmapper.o callout.o \ io_err_stat.o dm-generic.o generic.o foreign.o nvme-lib.o \ libsg.o valid.o -all: $(LIBS) +all: $(DEVLIB) nvme-lib.o: nvme-lib.c nvme-ioctl.c nvme-ioctl.h $(CC) $(CFLAGS) -Wno-unused-function -c -o $@ $< @@ -70,9 +70,11 @@ nvme-ioctl.h: nvme/nvme-ioctl.h $(LIBS): $(OBJS) $(CC) $(LDFLAGS) $(SHARED_FLAGS) -Wl,-soname=$@ -o $@ $(OBJS) $(LIBDEPS) - $(LN) $@ $(DEVLIB) -install: +$(DEVLIB): $(LIBS) + $(LN) $(LIBS) $@ + +install: all $(INSTALL_PROGRAM) -d $(DESTDIR)$(syslibdir) $(INSTALL_PROGRAM) -m 755 $(LIBS) $(DESTDIR)$(syslibdir)/$(LIBS) $(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(libdir) -- 2.28.0 -- dm-devel mailing list dm-devel@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/dm-devel
