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

Makefile: LDFLAGS autoconf propagation 

Also fixed up CC/CXX/CXXFLAGS in the same way.

Main notable concern the tclmagic.so now has reordered position of
$LDFLAGS (was start AND end of list, now start of list only),
$LDDL_FLAGS would have already provided it start of list, so it
would be duplicated set of options.

@LDDL_FLAGS@ no longer prepend $LDFLAGS which is now explicit in the
Makefile to allow specific target control.

The purpose of all this is the toplevel ./configure now has LDFLAGS
control passed down to linker command lines as configure --help
indicates.
This commit is contained in:
Darryl L. Miles 2026-07-20 15:21:56 +01:00
parent efb6ace6a6
commit d2ab22897b
8 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext2sim/Makefile
View File

@ -33,7 +33,7 @@ simwrap.o: ext2sim.c
exttosim${SHDLIB_EXT}: simwrap.o ${MAGICDIR}/extflat/libextflat.o exttosim${SHDLIB_EXT}: simwrap.o ${MAGICDIR}/extflat/libextflat.o
@echo --- making exttosim Tcl library \(exttosim${SHDLIB_EXT}\) @echo --- making exttosim Tcl library \(exttosim${SHDLIB_EXT}\)
${RM} exttosim${SHDLIB_EXT} ${RM} exttosim${SHDLIB_EXT}
${CC} ${CFLAGS} ${CPPFLAGS} -o $@ ${LDDL_FLAGS} simwrap.o \ ${CC} ${CFLAGS} ${CPPFLAGS} -o $@ ${LDFLAGS} ${LDDL_FLAGS} simwrap.o \
${MAGICDIR}/extflat/libextflat.o ${LD_SHARED} ${LD_FIRST_LIBS} -lc ${LIBS} ${MAGICDIR}/extflat/libextflat.o ${LD_SHARED} ${LD_FIRST_LIBS} -lc ${LIBS}
install: $(DESTDIR)${INSTALL_BINDIR}/${MODULE}${EXEEXT} install: $(DESTDIR)${INSTALL_BINDIR}/${MODULE}${EXEEXT}

2
ext2spice/Makefile
View File

@ -29,7 +29,7 @@ ext2spice_main.o: ext2spice.c
exttospice${SHDLIB_EXT}: spicewrap.o spicehier.o ${MAGICDIR}/extflat/libextflat.o exttospice${SHDLIB_EXT}: spicewrap.o spicehier.o ${MAGICDIR}/extflat/libextflat.o
@echo --- making exttospice Tcl library \(exttospice${SHDLIB_EXT}\) @echo --- making exttospice Tcl library \(exttospice${SHDLIB_EXT}\)
${RM} exttospice${SHDLIB_EXT} ${RM} exttospice${SHDLIB_EXT}
${CC} ${CFLAGS} ${CPPFLAGS} -o $@ ${LDDL_FLAGS} spicewrap.o spicehier.o \ ${CC} ${CFLAGS} ${CPPFLAGS} -o $@ ${LDFLAGS} ${LDDL_FLAGS} spicewrap.o spicehier.o \
${MAGICDIR}/extflat/libextflat.o ${LD_SHARED} -lc ${LIBS} ${MAGICDIR}/extflat/libextflat.o ${LD_SHARED} -lc ${LIBS}
install: $(DESTDIR)${INSTALL_BINDIR}/${MODULE}${EXEEXT} $(DESTDIR)${INSTALL_BINDIR}/spice2sim install: $(DESTDIR)${INSTALL_BINDIR}/${MODULE}${EXEEXT} $(DESTDIR)${INSTALL_BINDIR}/spice2sim

2
lef/Makefile
View File

@ -19,7 +19,7 @@ tcllef.o: tcllef.c
magiclef${SHDLIB_EXT}: tcllef.o ${OBJS} magiclef${SHDLIB_EXT}: tcllef.o ${OBJS}
@echo --- making Tcl auto-load module \(magiclef${SHDLIB_EXT}\) @echo --- making Tcl auto-load module \(magiclef${SHDLIB_EXT}\)
${RM} magiclef${SHDLIB_EXT} ${RM} magiclef${SHDLIB_EXT}
${CC} ${CFLAGS} ${CPPFLAGS} -o $@ ${LDDL_FLAGS} tcllef.o ${OBJS} \ ${CC} ${CFLAGS} ${CPPFLAGS} -o $@ ${LDFLAGS} ${LDDL_FLAGS} tcllef.o ${OBJS} \
${EXTRA_LIBS} -lc ${LIBS} ${EXTRA_LIBS} -lc ${LIBS}
install-tcl: $(DESTDIR)${INSTALL_TCLDIR}/magiclef${SHDLIB_EXT} install-tcl: $(DESTDIR)${INSTALL_TCLDIR}/magiclef${SHDLIB_EXT}

