luke/magic
1
0
Fork 0
mirror of https://github.com/RTimothyEdwards/magic.git synced 2026-09-04 08:33:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

magic/Makefile: MAGIC_BUILDDATE and inherit values when possible

Browse Source 
Went the whole way and make it inherit from toplevel Makefile.
This commit is contained in:
Darryl L. Miles
2025-07-29 10:50:32 -04:00
committed by R. Timothy Edwards
parent 4e7396162d
commit 2a78de8cb9
4 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/defs.mak.in
+12 -4
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@\"