luke
/
magic
mirror of https://github.com/RTimothyEdwards/magic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: near-standard + outlier Makefile.in use @srcdir@ 

Switch the 13 near-standard/outlier modules to configure-provided
substitution (same template as the standard modules):
  srcdir   = @srcdir@
  VPATH    = @srcdir@
  MAGICDIR = @top_builddir@
Their sibling-object refs (${MAGICDIR}/<mod>/lib*.o) and custom rules are
unchanged: ${MAGICDIR} = @top_builddir@ (the build top) so the sibling
objects resolve into the build tree, and $(srcdir) now comes from
@srcdir@ instead of the derivation.

Verified out-of-tree: `make modules libs` builds all 33 module libraries;
the five Tcl auto-load libraries (magiclef.so, tclplot.so, tclroute.so,
exttospice.so, exttosim.so) link (sibling refs resolve to the build top).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Darryl L. Miles 2026-07-22 17:30:32 +00:00 committed by R. Timothy Edwards
parent fe70666b0c
commit a560226757
13 changed files with 65 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
commands/Makefile.in
View File

@ -3,7 +3,11 @@
#
MODULE = commands
MAGICDIR = ..
# Provided by configure: the module's source dir + the build top.
# defs.mak sees `srcdir` already set and skips its own srcdir derivation.
srcdir = @srcdir@
VPATH = @srcdir@
MAGICDIR = @top_builddir@
SRCS = CmdSubrs.c CmdAB.c CmdCD.c CmdE.c CmdFI.c \
CmdLQ.c CmdRS.c CmdTZ.c CmdWizard.c CmdAuto.c

6
database/Makefile.in
View File

@ -3,7 +3,11 @@
#
MODULE = database
MAGICDIR = ..
# Provided by configure: the module's source dir + the build top.
# defs.mak sees `srcdir` already set and skips its own srcdir derivation.
srcdir = @srcdir@
VPATH = @srcdir@
MAGICDIR = @top_builddir@
LIB_SRCS =
SRCS = DBbound.c DBcell.c DBcellbox.c DBcellcopy.c \
DBcellname.c DBcellsrch.c DBcellsel.c DBcellsubr.c \

6
ext2sim/Makefile.in
View File

@ -3,7 +3,11 @@
#
MODULE = ext2sim
MAGICDIR = ..
# Provided by configure: the module's source dir + the build top.
# defs.mak sees `srcdir` already set and skips its own srcdir derivation.
srcdir = @srcdir@
VPATH = @srcdir@
MAGICDIR = @top_builddir@
SRCS = ext2sim.c
EXTRA_LIBS = ${MAGICDIR}/extflat/libextflat.o ${MAGICDIR}/utils/libutils.a

6
ext2spice/Makefile.in
View File

@ -3,7 +3,11 @@
#
MODULE = ext2spice
MAGICDIR = ..
# Provided by configure: the module's source dir + the build top.
# defs.mak sees `srcdir` already set and skips its own srcdir derivation.
srcdir = @srcdir@
VPATH = @srcdir@
MAGICDIR = @top_builddir@
SRCS = ext2spice.c ext2hier.c
EXTRA_LIBS = ${MAGICDIR}/extflat/libextflat.o ${MAGICDIR}/utils/libutils.a

6
extcheck/Makefile.in
View File

@ -3,7 +3,11 @@
#
MODULE = extcheck
MAGICDIR = ..
# Provided by configure: the module's source dir + the build top.
# defs.mak sees `srcdir` already set and skips its own srcdir derivation.
srcdir = @srcdir@
VPATH = @srcdir@
MAGICDIR = @top_builddir@
SRCS = extcheck.c
EXTRA_LIBS = ${MAGICDIR}/extflat/libextflat.o ${MAGICDIR}/utils/libutils.a

6
graphics/Makefile.in
View File

