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

magic/Makefile: MAGIC_BUILDDATE and inherit values when possible 

Went the whole way and make it inherit from toplevel Makefile.
This commit is contained in:
Darryl L. Miles 2024-10-16 18:08:50 +01:00 committed by R. Timothy Edwards
parent 4e7396162d
commit 2a78de8cb9
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
magic/Makefile
View File

@ -32,8 +32,7 @@ EXTRA_LIBS = ${MAGICDIR}/bplane/libbplane.o \
BITMAPS = up.gif down.gif left.gif right.gif zoom.gif lock.xbm
DEST_XBM = $(BITMAPS:%=$(DESTDIR)${INSTALL_TCLDIR}/bitmaps/%)
# DFLAGS += -DMAGIC_DATE="\"`date`\"" -DCAD_DIR="${LIBDIR}"
DFLAGS += -DMAGIC_DATE="\"`date`\""
# DFLAGS += -DCAD_DIR="${LIBDIR}"
LIBS += ${GR_LIBS} ${READLINE_LIBS} -lm ${LD_EXTRA_LIBS} \
${OA_LIBS} ${ZLIB_FLAG} ${TOP_EXTRA_LIBS}
CLEANS += tclmagic${SHDLIB_EXT} libtclmagic${SHDLIB_EXT}.a proto.magicrc

2
magic/magicTop.c
View File

@ -63,4 +63,4 @@ main(int argc, char *argv[])
char *MagicVersion = MAGIC_VERSION;
char *MagicRevision = MAGIC_REVISION;
char *MagicCompileTime = MAGIC_DATE;
char *MagicCompileTime = MAGIC_BUILDDATE;

16
scripts/defs.mak.in
View File

@ -75,16 +75,24 @@ LIB_SPECS_NOSTUB = @LIB_SPECS_NOSTUB@
LIB_SPECS_GRNULL = @LIB_SPECS_GRNULL@
WISH_EXE = @WISH_EXE@
TCL_LIB_DIR = @TCL_LIB_DIR@
MAGIC_VERSION = $(shell cat ${MAGICDIR}/VERSION | cut -d. -f1-2)
MAGIC_REVISION = $(shell cat ${MAGICDIR}/VERSION | cut -d. -f3)
MAGIC_COMMIT = $(shell git rev-parse HEAD)
MAGIC_VERSION ?= $(shell cat ${MAGICDIR}/VERSION | cut -d. -f1-2)
MAGIC_REVISION ?= $(shell cat ${MAGICDIR}/VERSION | cut -d. -f3)
MAGIC_COMMIT ?= $(shell git rev-parse HEAD)
MAGIC_BUILDDATE ?= $(shell date | tr -d '\r\n')
# This allow inheritence of the values from toplevel Makefile
export MAGIC_VERSION
export MAGIC_REVISION
export MAGIC_COMMIT
export MAGIC_BUILDDATE
CC = @CC@
CPP = @CPP@
CXX = @CXX@
CPPFLAGS = -I${MAGICDIR} @CPPFLAGS@
DFLAGS_MAGICVERSION = -DMAGIC_VERSION=\"${MAGIC_VERSION}\" -DMAGIC_REVISION=\"${MAGIC_REVISION}\" -DMAGIC_COMMIT=\"${MAGIC_COMMIT}\"
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 += -DSHDLIB_EXT=\"@SHDLIB_EXT@\" -DNDEBUG
DFLAGS_NOSTUB = @extra_defs@ @DEFS@ ${DFLAGS_MAGICVERSION} -DGCORE=\"@GCORE@\"

2
tcltk/tclmagic.c
View File

@ -54,7 +54,7 @@
char *MagicVersion = MAGIC_VERSION;
char *MagicRevision = MAGIC_REVISION;
char *MagicCompileTime = MAGIC_DATE;
char *MagicCompileTime = MAGIC_BUILDDATE;
#if TCL_MAJOR_VERSION < 9
const char *Tclmagic_InitStubsVersion = "8.5";