drygdryg/calc
1
0
Fork 0
mirror of https://github.com/lcn2/calc.git synced 2025-08-16 01:03:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Improve Makefile comments and tests

Browse Source 
Improved notes for install locations in Makefile.config.

Added printing of ${BUILD_ALL} to make env output.

Added double pass of chk_tree to make full_debug (and thus to the make
debug output).
This commit is contained in:
Landon Curt Noll
2023-10-05 03:27:14 -07:00
parent e96ef61718
commit 77d7e665e0
2 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile
View File

@@ -2839,6 +2839,7 @@ env:
@echo 'AWK=${AWK}'; echo '' @echo 'AWK=${AWK}'; echo ''
@echo 'BINDIR=${BINDIR}'; echo '' @echo 'BINDIR=${BINDIR}'; echo ''
@echo 'BLD_TYPE=${BLD_TYPE}'; echo '' @echo 'BLD_TYPE=${BLD_TYPE}'; echo ''
@echo 'BUILD_ALL=${BUILD_ALL}'; echo ''
@echo 'BUILD_C_SRC=${BUILD_C_SRC}'; echo '' @echo 'BUILD_C_SRC=${BUILD_C_SRC}'; echo ''
@echo 'BUILD_H_SRC=${BUILD_H_SRC}'; echo '' @echo 'BUILD_H_SRC=${BUILD_H_SRC}'; echo ''
@echo 'BYTE_ORDER=${BYTE_ORDER}'; echo '' @echo 'BYTE_ORDER=${BYTE_ORDER}'; echo ''
@@ -3045,6 +3046,15 @@ mkdebug: env version.c
full_debug: calcinfo env full_debug: calcinfo env
@echo '=-=-=-=-= ${MAKE_FILE} start of $@ rule =-=-=-=-=' @echo '=-=-=-=-= ${MAKE_FILE} start of $@ rule =-=-=-=-='
@echo '=-=-=-= Output of ${MAKE} -s distdir follows =-=-=-='
-@${MAKE} -f Makefile -s distdir
@echo '=-=-=-= End of output of {MAKE} -s distdir =-=-=-='
@echo '=-=-=-= Output of ${MAKE} -s distlist follows =-=-=-='
-@${MAKE} -f Makefile -s distlist
@echo '=-=-=-= End of output of {MAKE} -s distlist =-=-=-='
@echo '=-=-=-= Output of ${MAKE} -s buildlist follows =-=-=-='
-@${MAKE} -f Makefile -s buildlist
@echo '=-=-=-= End of output of {MAKE} -s buildlist =-=-=-='
@echo '=-=-=-= Contents of ${LOCAL_MKF} follows =-=-=-=' @echo '=-=-=-= Contents of ${LOCAL_MKF} follows =-=-=-='
-@${CAT} ${LOCAL_MKF} -@${CAT} ${LOCAL_MKF}
@echo '=-=-=-= End of contents of ${LOCAL_MKF} =-=-=-=' @echo '=-=-=-= End of contents of ${LOCAL_MKF} =-=-=-='
@@ -3057,6 +3067,9 @@ full_debug: calcinfo env
@echo '=-=-= Invoking ${MAKE} -f Makefile Q= V=@ clobber =-=-=-=' @echo '=-=-= Invoking ${MAKE} -f Makefile Q= V=@ clobber =-=-=-='
-@${MAKE} -f Makefile Q= H=@ S= E= V=@ clobber -@${MAKE} -f Makefile Q= H=@ S= E= V=@ clobber
@echo '=-=-=-= Back to the main Makefile for $@ rule =-=-=-=' @echo '=-=-=-= Back to the main Makefile for $@ rule =-=-=-='
@echo '=-=-=-= start of chk_tree pass #0 =-=-=-=-=-='
-@./chk_tree
@echo '=-=-=-=-=-= end of chk_tree pass #0 =-=-=-=-=-='
@echo '=-=-= Invoking ${MAKE} -f Makefile Q= V=@ all =-=-=-=' @echo '=-=-= Invoking ${MAKE} -f Makefile Q= V=@ all =-=-=-='
@echo '=-=-= this may take a bit of time =-=-=' @echo '=-=-= this may take a bit of time =-=-='
-@${MAKE} -f Makefile Q= H=@ S= E= V=@ all -@${MAKE} -f Makefile Q= H=@ S= E= V=@ all
@@ -3076,6 +3089,9 @@ full_debug: calcinfo env
@echo 'are allowed =-=-=-=' @echo 'are allowed =-=-=-='
-@${CALC_ENV} ./calc${EXT} -e -q -C 'print custom("sysinfo", 2);' -@${CALC_ENV} ./calc${EXT} -e -q -C 'print custom("sysinfo", 2);'
@echo '=-=-=-= Back to the main Makefile for $@ rule =-=-=-=' @echo '=-=-=-= Back to the main Makefile for $@ rule =-=-=-='
@echo '=-=-=-= start of chk_tree pass #1 =-=-=-=-=-='
-@./chk_tree
@echo '=-=-=-=-=-= end of chk_tree pass #1 =-=-=-=-=-='
@echo '=-=-= Invoking ${MAKE} -f Makefile Q= V=@ check =-=-=-=' @echo '=-=-= Invoking ${MAKE} -f Makefile Q= V=@ check =-=-=-='
@echo '=-=-= this may take a while =-=-=' @echo '=-=-= this may take a while =-=-='
-@${MAKE} -f Makefile Q= V=@ check -@${MAKE} -f Makefile Q= V=@ check

9
Makefile.config
View File

@@ -852,12 +852,21 @@ endif # ($(target),Darwin)
# BINDIR= /usr/bin # BINDIR= /usr/bin
# LIBDIR= /usr/lib # LIBDIR= /usr/lib
# CALC_SHAREDIR= /usr/share/calc # CALC_SHAREDIR= /usr/share/calc
# CALC_INCDIR= /usr/include/calc
#
# Or if you prefer everything under /usr/local:
#
# BINDIR= /usr/local/bin
# LIBDIR= /usr/local/lib
# CALC_SHAREDIR= /usr/local/share/calc
# CALC_INCDIR= /usr/local/include/calc
# #
# However, if you are on macOS then set: # However, if you are on macOS then set:
# #
# BINDIR= ${PREFIX}/bin # BINDIR= ${PREFIX}/bin
# LIBDIR= ${PREFIX}/lib # LIBDIR= ${PREFIX}/lib
# CALC_SHAREDIR= ${PREFIX}/share/calc # CALC_SHAREDIR= ${PREFIX}/share/calc
# CALC_INCDIR= ${PREFIX}/include/calc
# #
# NOTE: Starting with macOS El Capitan OS X 10.11, root by default # NOTE: Starting with macOS El Capitan OS X 10.11, root by default
# could not mkdir under system locations, so macOS must now # could not mkdir under system locations, so macOS must now