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

build: standard-module Makefile.in use @srcdir@ substitution 

Switch the 21 standard modules from the defs.mak srcdir derivation to
configure-provided substitution (same template as tiles):
  srcdir   = @srcdir@
  VPATH    = @srcdir@
  MAGICDIR = @top_builddir@
defs.mak's dual-mode guard sees `srcdir` already set (origin=file) and
skips the srcdir derivation for these modules.

Verified out-of-tree: config.status writes srcdir=<src>/<mod> into each
build/<mod>/Makefile; `make modules libs` builds all 33 module libraries
(lib*.o + lib*.a, rc=0).

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

6
bplane/Makefile.in
View File

@ -3,7 +3,11 @@
#
MODULE = bplane
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 = bpDump.c bpUtils.c bpBins.c bpEnum.c bpMain.c bpStat.c
include ${MAGICDIR}/defs.mak

6
calma/Makefile.in
View File

@ -3,7 +3,11 @@
#
MODULE = calma
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 = CalmaRead.c CalmaRdcl.c CalmaRdio.c CalmaRdpt.c CalmaWrite.c CalmaWriteZ.c
include ${MAGICDIR}/defs.mak

6
cif/Makefile.in
View File

@ -3,7 +3,11 @@
#
MODULE = cif
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 = CIFgen.c CIFhier.c CIFmain.c CIFrdcl.c CIFrdpt.c CIFrdpoly.c \
CIFrdtech.c CIFrdutils.c CIFsee.c CIFtech.c CIFwrite.c

6
cmwind/Makefile.in
View File

@ -3,7 +3,11 @@
#
MODULE = cmwind
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 = CMWmain.c CMWcmmnds.c CMWundo.c CMWrgbhsv.c
include ${MAGICDIR}/defs.mak

6
dbwind/Makefile.in
View File

@ -3,7 +3,11 @@
#
MODULE = dbwind
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 = DBWcommands.c DBWdisplay.c DBWbuttons.c DBWelement.c \
DBWfdback.c DBWhlights.c DBWprocs.c DBWtools.c DBWundo.c

6
debug/Makefile.in
View File

@ -3,7 +3,11 @@
#
MODULE = debug
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 = debugFlags.c hist.c
include ${MAGICDIR}/defs.mak

6
drc/Makefile.in
View File

@ -3,7 +3,11 @@
#
MODULE = drc
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 = DRCarray.c DRCbasic.c DRCcif.c DRCcontin.c DRCmain.c \
DRCsubcell.c DRCtech.c DRCprint.c DRCextend.c

6
extflat/Makefile.in
View File

@ -3,7 +3,11 @@
#
MODULE = extflat
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 = EFargs.c EFbuild.c EFdef.c EFerr.c EFflat.c EFhier.c EFname.c \
EFread.c EFsym.c EFvisit.c EFantenna.c

6
extract/Makefile.in
View File

@ -3,7 +3,11 @@
#
MODULE = extract
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 = ExtArray.c ExtBasic.c ExtCell.c ExtCouple.c ExtHard.c \
ExtHier.c ExtLength.c ExtMain.c ExtNghbors.c ExtPerim.c \
ExtRegion.c ExtSubtree.c ExtTech.c ExtTest.c ExtTimes.c ExtYank.c \

6
garouter/Makefile.in
View File

@ -3,7 +3,11 @@
#
MODULE = garouter
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 = gaChannel.c gaMain.c gaMaze.c gaSimple.c gaStem.c \
gaTest.c

6
gcr/Makefile.in
View File

@ -3,7 +3,11 @@
#
MODULE = gcr
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 = gcrChannel.c gcrColl.c gcrDebug.c gcrEdge.c gcrFeas.c \
gcrFlags.c gcrInit.c gcrLib.c gcrRiver.c gcrRoute.c gcrShwFlgs.c \
gcrUnsplit.c

6
grouter/Makefile.in
View File

@ -3,7 +3,11 @@
#
MODULE = grouter
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 = grouteChan.c grouteCrss.c grouteDens.c grouteMain.c \
grouteMult.c grouteMaze.c groutePath.c groutePen.c grouteTest.c

6
irouter/Makefile.in
View File

@ -3,7 +3,11 @@
#
MODULE = irouter
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 = irCommand.c irMain.c irRoute.c irTestCmd.c irUtils.c
include ${MAGICDIR}/defs.mak

6
mzrouter/Makefile.in
View File

@ -3,7 +3,11 @@
#
MODULE = mzrouter
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 = mzBlock.c mzDebug.c mzEstimate.c mzXtndDown.c \
mzXtndLeft.c mzXtndRght.c mzXtndUp.c mzHint.c mzInit.c mzNumLine.c \
mzMain.c mzSearch.c mzStart.c mzSubrs.c mzTech.c mzTestCmd.c \

6
netmenu/Makefile.in
View File

@ -3,7 +3,11 @@
#
MODULE = netmenu
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 = NMbutton.c NMcmdAK.c NMcmdLZ.c NMlabel.c NMmain.c \
NMnetlist.c NMshowpt.c NMshowcell.c NMundo.c NMwiring.c

6
plow/Makefile.in
View File

@ -3,7 +3,11 @@
#
MODULE = plow
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 = PlowCmd.c PlowJogs.c PlowMain.c PlowQueue.c PlowRandom.c \
PlowRules1.c PlowRules2.c PlowRules3.c PlowSearch.c PlowTech.c \
PlowTest.c PlowWidth.c PlowYank.c

6
resis/Makefile.in
View File

@ -3,7 +3,11 @@
#
MODULE = resis
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 = ResMain.c ResJunct.c ResMakeRes.c ResSimple.c ResPrint.c \
ResReadExt.c ResRex.c ResBasic.c ResMerge.c ResChecks.c \
ResFract.c ResUtils.c ResDebug.c

6
select/Makefile.in
View File

@ -3,7 +3,11 @@
#
MODULE = select
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 = selCreate.c selDisplay.c selEnum.c selOps.c selUndo.c \
selUnselect.c

6
sim/Makefile.in
View File

@ -3,7 +3,11 @@
#
MODULE = sim
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 = SimDBstuff.c SimSelect.c SimRsim.c SimExtract.c
include ${MAGICDIR}/defs.mak

6
textio/Makefile.in
View File

@ -3,7 +3,11 @@
#
MODULE = textio
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 = txCommands.c txInput.c txMain.c txMore.c txOutput.c
include ${MAGICDIR}/defs.mak

6
wiring/Makefile.in
View File

@ -3,7 +3,11 @@
#
MODULE = wiring
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 = wireOps.c wireTech.c wireUndo.c
include ${MAGICDIR}/defs.mak