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

Fix how Makefile.simple and custom/Makefile.simple are formed

Browse Source
This commit is contained in:
Landon Curt Noll
2021-12-13 16:11:38 -08:00
parent 5b7dfeaf11
commit 1242700601
4 changed files with 78 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Makefile
View File

@@ -1323,6 +1323,7 @@ HOSTNAME= hostname
LANG= C LANG= C
LDCONFIG= ldconfig LDCONFIG= ldconfig
LN= ln LN= ln
LS= ls
MAKE= make MAKE= make
MAKEDEPEND= makedepend MAKEDEPEND= makedepend
MKDIR= mkdir MKDIR= mkdir
@@ -2171,6 +2172,7 @@ CUSTOM_PASSDOWN= \
CUSTOMINCDIR="${CUSTOMINCDIR}" \ CUSTOMINCDIR="${CUSTOMINCDIR}" \
DEBUG="${DEBUG}" \ DEBUG="${DEBUG}" \
DEFAULT_LIB_INSTALL_PATH="${DEFAULT_LIB_INSTALL_PATH}" \ DEFAULT_LIB_INSTALL_PATH="${DEFAULT_LIB_INSTALL_PATH}" \
DIFF="${DIFF}" \
E="${E}" \ E="${E}" \
FMT=${FMT} \ FMT=${FMT} \
GREP=${GREP} \ GREP=${GREP} \
@@ -2187,6 +2189,7 @@ CUSTOM_PASSDOWN= \
LIBCUSTCALC_SHLIB="${LIBCUSTCALC_SHLIB}" \ LIBCUSTCALC_SHLIB="${LIBCUSTCALC_SHLIB}" \
LIBDIR="${LIBDIR}" \ LIBDIR="${LIBDIR}" \
LN=${LN} \ LN=${LN} \
LS=${LS} \
MAKE=${MAKE} \ MAKE=${MAKE} \
MAKEDEPEND=${MAKEDEPEND} \ MAKEDEPEND=${MAKEDEPEND} \
MAKE_FILE=Makefile \ MAKE_FILE=Makefile \
@@ -4604,7 +4607,13 @@ Makefile.simple: Makefile custom/Makefile.simple
Makefile | \ Makefile | \
${SED} -e 's/cd custom; $${MAKE} -f Makefile/&.simple/' \ ${SED} -e 's/cd custom; $${MAKE} -f Makefile/&.simple/' \
-e 's;^# SRC:.*;# SRC: non-GNU Makefile via;' \ -e 's;^# SRC:.*;# SRC: non-GNU Makefile via;' \
-e 's;via$$;via ${MAKE} -f $@ $@;' > $@ -e '/^ifeq /d' \
-e '/^ifneq /d' \
-e '/^ifdef /d' \
-e '/^ifndef /d' \
-e '/^else/d' \
-e '/^endif/d' \
-e 's;via Makefile'"'"';via $@'"'"';' > $@
-${Q} if [ -s $@.bak ]; then \ -${Q} if [ -s $@.bak ]; then \
if ${CMP} -s $@.bak $@; then \ if ${CMP} -s $@.bak $@; then \
echo 'top level $@ was already up to date'; \ echo 'top level $@ was already up to date'; \
@@ -4613,10 +4622,13 @@ Makefile.simple: Makefile custom/Makefile.simple
else \ else \
echo 'old $@ is now $@.bak'; \ echo 'old $@ is now $@.bak'; \
echo 'updated top level $@ formed'; \ echo 'updated top level $@ formed'; \
echo 'try: diff -u $@.bak $@'; \ ${DIFF} -u $@.bak $@; \
fi; \ fi \
else \ else \
echo 'new top level $@ formed'; \ echo 'new top level $@ formed'; \
echo; \
${LS} -l $@; \
echo; \
fi fi
${V} echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-=' ${V} echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-='
@@ -5616,6 +5628,12 @@ uninstall: custom/Makefile
fi fi
${V} echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-=' ${V} echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-='
# unbak - remove any .bak files that may have been created
#
unbak:
${Q} ${RM} -f -v Makefile.bak Makefile.simple.bak
${Q} ${RM} -f -v custom/Makefile.bak custom/Makefile.simple.bak
# splint - A tool for statically checking C programs # splint - A tool for statically checking C programs
# #
splint: #hsrc splint: #hsrc

