diff --git a/src/cmd/builtin/Mamfile b/src/cmd/builtin/Mamfile index 4af7011466f8..be6a89293646 100644 --- a/src/cmd/builtin/Mamfile +++ b/src/cmd/builtin/Mamfile @@ -28,86 +28,6 @@ make install virtual prev features/pty exec - iffe ${IFFEFLAGS} -v -c "${CC} ${mam_cc_FLAGS} ${CCFLAGS} ${LDFLAGS}" ref ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libast} ${mam_libcmd} : run features/pty done - prev ${PACKAGE_ast_INCLUDE}/ast_time.h implicit - make ${PACKAGE_ast_INCLUDE}/vmalloc.h implicit - make ${PACKAGE_ast_INCLUDE}/ast_common.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_map.h implicit - make ${PACKAGE_ast_INCLUDE}/endian.h implicit - make ${PACKAGE_ast_INCLUDE}/bytesex.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_common.h - done - done - done - make ${PACKAGE_ast_INCLUDE}/ast_std.h implicit - make ${PACKAGE_ast_INCLUDE}/regex.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_api.h implicit - make ${PACKAGE_ast_INCLUDE}/ast_wchar.h implicit - make ${PACKAGE_ast_INCLUDE}/wctype.h implicit - make ${PACKAGE_ast_INCLUDE}/ast_wctype.h implicit - prev ${PACKAGE_ast_INCLUDE}/endian.h - make ${PACKAGE_ast_INCLUDE}/wchar.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_wchar.h - done - done - done - make ${PACKAGE_ast_INCLUDE}/stdio.h implicit - make ${PACKAGE_ast_INCLUDE}/ast_stdio.h implicit - prev ${PACKAGE_ast_INCLUDE}/sfio_s.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_std.h - done - done - prev ${PACKAGE_ast_INCLUDE}/ast_common.h - done - prev ${PACKAGE_ast_INCLUDE}/ast_common.h - done - make ${PACKAGE_ast_INCLUDE}/getopt.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_getopt.h implicit - done - prev ${PACKAGE_ast_INCLUDE}/ast_map.h - prev ${PACKAGE_ast_INCLUDE}/ast_botch.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_limits.h implicit - make ${PACKAGE_ast_INCLUDE}/ast_fcntl.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_fs.h implicit - done - prev ${PACKAGE_ast_INCLUDE}/ast_getopt.h - make ${PACKAGE_ast_INCLUDE}/ast_sys.h implicit - prev ${PACKAGE_ast_INCLUDE}/getopt.h - prev ${PACKAGE_ast_INCLUDE}/endian.h - done - prev ${PACKAGE_ast_INCLUDE}/ast_lib.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_common.h - done - done - prev ${PACKAGE_ast_INCLUDE}/regex.h - make ${PACKAGE_ast_INCLUDE}/proc.h implicit - make ${PACKAGE_ast_INCLUDE}/ast.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_api.h - prev ${PACKAGE_ast_INCLUDE}/vmalloc.h - make ${PACKAGE_ast_INCLUDE}/sfio.h implicit - prev ${PACKAGE_ast_INCLUDE}/sfio_s.h - prev ${PACKAGE_ast_INCLUDE}/ast_common.h - prev ${PACKAGE_ast_INCLUDE}/ast_std.h - done - prev ${PACKAGE_ast_INCLUDE}/ast_std.h - done - done - make ${PACKAGE_ast_INCLUDE}/error.h implicit - make ${PACKAGE_ast_INCLUDE}/option.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast.h - done - prev ${PACKAGE_ast_INCLUDE}/ast.h - done - make ${PACKAGE_ast_INCLUDE}/cmd.h implicit - make ${PACKAGE_ast_INCLUDE}/cmdext.h implicit - prev ${PACKAGE_ast_INCLUDE}/shcmd.h implicit - done - prev ${PACKAGE_ast_INCLUDE}/shcmd.h - make ${PACKAGE_ast_INCLUDE}/stk.h implicit - prev ${PACKAGE_ast_INCLUDE}/sfio.h - done - prev ${PACKAGE_ast_INCLUDE}/error.h - prev ${PACKAGE_ast_INCLUDE}/ast.h - done done pty.c exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -DERROR_CATALOG=\""builtin"\" -DCMD_STANDALONE=b_pty -c pty.c done pty.o diff --git a/src/cmd/ksh93/Mamfile b/src/cmd/ksh93/Mamfile index cd912a67e579..ca293789644a 100644 --- a/src/cmd/ksh93/Mamfile +++ b/src/cmd/ksh93/Mamfile @@ -116,104 +116,12 @@ make install virtual prev features/sigfeatures exec - iffe ${IFFEFLAGS} -v -c "${CC} ${mam_cc_FLAGS} ${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/sigfeatures done - make ${PACKAGE_ast_INCLUDE}/sfio.h implicit - prev ${PACKAGE_ast_INCLUDE}/sfio_s.h implicit - make ${PACKAGE_ast_INCLUDE}/ast_common.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_map.h implicit - make ${PACKAGE_ast_INCLUDE}/endian.h implicit - make ${PACKAGE_ast_INCLUDE}/bytesex.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_common.h - done - done - done - make ${PACKAGE_ast_INCLUDE}/ast_std.h implicit - make ${PACKAGE_ast_INCLUDE}/regex.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_api.h implicit - make ${PACKAGE_ast_INCLUDE}/ast_wchar.h implicit - make ${PACKAGE_ast_INCLUDE}/wctype.h implicit - make ${PACKAGE_ast_INCLUDE}/ast_wctype.h implicit - prev ${PACKAGE_ast_INCLUDE}/endian.h - make ${PACKAGE_ast_INCLUDE}/wchar.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_wchar.h - done - done - done - make ${PACKAGE_ast_INCLUDE}/stdio.h implicit - make ${PACKAGE_ast_INCLUDE}/ast_stdio.h implicit - prev ${PACKAGE_ast_INCLUDE}/sfio_s.h - prev ${PACKAGE_ast_INCLUDE}/ast_std.h - done - done - prev ${PACKAGE_ast_INCLUDE}/ast_common.h - done - prev ${PACKAGE_ast_INCLUDE}/ast_common.h - done - make ${PACKAGE_ast_INCLUDE}/getopt.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_getopt.h implicit - done - prev ${PACKAGE_ast_INCLUDE}/ast_map.h - prev ${PACKAGE_ast_INCLUDE}/ast_botch.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_limits.h implicit - make ${PACKAGE_ast_INCLUDE}/ast_fcntl.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_fs.h implicit - done - prev ${PACKAGE_ast_INCLUDE}/ast_getopt.h - make ${PACKAGE_ast_INCLUDE}/ast_sys.h implicit - prev ${PACKAGE_ast_INCLUDE}/getopt.h - prev ${PACKAGE_ast_INCLUDE}/endian.h - done - prev ${PACKAGE_ast_INCLUDE}/ast_lib.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_common.h - done - done - make ${PACKAGE_ast_INCLUDE}/error.h implicit - make ${PACKAGE_ast_INCLUDE}/option.h implicit - make ${PACKAGE_ast_INCLUDE}/ast.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_api.h - make ${PACKAGE_ast_INCLUDE}/vmalloc.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_common.h - prev ${PACKAGE_ast_INCLUDE}/ast_std.h - done - prev ${PACKAGE_ast_INCLUDE}/sfio.h - prev ${PACKAGE_ast_INCLUDE}/ast_std.h - done - done - prev ${PACKAGE_ast_INCLUDE}/ast.h - done - prev ${PACKAGE_ast_INCLUDE}/sig.h implicit - done - make ${PACKAGE_ast_INCLUDE}/stk.h implicit - prev ${PACKAGE_ast_INCLUDE}/sfio.h - done - make include/history.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast.h - done - make ${PACKAGE_ast_INCLUDE}/cmd.h implicit - prev ${PACKAGE_ast_INCLUDE}/dlldefs.h implicit - make ${PACKAGE_ast_INCLUDE}/cmdext.h implicit - prev ${PACKAGE_ast_INCLUDE}/shcmd.h implicit - done - prev ${PACKAGE_ast_INCLUDE}/shcmd.h - prev ${PACKAGE_ast_INCLUDE}/stk.h - prev ${PACKAGE_ast_INCLUDE}/error.h - prev ${PACKAGE_ast_INCLUDE}/ast.h - done - prev ${PACKAGE_ast_INCLUDE}/shcmd.h - make include/nval.h implicit - prev ${PACKAGE_ast_INCLUDE}/option.h - make ${PACKAGE_ast_INCLUDE}/cdt.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_common.h - prev ${PACKAGE_ast_INCLUDE}/ast_std.h - done - prev ${PACKAGE_ast_INCLUDE}/ast.h done + prev include/history.h implicit + prev include/nval.h implicit make include/name.h implicit prev include/nval.h - prev ${PACKAGE_ast_INCLUDE}/cdt.h - prev ${PACKAGE_ast_INCLUDE}/ast.h done - prev ${PACKAGE_ast_INCLUDE}/cdt.h - prev ${PACKAGE_ast_INCLUDE}/ast.h done prev shopt.h done @@ -226,33 +134,21 @@ make install virtual make FEATURE/time implicit prev features/time exec - iffe ${IFFEFLAGS} -v -c "${CC} ${mam_cc_FLAGS} ${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/time - make ${PACKAGE_ast_INCLUDE}/times.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_time.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast.h - done done make include/builtins.h implicit prev include/shtable.h implicit make FEATURE/dynamic implicit prev features/dynamic exec - iffe ${IFFEFLAGS} -v -c "${CC} ${mam_cc_FLAGS} ${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/dynamic - prev ${PACKAGE_ast_INCLUDE}/dlldefs.h done - prev ${PACKAGE_ast_INCLUDE}/option.h done - prev ${PACKAGE_ast_INCLUDE}/error.h make include/defs.h implicit prev include/regress.h implicit prev include/shtable.h prev include/shell.h - prev ${PACKAGE_ast_INCLUDE}/endian.h prev include/name.h prev include/argnod.h implicit - prev ${PACKAGE_ast_INCLUDE}/cdt.h prev FEATURE/externs - prev ${PACKAGE_ast_INCLUDE}/error.h - prev ${PACKAGE_ast_INCLUDE}/sfio.h - prev ${PACKAGE_ast_INCLUDE}/ast.h done prev shopt.h done @@ -264,11 +160,6 @@ make install virtual prev include/shtable.h prev include/defs.h done - make ${PACKAGE_ast_INCLUDE}/ls.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_mode.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_fs.h - prev ${PACKAGE_ast_INCLUDE}/ast_std.h - done prev include/builtins.h prev include/name.h make include/path.h implicit @@ -277,10 +168,8 @@ make install virtual done make include/variables.h implicit prev FEATURE/dynamic - prev ${PACKAGE_ast_INCLUDE}/option.h prev include/nval.h done - prev ${PACKAGE_ast_INCLUDE}/error.h prev include/defs.h prev shopt.h done @@ -291,10 +180,7 @@ make install virtual prev include/builtins.h make include/shnodes.h implicit prev include/argnod.h - prev ${PACKAGE_ast_INCLUDE}/ast.h done - prev ${PACKAGE_ast_INCLUDE}/error.h - prev ${PACKAGE_ast_INCLUDE}/ast.h prev include/defs.h prev shopt.h done @@ -320,7 +206,6 @@ make install virtual make bltins/getopts.c prev include/builtins.h prev include/nval.h - prev ${PACKAGE_ast_INCLUDE}/error.h prev include/variables.h prev include/defs.h prev shopt.h @@ -337,7 +222,6 @@ make install virtual exec - iffe ${IFFEFLAGS} -v -c "${CC} ${mam_cc_FLAGS} ${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/ttys done done - prev ${PACKAGE_ast_INCLUDE}/sig.h make FEATURE/locale implicit prev features/locale exec - iffe ${IFFEFLAGS} -v -c "${CC} ${mam_cc_FLAGS} ${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/locale @@ -350,13 +234,8 @@ make install virtual prev include/builtins.h prev include/history.h prev include/name.h - make include/io.h implicit - prev ${PACKAGE_ast_INCLUDE}/sfio.h - prev ${PACKAGE_ast_INCLUDE}/ast.h - done + prev include/io.h implicit prev include/variables.h - prev ${PACKAGE_ast_INCLUDE}/error.h - prev ${PACKAGE_ast_INCLUDE}/ls.h prev include/defs.h prev shopt.h done @@ -364,17 +243,10 @@ make install virtual done make misc.o make bltins/misc.c - prev ${PACKAGE_ast_INCLUDE}/times.h prev FEATURE/time prev FEATURE/locale make include/jobs.h implicit - prev ${PACKAGE_ast_INCLUDE}/vmalloc.h prev include/terminal.h - make ${PACKAGE_ast_INCLUDE}/aso.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_common.h - done - prev ${PACKAGE_ast_INCLUDE}/sfio.h - prev ${PACKAGE_ast_INCLUDE}/ast.h done prev include/builtins.h prev include/history.h @@ -390,8 +262,6 @@ make install virtual done make mkservice.o make bltins/mkservice.c - prev ${PACKAGE_ast_INCLUDE}/cmd.h - prev ${PACKAGE_ast_INCLUDE}/error.h prev include/nval.h prev include/defs.h prev shopt.h @@ -400,32 +270,13 @@ make install virtual done make print.o make bltins/print.c - make ${PACKAGE_ast_INCLUDE}/ccode.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_ccode.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_common.h - done - make ${PACKAGE_ast_INCLUDE}/tmx.h implicit - make ${PACKAGE_ast_INCLUDE}/tv.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast.h - done - make ${PACKAGE_ast_INCLUDE}/tm.h implicit - prev ${PACKAGE_ast_INCLUDE}/times.h - prev ${PACKAGE_ast_INCLUDE}/ast.h - done - done make include/streval.h implicit - make ${PACKAGE_ast_INCLUDE}/ast_float.h implicit - prev ${PACKAGE_ast_INCLUDE}/endian.h - prev ${PACKAGE_ast_INCLUDE}/ast_common.h - done prev include/defs.h - prev ${PACKAGE_ast_INCLUDE}/ast.h done prev include/builtins.h prev include/history.h prev include/name.h prev include/io.h - prev ${PACKAGE_ast_INCLUDE}/error.h prev include/defs.h prev shopt.h done @@ -440,14 +291,10 @@ make install virtual prev include/name.h prev include/io.h make include/lexstates.h implicit - prev ${PACKAGE_ast_INCLUDE}/wctype.h - prev ${PACKAGE_ast_INCLUDE}/wchar.h prev FEATURE/locale done prev include/variables.h prev include/defs.h - prev ${PACKAGE_ast_INCLUDE}/error.h - prev ${PACKAGE_ast_INCLUDE}/ast.h prev shopt.h done exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} -D_API_ast=20100309 -DERROR_CONTEXT_T=Error_context_t -c bltins/read.c @@ -460,8 +307,6 @@ make install virtual done prev FEATURE/time prev include/builtins.h - prev ${PACKAGE_ast_INCLUDE}/tmx.h - prev ${PACKAGE_ast_INCLUDE}/error.h prev include/defs.h prev shopt.h done @@ -478,16 +323,12 @@ make install virtual done make test.o make bltins/test.c - prev ${PACKAGE_ast_INCLUDE}/tmx.h prev FEATURE/poll prev FEATURE/externs prev include/builtins.h prev include/test.h prev include/terminal.h prev include/io.h - prev ${PACKAGE_ast_INCLUDE}/regex.h - prev ${PACKAGE_ast_INCLUDE}/ls.h - prev ${PACKAGE_ast_INCLUDE}/error.h prev include/defs.h prev shopt.h done @@ -501,7 +342,6 @@ make install virtual prev include/history.h prev include/name.h prev include/path.h - prev ${PACKAGE_ast_INCLUDE}/error.h prev include/defs.h prev shopt.h done @@ -519,9 +359,6 @@ make install virtual prev include/name.h prev include/builtins.h prev include/defs.h - prev ${PACKAGE_ast_INCLUDE}/error.h - prev ${PACKAGE_ast_INCLUDE}/sfio.h - prev ${PACKAGE_ast_INCLUDE}/ast.h prev shopt.h done exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} -D_API_ast=20100309 -DERROR_CONTEXT_T=Error_context_t -c bltins/ulimit.c @@ -530,10 +367,6 @@ make install virtual make bltins/umask.c prev include/builtins.h prev include/shell.h - prev ${PACKAGE_ast_INCLUDE}/ls.h - prev ${PACKAGE_ast_INCLUDE}/error.h - prev ${PACKAGE_ast_INCLUDE}/sfio.h - prev ${PACKAGE_ast_INCLUDE}/ast.h prev shopt.h done exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} -D_API_ast=20100309 -DERROR_CONTEXT_T=Error_context_t -c bltins/umask.c @@ -545,12 +378,10 @@ make install virtual prev include/lexstates.h prev include/shtable.h prev include/shnodes.h - prev ${PACKAGE_ast_INCLUDE}/cdt.h done prev include/path.h prev include/name.h prev include/shtable.h - prev ${PACKAGE_ast_INCLUDE}/error.h prev include/defs.h prev shopt.h done @@ -558,7 +389,6 @@ make install virtual done make main.o make sh/main.c - prev nc.h implicit dontcare virtual prev FEATURE/externs prev FEATURE/time prev include/timeout.h implicit @@ -570,12 +400,7 @@ make install virtual prev include/path.h prev include/variables.h prev include/defs.h - make include/fcin.h implicit - prev ${PACKAGE_ast_INCLUDE}/sfio.h - done - prev ${PACKAGE_ast_INCLUDE}/ls.h - prev ${PACKAGE_ast_INCLUDE}/sfio.h - prev ${PACKAGE_ast_INCLUDE}/ast.h + prev include/fcin.h implicit prev shopt.h done exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} ${DEBUG+-DDEBUG=${DEBUG}} -DSH_DICT=${SH_DICT} ${SH_CMDLIB_DIR+-DSH_CMDLIB_DIR=${SH_CMDLIB_DIR}} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} -D_API_ast=20100309 -DERROR_CONTEXT_T=Error_context_t -c sh/main.c @@ -644,7 +469,6 @@ make install virtual prev include/io.h prev include/path.h prev include/lexstates.h - prev ${PACKAGE_ast_INCLUDE}/ast_wchar.h prev include/defs.h prev shopt.h done @@ -670,11 +494,8 @@ make install virtual prev include/io.h prev include/variables.h prev include/defs.h - prev ${PACKAGE_ast_INCLUDE}/ls.h prev FEATURE/time prev include/fault.h - prev ${PACKAGE_ast_INCLUDE}/ccode.h - prev ${PACKAGE_ast_INCLUDE}/ast.h prev shopt.h done exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} -D_API_ast=20100309 -DERROR_CONTEXT_T=Error_context_t -c edit/edit.c @@ -683,18 +504,6 @@ make install virtual make sh/expand.c prev include/path.h prev include/io.h - make ${PACKAGE_ast_INCLUDE}/ast_dir.h implicit - make ${PACKAGE_ast_INCLUDE}/dirent.h implicit - make ${PACKAGE_ast_INCLUDE}/ast_dirent.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_std.h - done - done - prev dirlib.h implicit dontcare virtual - prev ${PACKAGE_ast_INCLUDE}/ast_lib.h - done - prev ${PACKAGE_ast_INCLUDE}/ls.h - prev ${PACKAGE_ast_INCLUDE}/glob.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast.h prev include/test.h prev include/variables.h prev include/defs.h @@ -704,11 +513,8 @@ make install virtual done make regress.o make bltins/regress.c - prev ${PACKAGE_ast_INCLUDE}/tmx.h prev include/builtins.h prev include/io.h - prev ${PACKAGE_ast_INCLUDE}/ls.h - prev ${PACKAGE_ast_INCLUDE}/error.h prev include/defs.h prev shopt.h done @@ -716,7 +522,6 @@ make install virtual done make fault.o make sh/fault.c - prev ${PACKAGE_ast_INCLUDE}/vmalloc.h prev include/ulimit.h prev include/builtins.h prev include/path.h @@ -734,38 +539,26 @@ make install virtual make fcin.o make sh/fcin.c prev include/fcin.h - prev ${PACKAGE_ast_INCLUDE}/error.h - prev ${PACKAGE_ast_INCLUDE}/sfio.h - prev ${PACKAGE_ast_INCLUDE}/ast.h prev shopt.h done exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} -D_API_ast=20100309 -DERROR_CONTEXT_T=Error_context_t -c sh/fcin.c done make history.o make edit/history.c - prev ${PACKAGE_ast_INCLUDE}/stdio.h prev include/history.h prev include/io.h prev include/builtins.h prev include/path.h prev include/variables.h prev include/defs.h - prev ${PACKAGE_ast_INCLUDE}/ls.h - prev ${PACKAGE_ast_INCLUDE}/error.h prev FEATURE/time - prev ${PACKAGE_ast_INCLUDE}/sfio.h - prev ${PACKAGE_ast_INCLUDE}/ast.h prev shopt.h done exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} -D_API_ast=20100309 -DERROR_CONTEXT_T=Error_context_t -c edit/history.c done make init.o make sh/init.c - prev ${PACKAGE_ast_INCLUDE}/wctype.h - prev ${PACKAGE_ast_INCLUDE}/ast_wchar.h - make include/version.h implicit - prev ${PACKAGE_ast_INCLUDE}/releaseflags.h implicit - done + prev include/version.h implicit prev include/lexstates.h prev FEATURE/externs prev FEATURE/dynamic @@ -779,10 +572,6 @@ make install virtual prev include/fault.h prev include/path.h prev include/variables.h - prev ${PACKAGE_ast_INCLUDE}/ast_random.h - prev ${PACKAGE_ast_INCLUDE}/regex.h - prev ${PACKAGE_ast_INCLUDE}/tmx.h - prev ${PACKAGE_ast_INCLUDE}/ccode.h prev include/defs.h prev shopt.h done @@ -790,7 +579,6 @@ make install virtual done make io.o make sh/io.c - prev ${PACKAGE_ast_INCLUDE}/endian.h prev FEATURE/poll prev FEATURE/dynamic prev FEATURE/externs @@ -803,8 +591,6 @@ make install virtual prev include/io.h prev include/path.h prev include/variables.h - prev ${PACKAGE_ast_INCLUDE}/regex.h - prev ${PACKAGE_ast_INCLUDE}/ls.h prev include/fcin.h prev include/defs.h prev shopt.h @@ -816,10 +602,6 @@ make install virtual prev include/history.h prev include/jobs.h prev include/io.h - make ${PACKAGE_ast_INCLUDE}/wait.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_wait.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast.h - done prev include/defs.h prev shopt.h done @@ -836,8 +618,6 @@ make install virtual prev include/defs.h prev include/nval.h prev include/fcin.h - prev ${PACKAGE_ast_INCLUDE}/releaseflags.h - prev ${PACKAGE_ast_INCLUDE}/ast.h prev shopt.h done exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} -D_API_ast=20100309 -DERROR_CONTEXT_T=Error_context_t -c sh/lex.c @@ -853,7 +633,6 @@ make install virtual prev include/shlex.h prev include/variables.h prev include/name.h - prev ${PACKAGE_ast_INCLUDE}/regex.h prev include/fcin.h prev include/defs.h prev shopt.h @@ -892,7 +671,6 @@ make install virtual prev include/builtins.h prev include/history.h prev include/shlex.h - prev ${PACKAGE_ast_INCLUDE}/error.h prev include/fcin.h prev include/shell.h prev include/defs.h @@ -904,8 +682,6 @@ make install virtual make path.o make sh/path.c prev FEATURE/time - prev ${PACKAGE_ast_INCLUDE}/endian.h - prev exec_attr.h implicit dontcare virtual prev FEATURE/dynamic prev include/test.h prev include/history.h @@ -914,7 +690,6 @@ make install virtual prev include/path.h prev include/variables.h prev include/nval.h - prev ${PACKAGE_ast_INCLUDE}/ls.h prev include/fcin.h prev include/defs.h prev shopt.h @@ -923,14 +698,10 @@ make install virtual done make string.o make sh/string.c - prev ${PACKAGE_ast_INCLUDE}/wctype.h prev include/national.h prev include/lexstates.h prev include/shtable.h - prev ${PACKAGE_ast_INCLUDE}/ccode.h prev include/defs.h - prev ${PACKAGE_ast_INCLUDE}/ast_wchar.h - prev ${PACKAGE_ast_INCLUDE}/ast.h prev shopt.h done exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} -D_API_ast=20100309 -DERROR_CONTEXT_T=Error_context_t -c sh/string.c @@ -938,7 +709,6 @@ make install virtual make streval.o make sh/streval.c prev FEATURE/externs - prev ${PACKAGE_ast_INCLUDE}/error.h prev include/streval.h prev shopt.h done @@ -953,7 +723,6 @@ make install virtual prev include/shnodes.h prev include/fault.h prev include/io.h - prev ${PACKAGE_ast_INCLUDE}/ls.h prev include/defs.h prev shopt.h done @@ -961,7 +730,6 @@ make install virtual done make tdump.o make sh/tdump.c - prev ${PACKAGE_ast_INCLUDE}/ccode.h prev include/io.h prev include/path.h prev include/shnodes.h @@ -976,16 +744,12 @@ make install virtual prev FEATURE/sigfeatures prev include/defs.h prev include/fault.h - prev ${PACKAGE_ast_INCLUDE}/error.h - prev ${PACKAGE_ast_INCLUDE}/sig.h - prev ${PACKAGE_ast_INCLUDE}/ast.h prev shopt.h done exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} -D_API_ast=20100309 -DERROR_CONTEXT_T=Error_context_t -c sh/timers.c done make trestore.o make sh/trestore.c - prev ${PACKAGE_ast_INCLUDE}/ccode.h prev include/io.h prev include/path.h prev include/shnodes.h @@ -1003,7 +767,6 @@ make install virtual done make xec.o make sh/xec.c - prev ${PACKAGE_ast_INCLUDE}/vmalloc.h prev include/streval.h prev FEATURE/locale prev FEATURE/externs @@ -1025,7 +788,6 @@ make install virtual make limits.o make data/limits.c prev include/ulimit.h - prev ${PACKAGE_ast_INCLUDE}/ast.h prev shopt.h done exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} -D_API_ast=20100309 -c data/limits.c @@ -1041,7 +803,6 @@ make install virtual prev include/io.h prev include/path.h prev include/defs.h - prev ${PACKAGE_ast_INCLUDE}/ast.h prev shopt.h done exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} -D_API_ast=20100309 -DERROR_CONTEXT_T=Error_context_t -c data/msg.c @@ -1053,14 +814,11 @@ make install virtual prev data/math.tab implicit done exec - iffe ${IFFEFLAGS} -v -c "${CC} ${mam_cc_FLAGS} ${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 - prev ${PACKAGE_ast_INCLUDE}/ast_standards.h implicit make ${INSTALLROOT}/src/lib/libast/FEATURE/float implicit prev ${INSTALLROOT}/src/lib/libast/FEATURE/standards implicit - prev ${PACKAGE_ast_INCLUDE}/ast_common.h done done prev include/streval.h - prev ${PACKAGE_ast_INCLUDE}/ast_standards.h prev shopt.h done exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} ${SH_CMDLIB_DIR+-DSH_CMDLIB_DIR=${SH_CMDLIB_DIR}} -DSH_DICT=${SH_DICT} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} -D_API_ast=20100309 -DERROR_CONTEXT_T=Error_context_t -c data/strdata.c @@ -1069,7 +827,6 @@ make install virtual make data/testops.c prev include/test.h prev include/defs.h - prev ${PACKAGE_ast_INCLUDE}/ast.h prev shopt.h done exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -DSH_DICT=${SH_DICT} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} -D_API_ast=20100309 -DERROR_CONTEXT_T=Error_context_t -c data/testops.c @@ -1131,7 +888,6 @@ make install virtual prev include/shtable.h prev include/shell.h prev FEATURE/dynamic - prev ${PACKAGE_ast_INCLUDE}/ast.h prev shopt.h done exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} -D_API_ast=20100309 -DERROR_CONTEXT_T=Error_context_t -c data/variables.c @@ -1139,7 +895,6 @@ make install virtual make lexstates.o make data/lexstates.c prev include/lexstates.h - prev ${PACKAGE_ast_INCLUDE}/ast.h prev shopt.h done exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} -D_API_ast=20100309 -c data/lexstates.c @@ -1151,8 +906,6 @@ make install virtual prev include/history.h prev include/io.h prev include/defs.h - prev ${PACKAGE_ast_INCLUDE}/releaseflags.h - prev ${PACKAGE_ast_INCLUDE}/ast.h prev shopt.h done exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} -D_API_ast=20100309 -DERROR_CONTEXT_T=Error_context_t -c edit/emacs.c @@ -1165,7 +918,6 @@ make install virtual prev include/edit.h prev include/history.h prev include/io.h - prev ${PACKAGE_ast_INCLUDE}/ast.h prev include/defs.h prev shopt.h done @@ -1248,9 +1000,6 @@ make install virtual prev shell.req exec - ${STDCP} -f shell.req ${INSTALLROOT}/lib/lib/shell done - make ${PACKAGE_ast_INCLUDE} - exec - mkdir -p ${PACKAGE_ast_INCLUDE} - done make ${PACKAGE_ast_INCLUDE}/nval.h prev include/nval.h exec - ${STDCP} -f include/nval.h ${PACKAGE_ast_INCLUDE}/nval.h diff --git a/src/lib/libast/Mamfile b/src/lib/libast/Mamfile index 08296f8f01b2..2203c7c655e7 100644 --- a/src/lib/libast/Mamfile +++ b/src/lib/libast/Mamfile @@ -325,7 +325,6 @@ make install virtual make dir/opendir.c make dir/dirlib.h implicit prev dir/dirstd.h implicit dontcare - prev direntry.h implicit dontcare virtual make ast_param.h implicit dontcare prev FEATURE/param exec - ${STDCP} -f FEATURE/param ast_param.h @@ -341,7 +340,6 @@ make install virtual prev include/ast_std.h done done - prev ndir.h implicit dontcare virtual prev std/dirent.h make include/ls.h implicit make ast_mode.h implicit dontcare @@ -938,7 +936,7 @@ make install virtual prev features/prog exec - iffe ${IFFEFLAGS} -v -X ast -X std -c "${CC} ${mam_cc_FLAGS} ${CCFLAGS} ${LDFLAGS}" run features/prog done - prev include/ast_windows.h + prev include/ast_windows.h implicit prev include/ast.h done exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd -c path/pathprog.c @@ -990,7 +988,6 @@ make install virtual done make getenv.o make misc/getenv.c - prev windows.h implicit dontcare virtual prev misc/intercepts.h done exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Imisc -Iinclude -Istd -c misc/getenv.c @@ -1221,9 +1218,7 @@ make install virtual exec - iffe ${IFFEFLAGS} -v -X ast -X std -c "${CC} ${mam_cc_FLAGS} ${CCFLAGS} ${LDFLAGS}" run features/locale done make port/lclang.h implicit - make include/ast_windows.h implicit - prev windows.h - done + prev include/ast_windows.h done prev port/lclib.h done @@ -1246,7 +1241,6 @@ make install virtual prev port/lclib.h make sfio/sfhdr.h implicit prev port/lclib.h - prev stropts.h implicit dontcare virtual prev std/wchar.h prev include/error.h make FEATURE/float implicit @@ -1256,9 +1250,6 @@ make install virtual exec - iffe ${IFFEFLAGS} -v -X ast -X std -c "${CC} ${mam_cc_FLAGS} ${CCFLAGS} ${LDFLAGS}" run features/float prev ast_common.h done - prev mman.h implicit dontcare virtual - prev filio.h implicit dontcare virtual - prev stat.h implicit dontcare virtual prev include/ls.h make ast_tty.h implicit dontcare prev FEATURE/tty @@ -1979,7 +1970,6 @@ make install virtual done make mnt.o make port/mnt.c - prev mnttab.h implicit dontcare virtual prev std/stdio.h prev include/ast_windows.h prev include/ls.h @@ -2300,7 +2290,6 @@ make install virtual make comp/spawnveg.c prev ast_tty.h prev sig.h - prev process.h implicit dontcare virtual prev include/wait.h prev include/error.h prev include/ast.h @@ -2367,7 +2356,6 @@ make install virtual make gross.o make comp/gross.c make comp/gross_sgi.h implicit dontcare - prev locale_attr.h implicit dontcare virtual done prev FEATURE/hack prev include/ls.h @@ -2377,7 +2365,6 @@ make install virtual done make omitted.o make comp/omitted.c - prev process.h prev include/ast_windows.h prev include/ls.h make FEATURE/omitted implicit @@ -4080,7 +4067,6 @@ make install virtual done make astwinsize.o make port/astwinsize.c - prev jioctl.h implicit dontcare virtual prev ast_tty.h prev include/ast.h done @@ -4171,7 +4157,6 @@ make install virtual done make vmbest.o make vmalloc/vmbest.c - prev windows.h prev include/ast_windows.h make vmalloc/vmhdr.h implicit dontcare prev include/vmalloc.h diff --git a/src/lib/libcmd/Mamfile b/src/lib/libcmd/Mamfile index 567794d139f6..8a556050d2f2 100644 --- a/src/lib/libcmd/Mamfile +++ b/src/lib/libcmd/Mamfile @@ -26,7 +26,6 @@ make install virtual prev cmd.req make cmdinit.o make cmdinit.c - prev ${PACKAGE_ast_INCLUDE}/shcmd.h implicit make cmd.h implicit make cmdext.h implicit dontcare prev cmdinit.c @@ -34,13 +33,6 @@ make install virtual prev cmd.h done make cat.c - make ${PACKAGE_ast_INCLUDE}/endian.h implicit - make ${PACKAGE_ast_INCLUDE}/bytesex.h implicit - make ${PACKAGE_ast_INCLUDE}/ast_common.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_map.h implicit - done - done - done prev cmd.h done make chgrp.c @@ -50,131 +42,25 @@ make install virtual bind -last exec - iffe ${IFFEFLAGS} -v -c "${CC} ${mam_cc_FLAGS} ${CCFLAGS} ${LDFLAGS}" ref ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libutil} ${mam_libast} : run features/symlink done - make ${PACKAGE_ast_INCLUDE}/fts.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_mode.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_fs.h implicit - make ${PACKAGE_ast_INCLUDE}/ast_std.h implicit - make ${PACKAGE_ast_INCLUDE}/regex.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_api.h implicit - make ${PACKAGE_ast_INCLUDE}/ast_wchar.h implicit - make ${PACKAGE_ast_INCLUDE}/wctype.h implicit - make ${PACKAGE_ast_INCLUDE}/ast_wctype.h implicit - prev ${PACKAGE_ast_INCLUDE}/endian.h - make ${PACKAGE_ast_INCLUDE}/wchar.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_wchar.h - done - done - done - make ${PACKAGE_ast_INCLUDE}/stdio.h implicit - make ${PACKAGE_ast_INCLUDE}/ast_stdio.h implicit - prev ${PACKAGE_ast_INCLUDE}/sfio_s.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_std.h - done - done - prev ${PACKAGE_ast_INCLUDE}/ast_common.h - done - prev ${PACKAGE_ast_INCLUDE}/ast_common.h - done - make ${PACKAGE_ast_INCLUDE}/getopt.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_getopt.h implicit - done - prev ${PACKAGE_ast_INCLUDE}/ast_map.h - prev ${PACKAGE_ast_INCLUDE}/ast_botch.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_limits.h implicit - make ${PACKAGE_ast_INCLUDE}/ast_fcntl.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_fs.h - done - prev ${PACKAGE_ast_INCLUDE}/ast_getopt.h - make ${PACKAGE_ast_INCLUDE}/ast_sys.h implicit - prev ${PACKAGE_ast_INCLUDE}/getopt.h - prev ${PACKAGE_ast_INCLUDE}/endian.h - done - prev ${PACKAGE_ast_INCLUDE}/ast_lib.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_common.h - done - done - prev ${PACKAGE_ast_INCLUDE}/endian.h - make ${PACKAGE_ast_INCLUDE}/ls.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_mode.h - prev ${PACKAGE_ast_INCLUDE}/ast_fs.h - prev ${PACKAGE_ast_INCLUDE}/ast_std.h - done - make ${PACKAGE_ast_INCLUDE}/cdt.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_common.h - prev ${PACKAGE_ast_INCLUDE}/ast_std.h - done prev cmd.h done make chmod.c prev FEATURE/symlink - prev ${PACKAGE_ast_INCLUDE}/fts.h - prev ${PACKAGE_ast_INCLUDE}/ls.h prev cmd.h done make chown.c prev cmd.h done make cksum.c - make ${PACKAGE_ast_INCLUDE}/error.h implicit - make ${PACKAGE_ast_INCLUDE}/option.h implicit - make ${PACKAGE_ast_INCLUDE}/ast.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_api.h - make ${PACKAGE_ast_INCLUDE}/vmalloc.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_common.h - prev ${PACKAGE_ast_INCLUDE}/ast_std.h - done - make ${PACKAGE_ast_INCLUDE}/sfio.h implicit - prev ${PACKAGE_ast_INCLUDE}/sfio_s.h - prev ${PACKAGE_ast_INCLUDE}/ast_common.h - prev ${PACKAGE_ast_INCLUDE}/ast_std.h - done - prev ${PACKAGE_ast_INCLUDE}/ast_std.h - done - done - prev ${PACKAGE_ast_INCLUDE}/ast.h - done - prev ${PACKAGE_ast_INCLUDE}/fts.h - make ${PACKAGE_ast_INCLUDE}/modex.h implicit - prev ${PACKAGE_ast_INCLUDE}/modecanon.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_fs.h - done - prev ${PACKAGE_ast_INCLUDE}/ls.h - make ${PACKAGE_ast_INCLUDE}/sum.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast.h - done prev cmd.h done make cmp.c - make ${PACKAGE_ast_INCLUDE}/ccode.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_ccode.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_common.h - done - prev ${PACKAGE_ast_INCLUDE}/ls.h prev cmd.h done make comm.c prev cmd.h done make cp.c - make ${PACKAGE_ast_INCLUDE}/tmx.h implicit - make ${PACKAGE_ast_INCLUDE}/tv.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast.h - done - make ${PACKAGE_ast_INCLUDE}/tm.h implicit - make ${PACKAGE_ast_INCLUDE}/times.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_time.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast.h - done - prev ${PACKAGE_ast_INCLUDE}/ast.h - done - done - make ${PACKAGE_ast_INCLUDE}/stk.h implicit - prev ${PACKAGE_ast_INCLUDE}/sfio.h - done - prev ${PACKAGE_ast_INCLUDE}/hashkey.h implicit - prev ${PACKAGE_ast_INCLUDE}/fts.h - prev ${PACKAGE_ast_INCLUDE}/times.h - prev ${PACKAGE_ast_INCLUDE}/ls.h prev cmd.h done make cut.c @@ -184,25 +70,16 @@ make install virtual prev cmd.h done make date.c - prev ${PACKAGE_ast_INCLUDE}/times.h - prev ${PACKAGE_ast_INCLUDE}/tmx.h - make ${PACKAGE_ast_INCLUDE}/proc.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast.h - done - prev ${PACKAGE_ast_INCLUDE}/ls.h prev cmd.h done make expr.c - prev ${PACKAGE_ast_INCLUDE}/regex.h prev cmd.h done make fds.c - prev ${PACKAGE_ast_INCLUDE}/endian.h make FEATURE/sockets implicit prev features/sockets exec - iffe ${IFFEFLAGS} -v -c "${CC} ${mam_cc_FLAGS} ${CCFLAGS} ${LDFLAGS}" ref ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libutil} ${mam_libast} : run features/sockets done - prev ${PACKAGE_ast_INCLUDE}/ls.h prev cmd.h done make fmt.c @@ -212,16 +89,12 @@ make install virtual prev cmd.h done make getconf.c - prev ${PACKAGE_ast_INCLUDE}/ls.h - prev ${PACKAGE_ast_INCLUDE}/proc.h prev cmd.h done make head.c prev cmd.h done make id.c - prev fsg.h implicit dontcare virtual - prev ${PACKAGE_ast_INCLUDE}/stdio.h make FEATURE/ids implicit prev features/ids exec - iffe ${IFFEFLAGS} -v -c "${CC} ${mam_cc_FLAGS} ${CCFLAGS} ${LDFLAGS}" ref ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libutil} ${mam_libast} : run features/ids @@ -229,11 +102,6 @@ make install virtual prev cmd.h done make join.c - prev ${PACKAGE_ast_INCLUDE}/wctype.h - prev ${PACKAGE_ast_INCLUDE}/wchar.h - make ${PACKAGE_ast_INCLUDE}/sfdisc.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast.h - done prev cmd.h done make ln.c @@ -246,15 +114,12 @@ make install virtual prev cmd.h done make mkdir.c - prev ${PACKAGE_ast_INCLUDE}/ls.h prev cmd.h done make mkfifo.c - prev ${PACKAGE_ast_INCLUDE}/ls.h prev cmd.h done make mktemp.c - prev ${PACKAGE_ast_INCLUDE}/ls.h prev cmd.h done make mv.c @@ -264,12 +129,9 @@ make install virtual prev cmd.h done make pathchk.c - prev ${PACKAGE_ast_INCLUDE}/ls.h prev cmd.h done make pids.c - prev ${PACKAGE_ast_INCLUDE}/sfdisc.h - prev ${PACKAGE_ast_INCLUDE}/ast_tty.h implicit prev cmd.h done make rev.c @@ -277,34 +139,25 @@ make install virtual prev cmd.h done make rm.c - prev ${PACKAGE_ast_INCLUDE}/fts.h - prev ${PACKAGE_ast_INCLUDE}/ls.h prev cmd.h done make rmdir.c prev cmd.h done make stty.c - prev ${PACKAGE_ast_INCLUDE}/ast_tty.h - prev ${PACKAGE_ast_INCLUDE}/ccode.h prev cmd.h done make sum.c prev cmd.h done make sync.c - prev ${PACKAGE_ast_INCLUDE}/ls.h prev cmd.h done make tail.c prev rev.h - prev ${PACKAGE_ast_INCLUDE}/tv.h - prev ${PACKAGE_ast_INCLUDE}/ls.h prev cmd.h done make tee.c - prev ${PACKAGE_ast_INCLUDE}/sig.h implicit - prev ${PACKAGE_ast_INCLUDE}/ls.h prev cmd.h done make tty.c @@ -315,22 +168,16 @@ make install virtual prev features/utsname exec - iffe ${IFFEFLAGS} -v -c "${CC} ${mam_cc_FLAGS} ${CCFLAGS} ${LDFLAGS}" ref ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libutil} ${mam_libast} : run features/utsname done - prev ${PACKAGE_ast_INCLUDE}/proc.h prev cmd.h done make uniq.c prev cmd.h done make vmstate.c - prev ${PACKAGE_ast_INCLUDE}/sfdisc.h - prev ${PACKAGE_ast_INCLUDE}/vmalloc.h prev cmd.h done make wc.c - prev ${PACKAGE_ast_INCLUDE}/ls.h - make wc.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast.h - done + prev wc.h implicit prev cmd.h done make revlib.c @@ -338,11 +185,6 @@ make install virtual prev cmd.h done make wclib.c - make ${PACKAGE_ast_INCLUDE}/lc.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast.h - done - prev ${PACKAGE_ast_INCLUDE}/wctype.h - prev ${PACKAGE_ast_INCLUDE}/wchar.h prev wc.h prev cmd.h done @@ -366,12 +208,7 @@ make install virtual exec - ${PACKAGEROOT}/src/lib/libcmd/cmdinit.c ${PACKAGEROOT}/src/lib/libcmd/basename.c ${PACKAGEROOT}/src/lib/libcmd/cat.c ${PACKAGEROOT}/src/lib/libcmd/chgrp.c ${PACKAGEROOT}/src/lib/libcmd/chmod.c ${PACKAGEROOT}/src/lib/libcmd/chown.c ${PACKAGEROOT}/src/lib/libcmd/cksum.c ${PACKAGEROOT}/src/lib/libcmd/cmp.c ${PACKAGEROOT}/src/lib/libcmd/comm.c ${PACKAGEROOT}/src/lib/libcmd/cp.c ${PACKAGEROOT}/src/lib/libcmd/cut.c ${PACKAGEROOT}/src/lib/libcmd/dirname.c ${PACKAGEROOT}/src/lib/libcmd/date.c ${PACKAGEROOT}/src/lib/libcmd/expr.c ${PACKAGEROOT}/src/lib/libcmd/fds.c ${PACKAGEROOT}/src/lib/libcmd/fmt.c ${PACKAGEROOT}/src/lib/libcmd/fold.c ${PACKAGEROOT}/src/lib/libcmd/getconf.c ${PACKAGEROOT}/src/lib/libcmd/head.c ${PACKAGEROOT}/src/lib/libcmd/id.c ${PACKAGEROOT}/src/lib/libcmd/join.c ${PACKAGEROOT}/src/lib/libcmd/ln.c ${PACKAGEROOT}/src/lib/libcmd/logname.c ${PACKAGEROOT}/src/lib/libcmd/md5sum.c ${PACKAGEROOT}/src/lib/libcmd/mkdir.c ${PACKAGEROOT}/src/lib/libcmd/mkfifo.c ${PACKAGEROOT}/src/lib/libcmd/mktemp.c ${PACKAGEROOT}/src/lib/libcmd/mv.c ${PACKAGEROOT}/src/lib/libcmd/paste.c ${PACKAGEROOT}/src/lib/libcmd/pathchk.c ${PACKAGEROOT}/src/lib/libcmd/pids.c ${PACKAGEROOT}/src/lib/libcmd/rev.c ${PACKAGEROOT}/src/lib/libcmd/rm.c ${PACKAGEROOT}/src/lib/libcmd/rmdir.c ${PACKAGEROOT}/src/lib/libcmd/stty.c ${PACKAGEROOT}/src/lib/libcmd/sum.c ${PACKAGEROOT}/src/lib/libcmd/sync.c ${PACKAGEROOT}/src/lib/libcmd/tail.c ${PACKAGEROOT}/src/lib/libcmd/tee.c ${PACKAGEROOT}/src/lib/libcmd/tty.c ${PACKAGEROOT}/src/lib/libcmd/uname.c ${PACKAGEROOT}/src/lib/libcmd/uniq.c ${PACKAGEROOT}/src/lib/libcmd/vmstate.c ${PACKAGEROOT}/src/lib/libcmd/wc.c ${PACKAGEROOT}/src/lib/libcmd/revlib.c ${PACKAGEROOT}/src/lib/libcmd/wclib.c ${PACKAGEROOT}/src/lib/libcmd/lib.c | exec - sort -u exec - } > cmdext.h - prev ${PACKAGE_ast_INCLUDE}/shcmd.h done - prev ${PACKAGE_ast_INCLUDE}/shcmd.h - prev ${PACKAGE_ast_INCLUDE}/stk.h - prev ${PACKAGE_ast_INCLUDE}/error.h - prev ${PACKAGE_ast_INCLUDE}/ast.h done cmd.h done cmdinit.c exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -D_BLD_cmd -c cmdinit.c @@ -585,9 +422,6 @@ make install virtual prev cmd.req exec - ${STDCP} -f cmd.req ${INSTALLROOT}/lib/lib/cmd done - make ${PACKAGE_ast_INCLUDE} - exec - mkdir -p ${PACKAGE_ast_INCLUDE} - done make ${PACKAGE_ast_INCLUDE}/cmd.h prev cmd.h exec - ${STDCP} -f cmd.h ${PACKAGE_ast_INCLUDE}/cmd.h diff --git a/src/lib/libdll/Mamfile b/src/lib/libdll/Mamfile index cc7c97f7a502..085b1c2fdc0f 100644 --- a/src/lib/libdll/Mamfile +++ b/src/lib/libdll/Mamfile @@ -25,72 +25,6 @@ make install virtual prev dll.req make dlfcn.o make dlfcn.c - prev dll.h implicit dontcare virtual - prev xcoff.h implicit dontcare virtual - prev dl.h implicit dontcare virtual - make ${PACKAGE_ast_INCLUDE}/error.h implicit - make ${PACKAGE_ast_INCLUDE}/option.h implicit - make ${PACKAGE_ast_INCLUDE}/ast.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_api.h implicit - make ${PACKAGE_ast_INCLUDE}/vmalloc.h implicit - make ${PACKAGE_ast_INCLUDE}/ast_common.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_map.h implicit - make ${PACKAGE_ast_INCLUDE}/endian.h implicit - make ${PACKAGE_ast_INCLUDE}/bytesex.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_common.h - done - done - done - make ${PACKAGE_ast_INCLUDE}/ast_std.h implicit - make ${PACKAGE_ast_INCLUDE}/regex.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_api.h - make ${PACKAGE_ast_INCLUDE}/ast_wchar.h implicit - make ${PACKAGE_ast_INCLUDE}/wctype.h implicit - make ${PACKAGE_ast_INCLUDE}/ast_wctype.h implicit - prev ${PACKAGE_ast_INCLUDE}/endian.h - make ${PACKAGE_ast_INCLUDE}/wchar.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_wchar.h - done - done - done - make ${PACKAGE_ast_INCLUDE}/stdio.h implicit - make ${PACKAGE_ast_INCLUDE}/ast_stdio.h implicit - prev ${PACKAGE_ast_INCLUDE}/sfio_s.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_std.h - done - done - prev ${PACKAGE_ast_INCLUDE}/ast_common.h - done - prev ${PACKAGE_ast_INCLUDE}/ast_common.h - done - make ${PACKAGE_ast_INCLUDE}/getopt.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_getopt.h implicit - done - prev ${PACKAGE_ast_INCLUDE}/ast_map.h - prev ${PACKAGE_ast_INCLUDE}/ast_botch.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_limits.h implicit - make ${PACKAGE_ast_INCLUDE}/ast_fcntl.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_fs.h implicit - done - prev ${PACKAGE_ast_INCLUDE}/ast_getopt.h - make ${PACKAGE_ast_INCLUDE}/ast_sys.h implicit - prev ${PACKAGE_ast_INCLUDE}/getopt.h - prev ${PACKAGE_ast_INCLUDE}/endian.h - done - prev ${PACKAGE_ast_INCLUDE}/ast_lib.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_common.h - done - done - make ${PACKAGE_ast_INCLUDE}/sfio.h implicit - prev ${PACKAGE_ast_INCLUDE}/sfio_s.h - prev ${PACKAGE_ast_INCLUDE}/ast_common.h - prev ${PACKAGE_ast_INCLUDE}/ast_std.h - done - prev ${PACKAGE_ast_INCLUDE}/ast_std.h - done - done - prev ${PACKAGE_ast_INCLUDE}/ast.h - done make dlldefs.h implicit make FEATURE/dll prev features/dll @@ -100,25 +34,20 @@ make install virtual done exec - ${STDCP} -f FEATURE/dll dlldefs.h done - prev ${PACKAGE_ast_INCLUDE}/ast.h done dlfcn.c exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -D_BLD_dll -c dlfcn.c done dlfcn.o make dllopen.o make dllopen.c make dlllib.h implicit - prev ${PACKAGE_ast_INCLUDE}/error.h prev dlldefs.h - prev ${PACKAGE_ast_INCLUDE}/ast.h done done exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -D_BLD_dll -c dllopen.c done make dllfind.o make dllfind.c - prev ${PACKAGE_ast_INCLUDE}/error.h prev dlldefs.h - prev ${PACKAGE_ast_INCLUDE}/ast.h done exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -D_BLD_dll -c dllfind.c done @@ -136,36 +65,19 @@ make install virtual done make dllnext.o make dllnext.c - prev rld_interface.h implicit dontcare virtual prev dlldefs.h - prev ${PACKAGE_ast_INCLUDE}/ast.h done exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -D_BLD_dll -c dllnext.c done make dlllook.o make dlllook.c prev dlldefs.h - prev ${PACKAGE_ast_INCLUDE}/error.h - prev ${PACKAGE_ast_INCLUDE}/ast.h done exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -D_BLD_dll -c dlllook.c done make dllscan.o make dllscan.c prev dlldefs.h - prev ${PACKAGE_ast_INCLUDE}/vmalloc.h - make ${PACKAGE_ast_INCLUDE}/fts.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_mode.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_fs.h - prev ${PACKAGE_ast_INCLUDE}/ast_std.h - done - prev ${PACKAGE_ast_INCLUDE}/error.h - prev ${PACKAGE_ast_INCLUDE}/endian.h - make ${PACKAGE_ast_INCLUDE}/cdt.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_common.h - prev ${PACKAGE_ast_INCLUDE}/ast_std.h - done - prev ${PACKAGE_ast_INCLUDE}/ast.h done exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} -I. -I${PACKAGE_ast_INCLUDE} -D_BLD_dll -c dllscan.c done @@ -201,9 +113,6 @@ make install virtual prev dll.req exec - ${STDCP} -f dll.req ${INSTALLROOT}/lib/lib/dll done - make ${PACKAGE_ast_INCLUDE} - exec - mkdir -p ${PACKAGE_ast_INCLUDE} - done make ${PACKAGE_ast_INCLUDE}/dlldefs.h prev dlldefs.h exec - ${STDCP} -f dlldefs.h ${PACKAGE_ast_INCLUDE}/dlldefs.h diff --git a/src/lib/libsum/Mamfile b/src/lib/libsum/Mamfile index 789f97d8c91d..fad249ad860c 100644 --- a/src/lib/libsum/Mamfile +++ b/src/lib/libsum/Mamfile @@ -25,29 +25,11 @@ make install virtual prev sum.req make sumlib.o make sumlib.c - make sum-sha2.c implicit dontcare - make ${PACKAGE_ast_INCLUDE}/endian.h implicit - make ${PACKAGE_ast_INCLUDE}/bytesex.h implicit - make ${PACKAGE_ast_INCLUDE}/ast_common.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_map.h implicit - prev ${PACKAGE_ast_INCLUDE}/endian.h - done - done - done - done + prev sum-sha2.c implicit dontcare prev sum-sha1.c implicit dontcare prev sum-md5.c implicit dontcare - make sum-lmd.c implicit dontcare - prev sha2.h implicit dontcare virtual - prev sha1.h implicit dontcare virtual - prev md5.h implicit dontcare virtual - prev md4.h implicit dontcare virtual - done - make sum-prng.c implicit - make ${PACKAGE_ast_INCLUDE}/fnv.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_common.h - done - done + prev sum-lmd.c implicit dontcare + prev sum-prng.c implicit prev sum-bsd.c implicit prev sum-ast4.c implicit make FEATURE/sum implicit @@ -55,70 +37,9 @@ make install virtual bind -last exec - iffe ${IFFEFLAGS} -v -c "${CC} ${mam_cc_FLAGS} ${CCFLAGS} ${LDFLAGS}" ref ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} -I${INSTALLROOT}/include ${mam_libast} : run features/sum done - prev ${PACKAGE_ast_INCLUDE}/hashpart.h implicit - make ${PACKAGE_ast_INCLUDE}/swap.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_common.h - done - prev ${PACKAGE_ast_INCLUDE}/endian.h - make sum.h implicit - make ${PACKAGE_ast_INCLUDE}/ast.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_api.h implicit - make ${PACKAGE_ast_INCLUDE}/vmalloc.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_common.h - make ${PACKAGE_ast_INCLUDE}/ast_std.h implicit - make ${PACKAGE_ast_INCLUDE}/regex.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_api.h - make ${PACKAGE_ast_INCLUDE}/ast_wchar.h implicit - make ${PACKAGE_ast_INCLUDE}/wctype.h implicit - make ${PACKAGE_ast_INCLUDE}/ast_wctype.h implicit - prev ${PACKAGE_ast_INCLUDE}/endian.h - make ${PACKAGE_ast_INCLUDE}/wchar.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_wchar.h - done - done - done - make ${PACKAGE_ast_INCLUDE}/stdio.h implicit - make ${PACKAGE_ast_INCLUDE}/ast_stdio.h implicit - prev ${PACKAGE_ast_INCLUDE}/sfio_s.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_std.h - done - done - prev ${PACKAGE_ast_INCLUDE}/ast_common.h - done - prev ${PACKAGE_ast_INCLUDE}/ast_common.h - done - make ${PACKAGE_ast_INCLUDE}/getopt.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_getopt.h implicit - done - prev ${PACKAGE_ast_INCLUDE}/ast_map.h - prev ${PACKAGE_ast_INCLUDE}/ast_botch.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_limits.h implicit - make ${PACKAGE_ast_INCLUDE}/ast_fcntl.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_fs.h implicit - done - prev ${PACKAGE_ast_INCLUDE}/ast_getopt.h - make ${PACKAGE_ast_INCLUDE}/ast_sys.h implicit - prev ${PACKAGE_ast_INCLUDE}/getopt.h - prev ${PACKAGE_ast_INCLUDE}/endian.h - done - prev ${PACKAGE_ast_INCLUDE}/ast_lib.h implicit - prev ${PACKAGE_ast_INCLUDE}/ast_common.h - done - done - make ${PACKAGE_ast_INCLUDE}/sfio.h implicit - prev ${PACKAGE_ast_INCLUDE}/sfio_s.h - prev ${PACKAGE_ast_INCLUDE}/ast_common.h - prev ${PACKAGE_ast_INCLUDE}/ast_std.h - done - prev ${PACKAGE_ast_INCLUDE}/ast_std.h - done - done - make sum-att.c implicit - prev ${PACKAGE_ast_INCLUDE}/ast.h - done - make sum-crc.c implicit - prev ${PACKAGE_ast_INCLUDE}/ast.h - done + prev sum.h implicit + prev sum-att.c implicit + prev sum-crc.c implicit done exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -c sumlib.c done sumlib.o @@ -142,9 +63,6 @@ make install virtual prev sum.req exec - ${STDCP} -f sum.req ${INSTALLROOT}/lib/lib/sum done - make ${PACKAGE_ast_INCLUDE} - exec - mkdir -p ${PACKAGE_ast_INCLUDE} - done make ${PACKAGE_ast_INCLUDE}/sum.h prev sum.h exec - ${STDCP} -f sum.h ${PACKAGE_ast_INCLUDE}/sum.h