From 0184d31020fa3613a702e884c10317e51638c2cf Mon Sep 17 00:00:00 2001 From: "Janet B. Anderson" Date: Wed, 26 Jan 2000 22:49:45 +0000 Subject: [PATCH] Fixed OJBS build and some LIBRARY changes. --- configure/RULES_BUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure/RULES_BUILD b/configure/RULES_BUILD index fdcf638ac..086d981c7 100644 --- a/configure/RULES_BUILD +++ b/configure/RULES_BUILD @@ -99,7 +99,7 @@ LINK.c = $(LINK.cpp) # Only one LIBRARY_HOST allowed ifdef LIBRARY_HOST LIBSRCS_HOST+= $(SRCS) $(LIBSRCS) $($(addsuffix _SRCS,$(LIBRARY_HOST))) -ifneq ($($(addsuffix _SRCS_$(OS_CLASS),$(LIBRARY_HOST))),) +ifneq ($(strip $($(addsuffix _SRCS_$(OS_CLASS),$(LIBRARY_HOST)))),) LIBSRCS_HOST += $(subst -nil-,,$($(addsuffix _SRCS_$(OS_CLASS),$(LIBRARY_HOST)))) else LIBSRCS_HOST += $($(addsuffix _SRCS_DEFAULT,$(LIBRARY_HOST))) @@ -116,7 +116,7 @@ endif # LIBRARY_HOST # Only one LIBRARY_IOC allowed ifdef LIBRARY_IOC LIBSRCS_IOC+= $(SRCS) $(LIBSRCS) $($(addsuffix _SRCS,$(LIBRARY_IOC))) -ifneq ($($(addsuffix _SRCS_$(OS_CLASS),$(LIBRARY_IOC))),) +ifneq ($(strip $($(addsuffix _SRCS_$(OS_CLASS),$(LIBRARY_IOC)))),) LIBSRCS_IOC += $(subst -nil-,,$($(addsuffix _SRCS_$(OS_CLASS),$(LIBRARY_IOC)))) else LIBSRCS_IOC += $($(addsuffix _SRCS_DEFAULT,$(LIBRARY_IOC))) @@ -156,7 +156,7 @@ rebuild: clean install inc: $(INSTALL_INC) $(INSTALL_OSINC) -build: $(MENUS) $(RECTYPES) $(BPTS) \ +build: $(MENUS) $(RECTYPES) $(BPTS) $(OBJS) \ $(LIBTARGETS) $(PROD) $(TESTPROD) $(TARGETS) ifdef DBDEXPAND