From 3ad5b27698bb0361dba23eee5eeba1ad68680b8c Mon Sep 17 00:00:00 2001 From: "Janet B. Anderson" Date: Mon, 21 Jan 2002 20:37:33 +0000 Subject: [PATCH] Changed $*_LIBS to $*_LDLIBS. --- configure/os/CONFIG.Common.UnixCommon | 4 ++-- configure/os/CONFIG.Common.vxWorksCommon | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure/os/CONFIG.Common.UnixCommon b/configure/os/CONFIG.Common.UnixCommon index 545a9aef0..c1d421e8b 100644 --- a/configure/os/CONFIG.Common.UnixCommon +++ b/configure/os/CONFIG.Common.UnixCommon @@ -38,7 +38,7 @@ SHRLIB_DEPLIBS = $(foreach lib,$(SHRLIB_LIBS),$(firstword $(wildcard \ $($(lib)_DIR)/$(LIB_PREFIX)$(lib).*))) SHRLIB_LDFLAGS = $(SHRLIB_LDFLAGS_$(strip $(SHARED_LIBRARIES))) -SHRLIB_LDLIBS = $($*_LIBS:%=-l%) $(SHRLIB_LIBS:%=-l%) \ +SHRLIB_LDLIBS = $($*_LDLIBS:%=-l%) $(SHRLIB_LIBS:%=-l%) \ $($*_SYS_LIBS:%=-l%) $(SYS_SHRLIB_LIBS:%=-l%) SHRLIB_DEPLIB_DIRS = $(dir $($*_DEPLIBS)) $(dir $(SHRLIB_DEPLIBS)) @@ -49,7 +49,7 @@ SHRLIB_LDFLAGS += $(sort $(SHRLIB_DEPLIB_DIRS:%=-L%)) PROD_DEPLIBS = $(foreach lib,$(PROD_LIBS) $(USR_LIBS),$(firstword $(wildcard \ $($(lib)_DIR)/$(LIB_PREFIX)$(lib).*))) -PROD_LDLIBS = $($*_LIBS:%=-l%) $(PROD_LIBS:%=-l%) $(USR_LIBS:%=-l%)\ +PROD_LDLIBS = $($*_LDLIBS:%=-l%) $(PROD_LIBS:%=-l%) $(USR_LIBS:%=-l%)\ $($*_SYS_LIBS:%=-l%) $(SYS_PROD_LIBS:%=-l%) PROD_DEPLIB_DIRS = $(dir $($*_DEPLIBS)) $(dir $(PROD_DEPLIBS)) diff --git a/configure/os/CONFIG.Common.vxWorksCommon b/configure/os/CONFIG.Common.vxWorksCommon index a2cb05015..0b44393a9 100644 --- a/configure/os/CONFIG.Common.vxWorksCommon +++ b/configure/os/CONFIG.Common.vxWorksCommon @@ -32,7 +32,7 @@ LIBNAME = $(BUILD_LIBRARY:%=$(LIB_PREFIX)%$(LIB_SUFFIX)) PROD_DEPLIBS = $(foreach lib,$(PROD_LIBS) $(USR_LIBS),$(firstword $(wildcard \ $($(lib)_DIR)/$(LIB_PREFIX)$(lib).*))) -PROD_LDLIBS = $($*_LIBS:%=-l%) $(PROD_LIBS:%=-l%) $(USR_LIBS:%=-l%)\ +PROD_LDLIBS = $($*_LDLIBS:%=-l%) $(PROD_LIBS:%=-l%) $(USR_LIBS:%=-l%)\ $($*_SYS_LIBS:%=-l%) $(SYS_PROD_LIBS:%=-l%) PROD_DEPLIB_DIRS = $(dir $($*_DEPLIBS)) $(dir $(PROD_DEPLIBS))