31
Makefile.simple
View File

@@ -4,7 +4,7 @@
# #
# Copyright (C) 1999-2018,2021 Landon Curt Noll # Copyright (C) 1999-2018,2021 Landon Curt Noll
# #
# SRC: non-GNU Makefile via make -f Makefile.simple Makefile.simple # SRC: non-GNU Makefile via
# #
# The "# SRC: ... - ..." comment line above indicates # The "# SRC: ... - ..." comment line above indicates
# the origin of this file. # the origin of this file.
@@ -1176,6 +1176,7 @@ HOSTNAME= hostname
LANG= C LANG= C
LDCONFIG= ldconfig LDCONFIG= ldconfig
LN= ln LN= ln
LS= ls
MAKE= make MAKE= make
MAKEDEPEND= makedepend MAKEDEPEND= makedepend
MKDIR= mkdir MKDIR= mkdir
@@ -1589,6 +1590,7 @@ CUSTOM_PASSDOWN= \
CUSTOMINCDIR="${CUSTOMINCDIR}" \ CUSTOMINCDIR="${CUSTOMINCDIR}" \
DEBUG="${DEBUG}" \ DEBUG="${DEBUG}" \
DEFAULT_LIB_INSTALL_PATH="${DEFAULT_LIB_INSTALL_PATH}" \ DEFAULT_LIB_INSTALL_PATH="${DEFAULT_LIB_INSTALL_PATH}" \
DIFF="${DIFF}" \
E="${E}" \ E="${E}" \
FMT=${FMT} \ FMT=${FMT} \
GREP=${GREP} \ GREP=${GREP} \
@@ -1605,6 +1607,7 @@ CUSTOM_PASSDOWN= \
LIBCUSTCALC_SHLIB="${LIBCUSTCALC_SHLIB}" \ LIBCUSTCALC_SHLIB="${LIBCUSTCALC_SHLIB}" \
LIBDIR="${LIBDIR}" \ LIBDIR="${LIBDIR}" \
LN=${LN} \ LN=${LN} \
LS=${LS} \
MAKE=${MAKE} \ MAKE=${MAKE} \
MAKEDEPEND=${MAKEDEPEND} \ MAKEDEPEND=${MAKEDEPEND} \
MAKE_FILE=Makefile \ MAKE_FILE=Makefile \
@@ -3373,7 +3376,7 @@ calcerr.h: calcerr.tbl calcerr_h.sed calcerr_h.awk ${MAKE_FILE} ${LOC_MKF}
${Q} echo '/*' > $@ ${Q} echo '/*' > $@
${Q} echo ' * DO NOT EDIT' >> $@ ${Q} echo ' * DO NOT EDIT' >> $@
${Q} echo ' *' >> $@ ${Q} echo ' *' >> $@
${Q} echo ' * generated by calcerr.tbl via Makefile' >> $@ ${Q} echo ' * generated by calcerr.tbl via Makefile.simple' >> $@
${Q} echo ' */' >> $@ ${Q} echo ' */' >> $@
${Q} echo '' >> $@ ${Q} echo '' >> $@
${Q} echo '' >> $@ ${Q} echo '' >> $@
@@ -3403,7 +3406,7 @@ calcerr.c: calcerr.tbl calcerr_c.sed calcerr_c.awk ${MAKE_FILE} ${LOC_MKF}
${Q} echo '/*' > $@ ${Q} echo '/*' > $@
${Q} echo ' * DO NOT EDIT' >> $@ ${Q} echo ' * DO NOT EDIT' >> $@
${Q} echo ' *' >> $@ ${Q} echo ' *' >> $@
${Q} echo ' * generated by calcerr.tbl via Makefile' >> $@ ${Q} echo ' * generated by calcerr.tbl via Makefile.simple' >> $@
${Q} echo ' */' >> $@ ${Q} echo ' */' >> $@
${Q} echo '' >> $@ ${Q} echo '' >> $@
${Q} ${SED} -f calcerr_c.sed < calcerr.tbl | \ ${Q} ${SED} -f calcerr_c.sed < calcerr.tbl | \
@@ -3909,7 +3912,13 @@ Makefile.simple: Makefile custom/Makefile.simple
Makefile | \ Makefile | \
${SED} -e 's/cd custom; $${MAKE} -f Makefile/&.simple/' \ ${SED} -e 's/cd custom; $${MAKE} -f Makefile/&.simple/' \
-e 's;^# SRC:.*;# SRC: non-GNU Makefile via;' \ -e 's;^# SRC:.*;# SRC: non-GNU Makefile via;' \
-e 's;via$$;via ${MAKE} -f $@ $@;' > $@ -e '/^ifeq /d' \
-e '/^ifneq /d' \
-e '/^ifdef /d' \
-e '/^ifndef /d' \
-e '/^else/d' \
-e '/^endif/d' \
-e 's;via Makefile.simple'"'"';via $@'"'"';' > $@
-${Q} if [ -s $@.bak ]; then \ -${Q} if [ -s $@.bak ]; then \
if ${CMP} -s $@.bak $@; then \ if ${CMP} -s $@.bak $@; then \
echo 'top level $@ was already up to date'; \ echo 'top level $@ was already up to date'; \
@@ -3918,10 +3927,13 @@ Makefile.simple: Makefile custom/Makefile.simple
else \ else \
echo 'old $@ is now $@.bak'; \ echo 'old $@ is now $@.bak'; \
echo 'updated top level $@ formed'; \ echo 'updated top level $@ formed'; \
echo 'try: diff -u $@.bak $@'; \ ${DIFF} -u $@.bak $@; \
fi; \ fi \
else \ else \
echo 'new top level $@ formed'; \ echo 'new top level $@ formed'; \
echo; \
${LS} -l $@; \
echo; \
fi fi
${V} echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-=' ${V} echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-='
@@ -4895,6 +4907,12 @@ uninstall: custom/Makefile
fi fi
${V} echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-=' ${V} echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-='
# unbak - remove any .bak files that may have been created
#
unbak:
${Q} ${RM} -f -v Makefile.bak Makefile.simple.bak
${Q} ${RM} -f -v custom/Makefile.bak custom/Makefile.simple.bak
# splint - A tool for statically checking C programs # splint - A tool for statically checking C programs
# #
splint: #hsrc splint: #hsrc
@@ -6501,4 +6519,3 @@ zrandom.o: value.h
zrandom.o: zmath.h zrandom.o: zmath.h
zrandom.o: zrandom.c zrandom.o: zrandom.c
zrandom.o: zrandom.h zrandom.o: zrandom.h
endif

