<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-legacy-support.
</pre>
<p><a href="https://github.com/macports/macports-legacy-support/commit/7fe2c97694ffe478ca1c688511e3851f9908fd4c">https://github.com/macports/macports-legacy-support/commit/7fe2c97694ffe478ca1c688511e3851f9908fd4c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 7fe2c97694ffe478ca1c688511e3851f9908fd4c
</span>Author: Fred Wright <fw@fwright.net>
AuthorDate: Wed May 28 12:54:59 2025 -0700
<span style='display:block; white-space:pre;color:#404040;'> Makefile: Remove obsolete MULTISRC.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This was a leftover from the old multi-variant kludge, which was
</span><span style='display:block; white-space:pre;color:#404040;'> removed a while back.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> TESTED:
</span><span style='display:block; white-space:pre;color:#404040;'> Builds still work.
</span>---
Makefile | 25 ++++++++++---------------
1 file changed, 10 insertions(+), 15 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/Makefile b/Makefile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1a5a605..72e207b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/Makefile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/Makefile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -99,20 +99,15 @@ FIND_LIBHEADERS := find $(SRCINCDIR) -type f \( -name '*.h' -o \
</span> LIBHEADERS := $(shell $(FIND_LIBHEADERS))
ALLHEADERS := $(LIBHEADERS) $(wildcard $(SRCDIR)/*.h)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-MULTISRCS :=
</span> ADDSRCS := $(SRCDIR)/add_symbols.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-LIBSRCS := $(filter-out $(MULTISRCS) $(ADDSRCS),$(wildcard $(SRCDIR)/*.c))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+LIBSRCS := $(filter-out $(ADDSRCS),$(wildcard $(SRCDIR)/*.c))
</span>
DLIBOBJEXT = .dl.o
SLIBOBJEXT = .o
DLIBOBJS := $(patsubst %.c,%$(DLIBOBJEXT),$(LIBSRCS))
<span style='display:block; white-space:pre;background:#ffe0e0;'>-MULTIDLIBOBJS := $(patsubst %.c,%$(DLIBOBJEXT),$(MULTISRCS))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-ALLDLIBOBJS := $(DLIBOBJS) $(MULTIDLIBOBJS)
</span> SLIBOBJS := $(patsubst %.c,%$(SLIBOBJEXT),$(LIBSRCS))
<span style='display:block; white-space:pre;background:#ffe0e0;'>-MULTISLIBOBJS := $(patsubst %.c,%$(SLIBOBJEXT),$(MULTISRCS))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-ALLSLIBOBJS := $(SLIBOBJS) $(MULTISLIBOBJS)
</span> ADDOBJS := $(patsubst %.c,%$(SLIBOBJEXT),$(ADDSRCS))
<span style='display:block; white-space:pre;background:#ffe0e0;'>-ALLSYSLIBOBJS := $(ALLDLIBOBJS) $(ADDOBJS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+SYSLIBOBJS := $(DLIBOBJS) $(ADDOBJS)
</span>
# Man pages
SRCMAN3S := $(wildcard $(SRCDIR)/*.3)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -246,18 +241,18 @@ $(SLIBOBJS): %$(SLIBOBJEXT): %.c $(ALLHEADERS)
</span> $(ADDOBJS): %$(SLIBOBJEXT): %.c $(ALLHEADERS)
$(CC) -c -I$(SRCINCDIR) $(ALLCFLAGS) $(SLIBCFLAGS) $< -o $@
<span style='display:block; white-space:pre;background:#ffe0e0;'>-dlibobjs: $(ALLDLIBOBJS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+dlibobjs: $(DLIBOBJS)
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-syslibobjs: $(ALLSYSLIBOBJS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+syslibobjs: $(SYSLIBOBJS)
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-slibobjs: $(ALLSLIBOBJS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+slibobjs: $(SLIBOBJS)
</span>
allobjs: dlibobjs slibobjs syslibobjs
# Create a list of nonempty static object files.
# Since completely empty archives are illegal, we use our dummy if there
# would otherwise be no objects.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-$(SOBJLIST): $(ALLSLIBOBJS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+$(SOBJLIST): $(SLIBOBJS)
</span> $(CC) -c $(ALLCFLAGS) $(SLIBCFLAGS) -xc /dev/null -o $(EMPTYSOBJ)
$(CC) -c $(ALLCFLAGS) $(SLIBCFLAGS) -xc $(DUMMYSRC) -o $(DUMMYOBJ)
for f in $^; do cmp -s $(EMPTYSOBJ) $$f || echo $$f; done > $@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -268,12 +263,12 @@ $(BUILDLIBDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(BINDIR) \
</span> $(DESTDIR)$(MAN1DIR) $(DESTDIR)$(MAN3DIR) $(TEST_TEMP):
$(MKINSTALLDIRS) $@
<span style='display:block; white-space:pre;background:#ffe0e0;'>-$(BUILDDLIBPATH): $(ALLDLIBOBJS) | $(BUILDLIBDIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CC) $(BUILDDLIBFLAGS) $(ALLLDFLAGS) $(ALLDLIBOBJS) -o $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+$(BUILDDLIBPATH): $(DLIBOBJS) | $(BUILDLIBDIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CC) $(BUILDDLIBFLAGS) $(ALLLDFLAGS) $(DLIBOBJS) -o $@
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-$(BUILDSYSLIBPATH): $(ALLSYSLIBOBJS) | $(BUILDLIBDIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+$(BUILDSYSLIBPATH): $(SYSLIBOBJS) | $(BUILDLIBDIR)
</span> $(CC) $(BUILDSYSLIBFLAGS) $(ALLLDFLAGS) $(SYSREEXPORTFLAG) \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $(ALLSYSLIBOBJS) -o $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(SYSLIBOBJS) -o $@
</span>
$(BUILDSLIBPATH): $(SOBJLIST) | $(BUILDLIBDIR)
$(RM) $@
</pre><pre style='margin:0'>
</pre>