From e320d14b7279e0de4e519c43c54e46a1191e53fe Mon Sep 17 00:00:00 2001 From: coryan Date: Fri, 26 Jan 2001 17:34:28 +0000 Subject: ChangeLogTag:Fri Jan 26 09:33:20 2001 Carlos O'Ryan --- include/makeinclude/rules.lib.GNU | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to 'include') diff --git a/include/makeinclude/rules.lib.GNU b/include/makeinclude/rules.lib.GNU index 277e6f23bf6..5e9b2a531d1 100644 --- a/include/makeinclude/rules.lib.GNU +++ b/include/makeinclude/rules.lib.GNU @@ -15,20 +15,29 @@ ifdef SHLIBA VSHLIBA = $(SHLIBA:%.$(LIBEXT)=%$(VAR).$(LIBEXT)) endif -VLOBJS = $(subst .cpp,.$(OBJEXT),$(foreach file,$(LSRC),$(VDIR)$(notdir $(file)))) +VLOBJS = $(subst .c,.$(OBJEXT), \ + $(subst .cpp,.$(OBJEXT), \ + $(foreach file,$(LSRC),$(VDIR)$(notdir $(file))))) LSRC += $(LSRC2) ifdef PRELIB ifdef PRELIB_USES_OBJ_ONLY - VSHOBJS = $(subst .cpp,.$(OBJEXT),$(foreach file,$(LSRC),$(VSHDIR)$(notdir $(file)))) + VSHOBJS = $(subst .c,.$(OBJEXT), \ + $(subst .cpp,.$(OBJEXT), \ + $(foreach file,$(LSRC),$(VSHDIR)$(notdir $(file))))) else # ! PRELIB_USES_OBJ_ONLY - VSHOBJS = $(subst .cpp,.$(OBJEXT),$(foreach file,$(LSRC),$(VSHDIR)$(notdir $(file)))) + VSHOBJS = $(subst .c,.$(OBJEXT), \ + $(subst .cpp,.$(OBJEXT), \ + $(foreach file,$(LSRC),$(VSHDIR)$(notdir $(file))))) endif # ! PRELIB_USES_OBJ_ONLY VSHOBJS1 = $(VSHOBJS) else # ! PRELIB - VSHOBJS = $(subst .cpp,.$(OBJEXT),$(foreach file,$(LSRC),$(VSHDIR)$(notdir $(file)))) - VSHOBJS1 = \ - $(subst .cpp,.$(OBJEXT),$(foreach file,$(LSRC),$(VSHDIR)$(notdir $(file)))) + VSHOBJS = $(subst .c,.$(OBJEXT), \ + $(subst .cpp,.$(OBJEXT), \ + $(foreach file,$(LSRC),$(VSHDIR)$(notdir $(file))))) + VSHOBJS1 = $(subst .c,.$(OBJEXT), \ + $(subst .cpp,.$(OBJEXT), \ + $(foreach file,$(LSRC),$(VSHDIR)$(notdir $(file))))) endif # ! PRELIB # Comment out for now... -- cgit v1.2.1