4
magic/Makefile
View File

@ -76,9 +76,9 @@ tcl-main: tclmagic${SHDLIB_EXT} proto.magicrc
tclmagic${SHDLIB_EXT}: ${EXTRA_LIBS} tclmagic${SHDLIB_EXT}: ${EXTRA_LIBS}
@echo --- making magic Tcl library \(tclmagic${SHDLIB_EXT}\) @echo --- making magic Tcl library \(tclmagic${SHDLIB_EXT}\)
${RM} tclmagic${SHDLIB_EXT} ${RM} tclmagic${SHDLIB_EXT}
${CC} ${CFLAGS} ${CPPFLAGS} -o $@ ${LDDL_FLAGS} ${LD_RUN_PATH} \ ${CC} ${CFLAGS} ${CPPFLAGS} -o $@ ${LDFLAGS} ${LDDL_FLAGS} ${LD_RUN_PATH} \
${LD_FIRST_LIBS} ${EXTRA_LIBS} ${LD_EXTRA_LIBS} \ ${LD_FIRST_LIBS} ${EXTRA_LIBS} ${LD_EXTRA_LIBS} \
-lc ${LIBS} ${LIB_SPECS} ${LDFLAGS} -lc ${LIBS} ${LIB_SPECS}
proto.magicrc: proto.magicrc.in proto.magicrc: proto.magicrc.in
${MCPP} ${GR_DFLAGS} ${DFLAGS} proto.magicrc.in > proto.magicrc ${MCPP} ${GR_DFLAGS} ${DFLAGS} proto.magicrc.in > proto.magicrc

2
plot/Makefile
View File

@ -25,7 +25,7 @@ tclplot.o: tclplot.c
tclplot${SHDLIB_EXT}: tclplot.o ${OBJS} tclplot${SHDLIB_EXT}: tclplot.o ${OBJS}
@echo --- making Tcl auto-load module \(tclplot${SHDLIB_EXT}\) @echo --- making Tcl auto-load module \(tclplot${SHDLIB_EXT}\)
${RM} tclplot${SHDLIB_EXT} ${RM} tclplot${SHDLIB_EXT}
${CC} ${CFLAGS} ${CPPFLAGS} -o $@ ${LDDL_FLAGS} tclplot.o ${OBJS} \ ${CC} ${CFLAGS} ${CPPFLAGS} -o $@ ${LDFLAGS} ${LDDL_FLAGS} tclplot.o ${OBJS} \
${EXTRA_LIBS} -lc ${LIBS} ${EXTRA_LIBS} -lc ${LIBS}
install-tcl: $(DESTDIR)${INSTALL_TCLDIR}/tclplot${SHDLIB_EXT} install-tcl: $(DESTDIR)${INSTALL_TCLDIR}/tclplot${SHDLIB_EXT}

2
router/Makefile
View File

@ -25,7 +25,7 @@ tclroute.o: tclroute.c
tclroute${SHDLIB_EXT}: tclroute.o ${OBJS} tclroute${SHDLIB_EXT}: tclroute.o ${OBJS}
@echo --- making Tcl auto-load module \(tclroute${SHDLIB_EXT}\) @echo --- making Tcl auto-load module \(tclroute${SHDLIB_EXT}\)
${RM} tclroute${SHDLIB_EXT} ${RM} tclroute${SHDLIB_EXT}
${CC} ${CFLAGS} ${CPPFLAGS} -o $@ ${LDDL_FLAGS} tclroute.o ${OBJS} \ ${CC} ${CFLAGS} ${CPPFLAGS} -o $@ ${LDFLAGS} ${LDDL_FLAGS} tclroute.o ${OBJS} \
${EXTRA_LIBS} -lc ${LIBS} ${EXTRA_LIBS} -lc ${LIBS}
install-tcl: $(DESTDIR)${TCLDIR}/tclroute${SHDLIB_EXT} install-tcl: $(DESTDIR)${TCLDIR}/tclroute${SHDLIB_EXT}

6
scripts/configure.in
View File

