external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00
Code Issues Releases Wiki Activity

Update #include-related dependencies in Mamfiles

Browse source 
I grepped for #include changes in all the commits and compared
that to the changes in the Mamfiles. I found 7 commits that don't
update the Mamfiles with the appropriate dependencies while
adding #includes, as I only learned how this works after having
worked with this code for some time.

This commit adds the missing Mamfile updates for the
corresponding #include changes in the following commits:
06e721c3, 65d363fd, 70fc1da7, 79d19458, b1a41311, bb4d6a2e,
db71b3ad, and this commit.

Additionally:

src/lib/libast/comp/setlocale.c:
- Change include errno.h to error.h to use EILSEQ fallback if
  needed; remove corresponding #ifdef (re: 4dcf5c50, 71bfe028).

src/cmd/ksh93/Mamfile:
- Fix a broken dependency on libast FEATURE/float (re: 72968eae).
  We can't use 'prev' for a file that was not mentioned before in
  the same Mamfile, we have to use a 'make'...'done' on the first
  mention. Add subdependencies matching those in libast/Mamfile.
This commit is contained in:
Martijn Dekker 2021-03-25 01:48:52 +00:00
parent 4c7c5803bd
commit 181e87d228
3 changed files with 24 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/cmd/ksh93/Mamfile
View file

@ -177,6 +177,10 @@ make install
done ${PACKAGE_ast_INCLUDE}/cmd.h dontcare
prev ${PACKAGE_ast_INCLUDE}/shcmd.h implicit
make include/nval.h implicit
make ${PACKAGE_ast_INCLUDE}/hash.h implicit
make ${PACKAGE_ast_INCLUDE}/hashpart.h implicit
done ${PACKAGE_ast_INCLUDE}/hashpart.h dontcare
done ${PACKAGE_ast_INCLUDE}/hash.h dontcare
prev ${PACKAGE_ast_INCLUDE}/option.h implicit
make ${PACKAGE_ast_INCLUDE}/cdt.h implicit
prev ${PACKAGE_ast_INCLUDE}/ast_common.h implicit
@ -280,6 +284,11 @@ make install
done alarm.o generated
make cd_pwd.o
make bltins/cd_pwd.c
make include/test.h implicit
prev include/shtable.h implicit
prev include/defs.h implicit
prev FEATURE/options implicit
done include/test.h
make ${PACKAGE_ast_INCLUDE}/ls.h implicit
make ${PACKAGE_ast_INCLUDE}/ast_mode.h implicit
done ${PACKAGE_ast_INCLUDE}/ast_mode.h dontcare
@ -330,11 +339,7 @@ make install
done cflow.o generated
make deparse.o
make sh/deparse.c
make include/test.h implicit
prev include/shtable.h implicit
prev include/defs.h implicit
prev FEATURE/options implicit
done include/test.h
prev include/test.h implicit
prev include/shnodes.h implicit
prev include/defs.h implicit
done sh/deparse.c
@ -408,6 +413,9 @@ make install
done hist.o generated
make misc.o
make bltins/misc.c
prev ${PACKAGE_ast_INCLUDE}/times.h implicit
prev FEATURE/time implicit
prev FEATURE/locale implicit
make include/jobs.h implicit
prev ${PACKAGE_ast_INCLUDE}/vmalloc.h implicit
prev include/terminal.h implicit
@ -703,6 +711,7 @@ make install
prev include/edit.h implicit
prev include/terminal.h implicit
prev include/builtins.h implicit
prev include/jobs.h implicit
prev include/path.h implicit
prev include/defs.h implicit
done sh/args.c
@ -1217,7 +1226,11 @@ make install
exec - iffe ${IFFEFLAGS} -v -c "${CC} ${mam_cc_FLAGS} ${KSH_RELFLAGS} ${KSH_SHOPTFLAGS} ${CCFLAGS} ${LDFLAGS}" ref ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libdll} ${mam_libcmd} ${mam_libast} ${mam_libm} ${mam_libnsl} : run features/math.sh ${PACKAGEROOT}/src/cmd/ksh93/data/math.tab
make ${PACKAGE_ast_INCLUDE}/ast_standards.h implicit
done ${PACKAGE_ast_INCLUDE}/ast_standards.h dontcare
prev ${INSTALLROOT}/src/lib/libast/FEATURE/float implicit
make ${INSTALLROOT}/src/lib/libast/FEATURE/float implicit
make ${INSTALLROOT}/src/lib/libast/FEATURE/standards implicit
done ${INSTALLROOT}/src/lib/libast/FEATURE/standards dontcare
prev ${PACKAGE_ast_INCLUDE}/ast_common.h implicit
done ${INSTALLROOT}/src/lib/libast/FEATURE/float dontcare
done FEATURE/math generated
prev include/streval.h implicit
prev FEATURE/options implicit
@ -1263,6 +1276,7 @@ make install
done options.o generated
make signals.o
make data/signals.c
prev include/jobs.h implicit
prev include/defs.h implicit
done data/signals.c
meta signals.o %.c>%.o data/signals.c signals