@ -3,7 +3,11 @@
#
MODULE = graphics
MAGICDIR = ..
# Provided by configure: the module's source dir + the build top.
# defs.mak sees `srcdir` already set and skips its own srcdir derivation.
srcdir = @srcdir@
VPATH = @srcdir@
MAGICDIR = @top_builddir@
BASE_SRCS = grMain.c grLock.c grDStyle.c grText.c grCMap.c grClip.c \
grGlyphs.c grNull.c
X11_SRCS = grX11su1.c grX11su2.c grX11su3.c grX11su4.c grX11su5.c

6
lef/Makefile.in
View File

@ -3,7 +3,11 @@
#
MODULE = lef
MAGICDIR = ..
# Provided by configure: the module's source dir + the build top.
# defs.mak sees `srcdir` already set and skips its own srcdir derivation.
srcdir = @srcdir@
VPATH = @srcdir@
MAGICDIR = @top_builddir@
SRCS = lefCmd.c lefTech.c lefWrite.c defWrite.c lefRead.c defRead.c
include ${MAGICDIR}/defs.mak

6
net2ir/Makefile.in
View File

@ -3,7 +3,11 @@
#
MODULE = net2ir
MAGICDIR = ..
# Provided by configure: the module's source dir + the build top.
# defs.mak sees `srcdir` already set and skips its own srcdir derivation.
srcdir = @srcdir@
VPATH = @srcdir@
MAGICDIR = @top_builddir@
SRCS = net2ir.c
EXTRA_LIBS = ${MAGICDIR}/utils/libutils.a

6
oa/Makefile.in
View File

@ -3,7 +3,11 @@
#
MODULE = oa
MAGICDIR = ..
# Provided by configure: the module's source dir + the build top.
# defs.mak sees `srcdir` already set and skips its own srcdir derivation.
srcdir = @srcdir@
VPATH = @srcdir@
MAGICDIR = @top_builddir@
SRCS = oa.c
CXXSRCS = magicInit.cpp magicOA.cpp

6
plot/Makefile.in
View File

@ -3,7 +3,11 @@
#
MODULE = plot
MAGICDIR = ..
# Provided by configure: the module's source dir + the build top.
# defs.mak sees `srcdir` already set and skips its own srcdir derivation.
srcdir = @srcdir@
VPATH = @srcdir@
MAGICDIR = @top_builddir@
SRCS = plotCmd.c plotGremln.c plotHP.c plotPS.c plotMain.c plotRutils.c \
plotVers.c plotPixels.c plotPNM.c

6
router/Makefile.in
View File

@ -3,7 +3,11 @@
#
MODULE = router
MAGICDIR = ..
# Provided by configure: the module's source dir + the build top.
# defs.mak sees `srcdir` already set and skips its own srcdir derivation.
srcdir = @srcdir@
VPATH = @srcdir@
MAGICDIR = @top_builddir@
SRCS = rtrCmd.c rtrMain.c rtrDcmpose.c rtrFdback.c rtrHazards.c \
rtrChannel.c rtrPaint.c rtrPin.c rtrSide.c rtrStem.c rtrTech.c \
rtrVia.c rtrTravers.c

6
utils/Makefile.in
View File

@ -3,7 +3,11 @@
#
MODULE = utils
MAGICDIR = ..
# Provided by configure: the module's source dir + the build top.
# defs.mak sees `srcdir` already set and skips its own srcdir derivation.
srcdir = @srcdir@
VPATH = @srcdir@
MAGICDIR = @top_builddir@
LIB_SRCS = LIBdbio.c LIBmain.c LIBtextio.c
SRCS = args.c child.c dqueue.c finddisp.c flock.c flsbuf.c fraction.c \
geometry.c getrect.c hash.c heap.c ihash.c list.c lookup.c \

6
windows/Makefile.in
View File

@ -3,7 +3,11 @@
#
MODULE = windows
MAGICDIR = ..
# Provided by configure: the module's source dir + the build top.
# defs.mak sees `srcdir` already set and skips its own srcdir derivation.
srcdir = @srcdir@
VPATH = @srcdir@
MAGICDIR = @top_builddir@
SRCS = windClient.c windCmdAM.c windCmdNR.c windCmdSZ.c \
windSend.c windDebug.c windDisp.c windMain.c windMove.c \
windSearch.c windTrans.c windView.c