Revert wrong substitution of classes and sysutils subdirectories inside wildcard calls

This commit is contained in:
Pierre Muller 2023-09-26 18:23:06 +02:00
parent e8a03ac8bc
commit 541ba50269

View File

@ -992,7 +992,7 @@ ifeq ($(filter -dFPC_USE_LIBC,$(FPCOPT)),)
SYSUTILS_UNIX_DEPS+= $(SYSCALLUNIT)$(PPUEXT) SYSUTILS_UNIX_DEPS+= $(SYSCALLUNIT)$(PPUEXT)
endif endif
SYSUTILS_DEPS=$(SYSUTILSDIR)/sysutils.pp $(wildcard $(OBJPASDIR)/$(SYSUTILSUNIT)/*.inc) \ SYSUTILS_DEPS=$(SYSUTILSDIR)/sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.inc) \
$(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(SYSCONSTUNIT)$(PPUEXT) \ $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(SYSCONSTUNIT)$(PPUEXT) \
$(SYSUTILS_DEPS_OS) $(SYSUTILS_DEPS_CPU) $(SYSUTILS_DEPS_OS) $(SYSUTILS_DEPS_CPU)
@ -1005,7 +1005,7 @@ System.SysUtils$(PPUEXT) : $(NSINC)/System.SysUtils.pp $(SYSUTILS_DEPS)
# #
# Classes # Classes
# #
CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(wildcard $(OBJPASDIR)/$(CLASSESUNIT)/*.inc) \ CLASSES_DEPS=$(CLASSESDIR)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \
$(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) \ $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) \
$(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \ $(SYSUTILSUNIT)$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) \
$(FGLUNIT)$(PPUEXT) $(TYPESUNIT)$(PPUEXT) \ $(FGLUNIT)$(PPUEXT) $(TYPESUNIT)$(PPUEXT) \