From 02e1c783f692e05e1eb41a7d78911ef075b90e13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Fri, 31 Aug 2018 10:07:35 +0200 Subject: [PATCH] Makefile: drop LOADLIBES variable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove deprecated LOADLIBES variable from the Makefile rules, LDLIBS serves the same purpose these days. Link: https://github.com/ibm-s390-tools/s390-tools/pull/35 Signed-off-by: Dan Horák Acked-by: Ingo Franzki Signed-off-by: Jan Höppner --- common.mak | 2 +- cpuplugd/Makefile | 2 +- ipl_tools/Makefile | 2 +- vmconvert/Makefile | 2 +- vmur/Makefile | 2 +- ziomon/Makefile | 10 +++++----- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/common.mak b/common.mak index 7d11b10d..60296870 100644 --- a/common.mak +++ b/common.mak @@ -240,7 +240,7 @@ endif $(CXX) $(ALL_CPPFLAGS) $(ALL_CXXFLAGS) -c $< -o $@ %: %.o - $(LINK) $(ALL_LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@ + $(LINK) $(ALL_LDFLAGS) $^ $(LDLIBS) -o $@ %.a: $(AR) rcs $@ $^ diff --git a/cpuplugd/Makefile b/cpuplugd/Makefile index a9a49ab5..916638d1 100644 --- a/cpuplugd/Makefile +++ b/cpuplugd/Makefile @@ -7,7 +7,7 @@ LDLIBS += -lm OBJECTS = daemon.o cpu.o info.o terms.o config.o main.o getopt.o mem.o cpuplugd: $(OBJECTS) - $(LINK) $(ALL_LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@ + $(LINK) $(ALL_LDFLAGS) $^ $(LDLIBS) -o $@ clean: rm -f cpuplugd $(OBJECTS) diff --git a/ipl_tools/Makefile b/ipl_tools/Makefile index 128ec3e6..506d5cdc 100644 --- a/ipl_tools/Makefile +++ b/ipl_tools/Makefile @@ -6,7 +6,7 @@ objects = main.o ccw.o fcp.o system.o shutdown.o \ cmd_lsshut.o cmd_chshut.o cmd_lsreipl.o cmd_chreipl.o proc.o chreipl: $(objects) - $(LINK) $(ALL_LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@ + $(LINK) $(ALL_LDFLAGS) $^ $(LDLIBS) -o $@ lsreipl: ln -sf chreipl lsreipl diff --git a/vmconvert/Makefile b/vmconvert/Makefile index 4d0216c0..380eb198 100644 --- a/vmconvert/Makefile +++ b/vmconvert/Makefile @@ -9,7 +9,7 @@ libs = $(rootdir)/libvmdump/libvmdump.a objects = vmconvert.o vmconvert: $(objects) $(libs) - $(LINKXX) $(ALL_LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@ + $(LINKXX) $(ALL_LDFLAGS) $^ $(LDLIBS) -o $@ install: all $(INSTALL) -d -m 755 $(DESTDIR)$(USRBINDIR) $(DESTDIR)$(MANDIR)/man1 diff --git a/vmur/Makefile b/vmur/Makefile index 1a6bddc0..2c1c2d53 100644 --- a/vmur/Makefile +++ b/vmur/Makefile @@ -11,7 +11,7 @@ libs = $(rootdir)/libvmdump/libvmdump.a \ objects = vmur.o vmur: $(objects) $(libs) - $(LINKXX) $(ALL_LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@ + $(LINKXX) $(ALL_LDFLAGS) $^ $(LDLIBS) -o $@ install: all $(INSTALL) -d -m 755 $(DESTDIR)$(USRSBINDIR) $(DESTDIR)$(MANDIR)/man8 diff --git a/ziomon/Makefile b/ziomon/Makefile index 778401bc..61c2399d 100644 --- a/ziomon/Makefile +++ b/ziomon/Makefile @@ -12,33 +12,33 @@ ziomon_mgr_main.o: ziomon_mgr.c ziomon_mgr: LDLIBS += -lm ziomon_mgr: ziomon_dacc.o ziomon_util.o ziomon_mgr_main.o ziomon_tools.o \ ziomon_zfcpdd.o ziomon_msg_tools.o - $(LINK) $(ALL_LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@ + $(LINK) $(ALL_LDFLAGS) $^ $(LDLIBS) -o $@ ziomon_util_main.o: ziomon_util.c ziomon_util.h $(CC) -DWITH_MAIN $(ALL_CFLAGS) $(ALL_CPPFLAGS) -c $< -o $@ ziomon_util: LDLIBS += -lm ziomon_util: ziomon_util_main.o ziomon_tools.o - $(LINK) $(ALL_LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@ + $(LINK) $(ALL_LDFLAGS) $^ $(LDLIBS) -o $@ ziomon_zfcpdd_main.o: ziomon_zfcpdd.c ziomon_zfcpdd.h $(CC) -DWITH_MAIN $(ALL_CFLAGS) $(ALL_CPPFLAGS) -c $< -o $@ ziomon_zfcpdd: LDLIBS += -lm -lrt -lpthread ziomon_zfcpdd: ziomon_zfcpdd_main.o ziomon_tools.o - $(LINK) $(ALL_LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@ + $(LINK) $(ALL_LDFLAGS) $^ $(LDLIBS) -o $@ ziorep_traffic: ziorep_traffic.o ziorep_framer.o ziorep_frameset.o \ ziorep_printers.o ziomon_dacc.o ziomon_util.o \ ziomon_msg_tools.o ziomon_tools.o ziomon_zfcpdd.o \ ziorep_cfgreader.o ziorep_collapser.o ziorep_utils.o \ ziorep_filters.o - $(LINKXX) $(ALL_LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@ + $(LINKXX) $(ALL_LDFLAGS) $^ $(LDLIBS) -o $@ ziorep_utilization: ziorep_utilization.o ziorep_framer.o ziorep_frameset.o \ ziorep_printers.o ziomon_dacc.o ziomon_util.o \ ziomon_msg_tools.o ziomon_tools.o ziomon_zfcpdd.o \ ziorep_cfgreader.o ziorep_collapser.o ziorep_utils.o \ ziorep_filters.o - $(LINKXX) $(ALL_LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@ + $(LINKXX) $(ALL_LDFLAGS) $^ $(LDLIBS) -o $@ install: all $(SED) -e 's/%S390_TOOLS_VERSION%/$(S390_TOOLS_RELEASE)/' \