diff options
Diffstat (limited to 'include/makeinclude/rules.lib.GNU')
| -rw-r--r-- | include/makeinclude/rules.lib.GNU | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/include/makeinclude/rules.lib.GNU b/include/makeinclude/rules.lib.GNU index 14b8ea5e2e2..bd7fea06c6d 100644 --- a/include/makeinclude/rules.lib.GNU +++ b/include/makeinclude/rules.lib.GNU @@ -11,33 +11,32 @@ #---------------------------------------------------------------------------- ifndef OBJEXT - OBJEXT=o +OBJEXT=o endif ifndef SOEXT - SOEXT=so +SOEXT=so endif VSHLIB = $(SHLIB:%.$(SOEXT)=%$(VAR).$(SOEXT)) VLOBJS = $(subst .cpp,.$(OBJEXT),$(foreach file,$(LSRC),$(VDIR)$(notdir $(file)))) ifdef TEMPINCDIR - VSHOBJS1 = -else # ! TEMPINCDIR - LSRC += $(LSRC2) +VSHOBJS1 = +else +LSRC += $(LSRC2) ifdef PRELIB ifdef PRELIB_USES_OBJ_ONLY - VSHOBJS = $(subst .cpp,.o,$(foreach file,$(LSRC),$(VSHDIR)$(notdir $(file)))) -else # ! PRELIB_USES_OBJ_ONLY - VSHOBJS = $(subst .cpp,.o,$(foreach file,$(LSRC),$(VSHDIR)$(notdir $(file)))) -endif # ! PRELIB_USES_OBJ_ONLY - VSHOBJS1 = $(VSHOBJS) -else # ! PRELIB - VSHOBJS = $(subst .cpp,.o,$(foreach file,$(LSRC),$(VSHDIR)$(notdir $(file)))) - VSHOBJS1 = \ - $(subst .cpp,.o,$(foreach file,$(LSRC),$(VSHDIR)$(notdir $(file)))) -endif # ! PRELIB -endif # ! TEMPINCDIR +VSHOBJS = $(subst .cpp,.o,$(foreach file,$(LSRC),$(VSHDIR)$(notdir $(file)))) +else +VSHOBJS = $(subst .cpp,.o,$(foreach file,$(LSRC),$(VSHDIR)$(notdir $(file)))) +endif +VSHOBJS1 = $(VSHOBJS) +else +VSHOBJS = $(subst .cpp,.o,$(foreach file,$(LSRC),$(VSHDIR)$(notdir $(file)))) +VSHOBJS1 = $(subst .cpp,.o,$(foreach file,$(LSRC),$(VSHDIR)$(notdir $(file)))) +endif +endif # Comment out for now... # $(DEFS:%=$(INSINC)/%) \ |