36
custom/Makefile
View File

@@ -489,9 +489,11 @@ CHMOD= chmod
CMP= cmp CMP= cmp
CO= co CO= co
CP= cp CP= cp
DIFF= diff
FMT= fmt FMT= fmt
GREP= egrep GREP= egrep
LN= ln LN= ln
LS= ls
MAKE= make MAKE= make
MAKEDEPEND= makedepend MAKEDEPEND= makedepend
MKDIR= mkdir MKDIR= mkdir
@@ -732,18 +734,39 @@ Makefile.simple: Makefile ../Makefile
fi fi
${Q} ${AWK} '/^#if 0/{skp=1} {if(!skp){print $$0}} /^#endif/{skp=0}' \ ${Q} ${AWK} '/^#if 0/{skp=1} {if(!skp){print $$0}} /^#endif/{skp=0}' \
Makefile | \ Makefile | \
${SED} -e '/^# include start from top Makefile - keep /,$$d' > $@ ${SED} -e '/^# include start from top Makefile - keep /,$$d' \
-e '/^ifeq /d' \
-e '/^ifneq /d' \
-e '/^ifdef /d' \
-e '/^ifndef /d' \
-e '/^else/d' \
-e '/^endif/d' \
> $@
${Q} echo '# include start from top Makefile - keep this line' \ ${Q} echo '# include start from top Makefile - keep this line' \
>> $@ >> $@
${Q} ${AWK} '/^#if 0/{skp=1} {if(!skp){print $$0}} /^#endif/{skp=0}' \ ${Q} ${AWK} '/^#if 0/{skp=1} {if(!skp){print $$0}} /^#endif/{skp=0}' \
../Makefile | \ ../Makefile | \
${SED} -e '1,/^# include start from top Makefile - keep /d' \ ${SED} -e '1,/^# include start from top Makefile - keep /d' \
-e '/^# include end from top Makefile - keep /,$$d' >> $@ -e '/^# include end from top Makefile - keep /,$$d' \
-e '/^ifeq /d' \
-e '/^ifneq /d' \
-e '/^ifdef /d' \
-e '/^ifndef /d' \
-e '/^else/d' \
-e '/^endif/d' \
>> $@
${Q} echo '# include end from top Makefile - keep this line' \ ${Q} echo '# include end from top Makefile - keep this line' \
>> $@ >> $@
${Q} ${AWK} '/^#if 0/{skp=1} {if(!skp){print $$0}} /^#endif/{skp=0}' \ ${Q} ${AWK} '/^#if 0/{skp=1} {if(!skp){print $$0}} /^#endif/{skp=0}' \
Makefile | \ Makefile | \
${SED} -e '1,/^# include end from top Makefile - keep /d' >> $@ ${SED} -e '1,/^# include end from top Makefile - keep /d' \
-e '/^ifeq /d' \
-e '/^ifneq /d' \
-e '/^ifdef /d' \
-e '/^ifndef /d' \
-e '/^else/d' \
-e '/^endif/d' \
>> $@
-${Q} if [ -s $@.bak ]; then \ -${Q} if [ -s $@.bak ]; then \
if ${CMP} -s $@.bak $@; then \ if ${CMP} -s $@.bak $@; then \
echo 'custom/$@ was already up to date'; \ echo 'custom/$@ was already up to date'; \
@@ -752,10 +775,13 @@ Makefile.simple: Makefile ../Makefile
else \ else \
echo 'old custom/$@ is now custom/$@.bak'; \ echo 'old custom/$@ is now custom/$@.bak'; \
echo 'updated custom/$@ formed'; \ echo 'updated custom/$@ formed'; \
echo 'try: diff -u custom/$@.bak custom/$@'; \ (cd .. ; ${DIFF} -u custom/$@.bak custom/$@); \
fi; \ fi; \
else \ else \
echo 'new custom/$@ formed'; \ echo 'new custom/$@ formed'; \
echo; \
(cd .. ; ${LS} -l custom/$@); \
echo; \
fi fi
${V} echo '=-=-=-=-= custom/${MAKE_FILE} end of $@ rule =-=-=-=-=' ${V} echo '=-=-=-=-= custom/${MAKE_FILE} end of $@ rule =-=-=-=-='
#endif /* end of skip for non-Gnu makefiles */ #endif /* end of skip for non-Gnu makefiles */

2
custom/Makefile.simple
View File

@@ -460,9 +460,11 @@ CHMOD= chmod
CMP= cmp CMP= cmp
CO= co CO= co
CP= cp CP= cp
DIFF= diff
FMT= fmt FMT= fmt
GREP= egrep GREP= egrep
LN= ln LN= ln
LS= ls
MAKE= make MAKE= make
MAKEDEPEND= makedepend MAKEDEPEND= makedepend
MKDIR= mkdir MKDIR= mkdir