@ -1946,10 +1946,14 @@ AC_SUBST(X_CFLAGS)
AC_SUBST(X_EXTRA_LIBS) AC_SUBST(X_EXTRA_LIBS)
AC_SUBST(X_LIBS) AC_SUBST(X_LIBS)
AC_SUBST(X_PRE_LIBS) AC_SUBST(X_PRE_LIBS)
AC_SUBST(CPPFLAGS) AC_SUBST(CC)
AC_SUBST(CFLAGS) AC_SUBST(CFLAGS)
AC_SUBST(CPPFLAGS)
AC_SUBST(CXX)
AC_SUBST(CXXFLAGS)
AC_SUBST(DEPEND_FLAG) AC_SUBST(DEPEND_FLAG)
AC_SUBST(SHLIB_CFLAGS) AC_SUBST(SHLIB_CFLAGS)
AC_SUBST(LDFLAGS)
AC_SUBST(LD_RUN_PATH) AC_SUBST(LD_RUN_PATH)
AC_SUBST(MCPP) AC_SUBST(MCPP)
AC_SUBST(MSED) AC_SUBST(MSED)

5
scripts/defs.mak.in
View File

@ -71,7 +71,7 @@ MSED = @MSED@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
SHDLIB_EXT = @SHDLIB_EXT@ SHDLIB_EXT = @SHDLIB_EXT@
ZLIB_FLAG = @ZLIB_FLAG@ ZLIB_FLAG = @ZLIB_FLAG@
LDDL_FLAGS = ${LDFLAGS} @LDDL_FLAGS@ LDDL_FLAGS = @LDDL_FLAGS@
LD_RUN_PATH = @LD_RUN_PATH@ LD_RUN_PATH = @LD_RUN_PATH@
LIB_SPECS = @LIB_SPECS@ LIB_SPECS = @LIB_SPECS@
LIB_SPECS_NOSTUB = @LIB_SPECS_NOSTUB@ LIB_SPECS_NOSTUB = @LIB_SPECS_NOSTUB@
@ -112,6 +112,7 @@ CXX = @CXX@
#FEATURE_FLAGS += -DSUPPORT_REMOVE_MALLOC_LEGACY #FEATURE_FLAGS += -DSUPPORT_REMOVE_MALLOC_LEGACY
CPPFLAGS = -I${MAGICDIR} @CPPFLAGS@ CPPFLAGS = -I${MAGICDIR} @CPPFLAGS@
CXXFLAGS = @CXXFLAGS@
DFLAGS_MAGICVERSION = -DMAGIC_VERSION=\"${MAGIC_VERSION}\" -DMAGIC_REVISION=\"${MAGIC_REVISION}\" -DMAGIC_COMMIT=\"${MAGIC_COMMIT}\" "-DMAGIC_BUILDDATE=\"${MAGIC_BUILDDATE}\"" DFLAGS_MAGICVERSION = -DMAGIC_VERSION=\"${MAGIC_VERSION}\" -DMAGIC_REVISION=\"${MAGIC_REVISION}\" -DMAGIC_COMMIT=\"${MAGIC_COMMIT}\" "-DMAGIC_BUILDDATE=\"${MAGIC_BUILDDATE}\""
DFLAGS = @extra_defs@ @stub_defs@ @DEFS@ ${DFLAGS_MAGICVERSION} -DGCORE=\"@GCORE@\" DFLAGS = @extra_defs@ @stub_defs@ @DEFS@ ${DFLAGS_MAGICVERSION} -DGCORE=\"@GCORE@\"
DFLAGS += -DSHDLIB_EXT=\"@SHDLIB_EXT@\" @NDEBUG_defs@ @DEBUG_defs@ ${FEATURE_FLAGS} DFLAGS += -DSHDLIB_EXT=\"@SHDLIB_EXT@\" @NDEBUG_defs@ @DEBUG_defs@ ${FEATURE_FLAGS}
@ -119,6 +120,8 @@ DFLAGS_NOSTUB = @extra_defs@ @DEFS@ ${DFLAGS_MAGICVERSION} -D
DFLAGS_NOSTUB += -DSHDLIB_EXT=\"@SHDLIB_EXT@\" @NDEBUG_defs@ @DEBUG_defs@ ${FEATURE_FLAGS} DFLAGS_NOSTUB += -DSHDLIB_EXT=\"@SHDLIB_EXT@\" @NDEBUG_defs@ @DEBUG_defs@ ${FEATURE_FLAGS}
CFLAGS = @CFLAGS@ @SHLIB_CFLAGS@ @INC_SPECS@ CFLAGS = @CFLAGS@ @SHLIB_CFLAGS@ @INC_SPECS@
LDFLAGS = @LDFLAGS@
READLINE_DEFS = @rl_defs@ READLINE_DEFS = @rl_defs@
READLINE_LIBS = @rl_libs@ READLINE_LIBS = @rl_libs@