Index: head/bin/sh/Makefile =================================================================== --- head/bin/sh/Makefile (revision 301284) +++ head/bin/sh/Makefile (revision 301285) @@ -1,68 +1,71 @@ # @(#)Makefile 8.4 (Berkeley) 5/5/95 # $FreeBSD$ .include PACKAGE=runtime PROG= sh INSTALLFLAGS= -S SHSRCS= alias.c arith_yacc.c arith_yylex.c cd.c echo.c error.c eval.c \ exec.c expand.c \ histedit.c input.c jobs.c kill.c mail.c main.c memalloc.c miscbltin.c \ mystring.c options.c output.c parser.c printf.c redir.c show.c \ test.c trap.c var.c GENSRCS= builtins.c nodes.c syntax.c GENHDRS= builtins.h nodes.h syntax.h token.h SRCS= ${SHSRCS} ${GENSRCS} ${GENHDRS} # MLINKS for Shell built in commands for which there are no userland # utilities of the same name are handled with the associated manpage, # builtin.1 in share/man/man1/. LIBADD= edit CFLAGS+=-DSHELL -I. -I${.CURDIR} # for debug: # DEBUG_FLAGS+= -g -DDEBUG=2 -fno-inline WARNS?= 2 WFORMAT=0 .PATH: ${.CURDIR}/bltin \ ${.CURDIR}/../kill \ ${.CURDIR}/../test \ ${.CURDIR}/../../usr.bin/printf CLEANFILES+= mknodes mknodes.o \ mksyntax mksyntax.o CLEANFILES+= ${GENSRCS} ${GENHDRS} build-tools: mknodes mksyntax .ORDER: builtins.c builtins.h +builtins.h: .NOMETA builtins.c builtins.h: mkbuiltins builtins.def sh ${.CURDIR}/mkbuiltins ${.CURDIR} # XXX this is just to stop the default .c rule being used, so that the # intermediate object has a fixed name. # XXX we have a default .c rule, but no default .o rule. mknodes.o mksyntax.o: ${BUILD_TOOLS_META} ${CC} ${CFLAGS} ${LDFLAGS} ${.IMPSRC} ${LDLIBS} -o ${.TARGET} mknodes: mknodes.o ${BUILD_TOOLS_META} mksyntax: mksyntax.o ${BUILD_TOOLS_META} .ORDER: nodes.c nodes.h +nodes.h: .NOMETA nodes.c nodes.h: mknodes nodetypes nodes.c.pat ${BTOOLSPATH:U.}/mknodes ${.CURDIR}/nodetypes ${.CURDIR}/nodes.c.pat .ORDER: syntax.c syntax.h +syntax.h: .NOMETA syntax.c syntax.h: mksyntax ${BTOOLSPATH:U.}/mksyntax token.h: mktokens sh ${.CURDIR}/mktokens .if ${MK_TESTS} != "no" SUBDIR+= tests .endif .include Index: head/kerberos5/Makefile.inc =================================================================== --- head/kerberos5/Makefile.inc (revision 301284) +++ head/kerberos5/Makefile.inc (revision 301285) @@ -1,49 +1,50 @@ # $FreeBSD$ .include NO_LINT= KRB5DIR= ${.CURDIR}/../../../crypto/heimdal CFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR}/../../include .if ${MK_OPENLDAP} != "no" && !defined(COMPAT_32BIT) OPENLDAPBASE?= /usr/local LDAPLDADD= -lldap -llber LDAPDPADD= ${LDAPLDADD:C;^-l(.*)$;${OPENLDAPBASE}/lib/lib\1.a;} LDAPCFLAGS= -I${OPENLDAPBASE}/include -DOPENLDAP=1 -DLDAP_DEPRECATED=1 LDAPLDFLAGS= -L${OPENLDAPBASE}/lib -rpath ${OPENLDAPBASE}/lib .endif .if defined(SRCS) ETSRCS= \ ${KRB5DIR}/lib/asn1/asn1_err.et \ ${KRB5DIR}/lib/hdb/hdb_err.et \ ${KRB5DIR}/lib/kadm5/kadm5_err.et \ ${KRB5DIR}/lib/krb5/heim_err.et \ ${KRB5DIR}/lib/krb5/k524_err.et \ ${KRB5DIR}/lib/krb5/krb5_err.et \ ${KRB5DIR}/lib/krb5/krb_err.et \ ${KRB5DIR}/lib/gssapi/krb5/gkrb5_err.et \ ${KRB5DIR}/lib/hx509/hx509_err.et \ ${KRB5DIR}/lib/wind/wind_err.et \ ${KRB5DIR}/lib/ntlm/ntlm_err.et .for ET in ${ETSRCS} .for _ET in ${ET:T:R} .if ${SRCS:M${_ET}.[ch]} != "" .ORDER: ${_ET}.h ${_ET}.c +${_ET}.c: .NOMETA ${_ET}.c ${_ET}.h: ${ET} compile_et ${.ALLSRC} CLEANFILES+= ${_ET}.h ${_ET}.c .endif .endfor .endfor .endif # defined(SRCS) ASN1_COMPILE= asn1_compile MAKE_ROKEN= make-roken SLC= slc Index: head/kerberos5/lib/libasn1/Makefile =================================================================== --- head/kerberos5/lib/libasn1/Makefile (revision 301284) +++ head/kerberos5/lib/libasn1/Makefile (revision 301285) @@ -1,123 +1,132 @@ # $FreeBSD$ LIB= asn1 LDFLAGS= -Wl,--no-undefined INCS= asn1_err.h asn1-common.h heim_asn1.h der.h der-protos.h der-private.h LIBADD= com_err roken VERSION_MAP= ${.CURDIR}/version.map SRCS= asn1_err.c \ asn1_err.h \ der.c \ der_copy.c \ der_cmp.c \ der_free.c \ der_format.c \ der_get.c \ der_length.c \ der_put.c \ extra.c \ template.c \ timegm.c \ ${GEN:S/.x$/.c/:S/.hx$/.h/} CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken -I. GEN_RFC2459= asn1_rfc2459_asn1.x rfc2459_asn1.hx rfc2459_asn1-priv.hx GEN_CMS= asn1_cms_asn1.x cms_asn1.hx cms_asn1-priv.hx GEN_K5= asn1_krb5_asn1.x krb5_asn1.hx krb5_asn1-priv.hx GEN_PKINIT= asn1_pkinit_asn1.x pkinit_asn1.hx pkinit_asn1-priv.hx GEN_PKCS8= asn1_pkcs8_asn1.x pkcs8_asn1.hx pkcs8_asn1-priv.hx GEN_PKCS9= asn1_pkcs9_asn1.x pkcs9_asn1.hx pkcs9_asn1-priv.hx GEN_PKCS12= asn1_pkcs12_asn1.x pkcs12_asn1.hx pkcs12_asn1-priv.hx GEN_DIGEST= asn1_digest_asn1.x digest_asn1.hx digest_asn1-priv.hx GEN_KX509= asn1_kx509_asn1.x kx509_asn1.hx kx509_asn1-priv.hx GEN+= ${GEN_RFC2459} GEN+= ${GEN_CMS} GEN+= ${GEN_K5} GEN+= ${GEN_PKINIT} GEN+= ${GEN_PKCS8} GEN+= ${GEN_PKCS9} GEN+= ${GEN_PKCS12} GEN+= ${GEN_DIGEST} GEN+= ${GEN_KX509} CLEANFILES= ${GEN} ${GEN:S/.x$/.c/:S/.hx$/.h/} *_asn1_files INCS+= krb5_asn1.h \ pkinit_asn1.h \ cms_asn1.h \ rfc2459_asn1.h \ pkcs8_asn1.h \ pkcs9_asn1.h \ pkcs12_asn1.h \ digest_asn1.h \ kx509_asn1.h .ORDER: ${GEN_CMS} +${GEN_CMS:[2..-1]}: .NOMETA ${GEN_CMS}: cms.asn1 cms.opt ${ASN1_COMPILE} --one-code-file \ --option-file=${.ALLSRC:M*.opt} ${.ALLSRC:M*.asn1} cms_asn1 .ORDER: ${GEN_RFC2459} +${GEN_RFC2459:[2..-1]}: .NOMETA ${GEN_RFC2459}: rfc2459.asn1 ${ASN1_COMPILE} \ --one-code-file \ --preserve-binary=TBSCertificate \ --preserve-binary=TBSCRLCertList \ --preserve-binary=Name \ --sequence=GeneralNames \ --sequence=Extensions \ --sequence=CRLDistributionPoints ${.ALLSRC:M*.asn1} rfc2459_asn1 .ORDER: ${GEN_K5} +${GEN_K5:[2..-1]}: .NOMETA ${GEN_K5}: krb5.asn1 krb5.opt ${ASN1_COMPILE} \ --one-code-file \ --option-file=${.ALLSRC:M*.opt} \ ${.ALLSRC:M*.asn1} krb5_asn1 .ORDER: ${GEN_PKINIT} +${GEN_PKINIT:[2..-1]}: .NOMETA ${GEN_PKINIT}: pkinit.asn1 ${ASN1_COMPILE} --one-code-file \ ${.ALLSRC:M*.asn1} pkinit_asn1 .ORDER: ${GEN_PKCS8} +${GEN_PKCS8:[2..-1]}: .NOMETA ${GEN_PKCS8}: pkcs8.asn1 ${ASN1_COMPILE} --one-code-file \ ${.ALLSRC:M*.asn1} pkcs8_asn1 .ORDER: ${GEN_PKCS9} +${GEN_PKCS9:[2..-1]}: .NOMETA ${GEN_PKCS9}: pkcs9.asn1 ${ASN1_COMPILE} --one-code-file \ ${.ALLSRC:M*.asn1} pkcs9_asn1 .ORDER: ${GEN_PKCS12} +${GEN_PKCS12:[2..-1]}: .NOMETA ${GEN_PKCS12}: pkcs12.asn1 ${ASN1_COMPILE} --one-code-file \ ${.ALLSRC:M*.asn1} pkcs12_asn1 .ORDER: ${GEN_DIGEST} +${GEN_DIGEST:[2..-1]}: .NOMETA ${GEN_DIGEST}: digest.asn1 ${ASN1_COMPILE} --one-code-file \ ${.ALLSRC:M*.asn1} digest_asn1 .ORDER: ${GEN_KX509} +${GEN_KX509:[2..-1]}: .NOMETA ${GEN_KX509}: kx509.asn1 ${ASN1_COMPILE} --one-code-file \ ${.ALLSRC:M*.asn1} kx509_asn1 .SUFFIXES: .h .c .x .hx .x.c: ${CP} ${.IMPSRC} ${.TARGET} .hx.h: ${CP} ${.IMPSRC} ${.TARGET} .include .SUFFIXES: .h .c .x .hx .PATH: ${KRB5DIR}/lib/asn1 Index: head/kerberos5/lib/libgssapi_spnego/Makefile =================================================================== --- head/kerberos5/lib/libgssapi_spnego/Makefile (revision 301284) +++ head/kerberos5/lib/libgssapi_spnego/Makefile (revision 301285) @@ -1,57 +1,58 @@ # $FreeBSD$ LIB= gssapi_spnego LDFLAGS= -Wl,-Bsymbolic -Wl,--no-undefined LIBADD= gssapi heimbase asn1 roken SHLIB_MAJOR= 10 SRCS= accept_sec_context.c \ compat.c \ context_stubs.c \ cred_stubs.c \ external.c \ init_sec_context.c \ freebsd_compat.c \ ${GEN:S/.x$/.c/:S/.hx$/.h/} \ gss_oid.c GEN= asn1_ContextFlags.x \ asn1_MechType.x \ asn1_MechTypeList.x \ asn1_NegotiationToken.x \ asn1_NegotiationTokenWin.x \ asn1_NegHints.x \ asn1_NegTokenInit.x \ asn1_NegTokenInitWin.x \ asn1_NegTokenResp.x \ spnego_asn1.hx \ spnego_asn1-priv.hx CFLAGS+=-I${KRB5DIR}/lib/gssapi CFLAGS+=-I${KRB5DIR}/lib/gssapi/gssapi CFLAGS+=-I${KRB5DIR}/lib/gssapi/spnego CFLAGS+=-I${KRB5DIR}/lib/asn1 CFLAGS+=-I${.CURDIR}/../../../lib/libgssapi CFLAGS+=-I${KRB5DIR}/lib/roken -I. CLEANFILES= ${GEN} ${GEN:S/.x$/.c/:S/.hx$/.h/} \ spnego_asn1_files spnego_asn1-template.c .ORDER: ${GEN} +${GEN:[2..-1]}: .NOMETA ${GEN}: spnego.asn1 spnego.opt ${ASN1_COMPILE} --option-file=${.ALLSRC:M*.opt} \ ${.ALLSRC:M*.asn1} spnego_asn1 .SUFFIXES: .h .c .x .hx .x.c: ${CP} ${.IMPSRC} ${.TARGET} .hx.h: ${CP} ${.IMPSRC} ${.TARGET} .include .SUFFIXES: .h .c .x .hx .PATH: ${KRB5DIR}/lib/gssapi/spnego ${.CURDIR}/../../../lib/libgssapi ${.CURDIR}/../libgssapi_krb5 Index: head/kerberos5/lib/libhdb/Makefile =================================================================== --- head/kerberos5/lib/libhdb/Makefile (revision 301284) +++ head/kerberos5/lib/libhdb/Makefile (revision 301285) @@ -1,104 +1,105 @@ # $FreeBSD$ LIB= hdb LDFLAGS= -Wl,--no-undefined ${LDAPLDFLAGS} VERSION_MAP= ${KRB5DIR}/lib/hdb/version-script.map LIBADD= asn1 com_err krb5 roken sqlite3 LDADD= ${LDAPLDADD} DPADD= ${LDAPDPADD} MAN= HDB.3 hdb_entry_ex.3 MLINKS= HDB.3 hdb__del.3 \ HDB.3 hdb__get.3 \ HDB.3 hdb__put.3 \ HDB.3 hdb_auth_status.3 \ HDB.3 hdb_check_constrained_delegation.3 \ HDB.3 hdb_check_pkinit_ms_upn_match.3 \ HDB.3 hdb_check_s4u2self.3 \ HDB.3 hdb_close.3 \ HDB.3 hdb_destroy.3 \ HDB.3 hdb_fetch_kvno.3 \ HDB.3 hdb_firstkey.3 \ HDB.3 hdb_free.3 \ HDB.3 hdb_get_realms.3 \ HDB.3 hdb_lock.3 \ HDB.3 hdb_name.3 \ HDB.3 hdb_nextkey.3 \ HDB.3 hdb_open.3 \ HDB.3 hdb_password.3 \ HDB.3 hdb_remove.3 \ HDB.3 hdb_rename.3 \ HDB.3 hdb_store.3 \ HDB.3 hdb_unlock.3 INCS= hdb-protos.h \ hdb.h \ hdb_asn1.h \ hdb_err.h SRCS= common.c \ db.c \ db3.c \ dbinfo.c \ ext.c \ hdb-ldap.c \ hdb.c \ hdb_err.c \ hdb_err.h \ hdb-sqlite.c \ hdb-keytab.c \ hdb-mitdb.c \ keys.c \ keytab.c \ mkey.c \ ndbm.c \ print.c \ ${GEN:S/.x$/.c/:S/.hx$/.h/} CFLAGS+=-I${KRB5DIR}/lib/hdb -I${KRB5DIR}/lib/asn1 \ -I${KRB5DIR}/lib/roken -I${.CURDIR}/../../../contrib/sqlite3/ \ -I${KRB5DIR}/lib/krb5 \ -I. ${LDAPCFLAGS} CFLAGS+=-DHDB_DB_DIR="\"/var/heimdal\"" GEN= asn1_Salt.x \ asn1_Key.x \ asn1_Event.x \ asn1_HDBFlags.x \ asn1_GENERATION.x \ asn1_HDB_Ext_PKINIT_acl.x \ asn1_HDB_Ext_PKINIT_cert.x \ asn1_HDB_Ext_PKINIT_hash.x \ asn1_HDB_Ext_Constrained_delegation_acl.x \ asn1_HDB_Ext_Lan_Manager_OWF.x \ asn1_HDB_Ext_Password.x \ asn1_HDB_Ext_Aliases.x \ asn1_HDB_extension.x \ asn1_HDB_extensions.x \ asn1_hdb_entry.x \ asn1_hdb_entry_alias.x \ asn1_hdb_keyset.x \ hdb_asn1.hx \ hdb_asn1-priv.hx CLEANFILES= ${GEN} ${GEN:S/.x$/.c/:S/.hx$/.h/} hdb_asn1_files \ hdb_asn1-template.[ch]* .ORDER: ${GEN} +${GEN:[2..-1]}: .NOMETA ${GEN}: hdb.asn1 ${ASN1_COMPILE} ${.ALLSRC:M*.asn1} hdb_asn1 .SUFFIXES: .h .c .x .hx .x.c: ${CP} ${.IMPSRC} ${.TARGET} .hx.h: ${CP} ${.IMPSRC} ${.TARGET} .include .SUFFIXES: .h .c .x .hx .PATH: ${KRB5DIR}/lib/hdb ${KRB5DIR}/doc/doxyout/hdb/man/man3/ Index: head/kerberos5/lib/libhx509/Makefile =================================================================== --- head/kerberos5/lib/libhx509/Makefile (revision 301284) +++ head/kerberos5/lib/libhx509/Makefile (revision 301285) @@ -1,297 +1,300 @@ # $FreeBSD$ LIB= hx509 LDFLAGS= -Wl,--no-undefined VERSION_MAP= ${KRB5DIR}/lib/hx509/version-script.map LIBADD= asn1 com_err crypto roken wind MAN= hx509.3 \ hx509_ca.3 \ hx509_cert.3 \ hx509_cms.3 \ hx509_crypto.3 \ hx509_env.3 \ hx509_error.3 \ hx509_keyset.3 \ hx509_lock.3 \ hx509_misc.3 \ hx509_name.3 \ hx509_peer.3 \ hx509_print.3 \ hx509_query.3 \ hx509_revoke.3 \ hx509_verify.3 MLINKS= hx509.3 hx509_context_free.3 \ hx509.3 hx509_context_init.3 \ hx509_ca.3 hx509_ca_sign.3 \ hx509_ca.3 hx509_ca_sign_self.3 \ hx509_ca.3 hx509_ca_tbs_add_crl_dp_uri.3 \ hx509_ca.3 hx509_ca_tbs_add_eku.3 \ hx509_ca.3 hx509_ca_tbs_add_san_hostname.3 \ hx509_ca.3 hx509_ca_tbs_add_san_jid.3 \ hx509_ca.3 hx509_ca_tbs_add_san_ms_upn.3 \ hx509_ca.3 hx509_ca_tbs_add_san_otherName.3 \ hx509_ca.3 hx509_ca_tbs_add_san_pkinit.3 \ hx509_ca.3 hx509_ca_tbs_add_san_rfc822name.3 \ hx509_ca.3 hx509_ca_tbs_free.3 \ hx509_ca.3 hx509_ca_tbs_init.3 \ hx509_ca.3 hx509_ca_tbs_set_ca.3 \ hx509_ca.3 hx509_ca_tbs_set_domaincontroller.3 \ hx509_ca.3 hx509_ca_tbs_set_notAfter.3 \ hx509_ca.3 hx509_ca_tbs_set_notAfter_lifetime.3 \ hx509_ca.3 hx509_ca_tbs_set_notBefore.3 \ hx509_ca.3 hx509_ca_tbs_set_proxy.3 \ hx509_ca.3 hx509_ca_tbs_set_serialnumber.3 \ hx509_ca.3 hx509_ca_tbs_set_spki.3 \ hx509_ca.3 hx509_ca_tbs_set_subject.3 \ hx509_ca.3 hx509_ca_tbs_set_template.3 \ hx509_ca.3 hx509_ca_tbs_set_unique.3 \ hx509_ca.3 hx509_ca_tbs_subject_expand.3 \ hx509_ca.3 hx509_ca_tbs_template_units.3 \ hx509_cert.3 hx509_cert_binary.3 \ hx509_cert.3 hx509_cert_check_eku.3 \ hx509_cert.3 hx509_cert_cmp.3 \ hx509_cert.3 hx509_cert_find_subjectAltName_otherName.3 \ hx509_cert.3 hx509_cert_free.3 \ hx509_cert.3 hx509_cert_get_SPKI.3 \ hx509_cert.3 hx509_cert_get_SPKI_AlgorithmIdentifier.3 \ hx509_cert.3 hx509_cert_get_attribute.3 \ hx509_cert.3 hx509_cert_get_base_subject.3 \ hx509_cert.3 hx509_cert_get_friendly_name.3 \ hx509_cert.3 hx509_cert_get_issuer.3 \ hx509_cert.3 hx509_cert_get_issuer_unique_id.3 \ hx509_cert.3 hx509_cert_get_notAfter.3 \ hx509_cert.3 hx509_cert_get_notBefore.3 \ hx509_cert.3 hx509_cert_get_serialnumber.3 \ hx509_cert.3 hx509_cert_get_subject.3 \ hx509_cert.3 hx509_cert_get_subject_unique_id.3 \ hx509_cert.3 hx509_cert_init.3 \ hx509_cert.3 hx509_cert_init_data.3 \ hx509_cert.3 hx509_cert_ref.3 \ hx509_cert.3 hx509_cert_set_friendly_name.3 \ hx509_cert.3 hx509_print_cert.3 \ hx509_cert.3 hx509_query_alloc.3 \ hx509_cert.3 hx509_query_free.3 \ hx509_cert.3 hx509_query_match_cmp_func.3 \ hx509_cert.3 hx509_query_match_eku.3 \ hx509_cert.3 hx509_query_match_friendly_name.3 \ hx509_cert.3 hx509_query_match_issuer_serial.3 \ hx509_cert.3 hx509_query_match_option.3 \ hx509_cert.3 hx509_query_statistic_file.3 \ hx509_cert.3 hx509_query_unparse_stats.3 \ hx509_cert.3 hx509_verify_ctx_f_allow_default_trustanchors.3 \ hx509_cert.3 hx509_verify_hostname.3 \ hx509_cms.3 hx509_cms_create_signed_1.3 \ hx509_cms.3 hx509_cms_envelope_1.3 \ hx509_cms.3 hx509_cms_unenvelope.3 \ hx509_cms.3 hx509_cms_unwrap_ContentInfo.3 \ hx509_cms.3 hx509_cms_verify_signed.3 \ hx509_cms.3 hx509_cms_wrap_ContentInfo.3 \ hx509_crypto.3 hx509_verify_signature.3 \ hx509_env.3 hx509_env_add.3 \ hx509_env.3 hx509_env_add_binding.3 \ hx509_env.3 hx509_env_find.3 \ hx509_env.3 hx509_env_find_binding.3 \ hx509_env.3 hx509_env_free.3 \ hx509_env.3 hx509_env_lfind.3 \ hx509_error.3 hx509_clear_error_string.3 \ hx509_error.3 hx509_err.3 \ hx509_error.3 hx509_free_error_string.3 \ hx509_error.3 hx509_get_error_string.3 \ hx509_error.3 hx509_set_error_string.3 \ hx509_error.3 hx509_set_error_stringv.3 \ hx509_keyset.3 hx509_certs_add.3 \ hx509_keyset.3 hx509_certs_append.3 \ hx509_keyset.3 hx509_certs_end_seq.3 \ hx509_keyset.3 hx509_certs_filter.3 \ hx509_keyset.3 hx509_certs_find.3 \ hx509_keyset.3 hx509_certs_free.3 \ hx509_keyset.3 hx509_certs_info.3 \ hx509_keyset.3 hx509_certs_init.3 \ hx509_keyset.3 hx509_certs_iter_f.3 \ hx509_keyset.3 hx509_certs_merge.3 \ hx509_keyset.3 hx509_certs_next_cert.3 \ hx509_keyset.3 hx509_certs_start_seq.3 \ hx509_keyset.3 hx509_certs_store.3 \ hx509_keyset.3 hx509_ci_print_names.3 \ hx509_keyset.3 hx509_get_one_cert.3 \ hx509_misc.3 hx509_free_octet_string_list.3 \ hx509_misc.3 hx509_xfree.3 \ hx509_name.3 hx509_general_name_unparse.3 \ hx509_name.3 hx509_name_binary.3 \ hx509_name.3 hx509_name_cmp.3 \ hx509_name.3 hx509_name_copy.3 \ hx509_name.3 hx509_name_expand.3 \ hx509_name.3 hx509_name_free.3 \ hx509_name.3 hx509_name_is_null_p.3 \ hx509_name.3 hx509_name_to_Name.3 \ hx509_name.3 hx509_name_to_string.3 \ hx509_name.3 hx509_parse_name.3 \ hx509_name.3 hx509_unparse_der_name.3 \ hx509_peer.3 hx509_peer_info_add_cms_alg.3 \ hx509_peer.3 hx509_peer_info_alloc.3 \ hx509_peer.3 hx509_peer_info_free.3 \ hx509_peer.3 hx509_peer_info_set_cert.3 \ hx509_peer.3 hx509_peer_info_set_cms_algs.3 \ hx509_print.3 hx509_bitstring_print.3 \ hx509_print.3 hx509_cert_keyusage_print.3 \ hx509_print.3 hx509_oid_print.3 \ hx509_print.3 hx509_oid_sprint.3 \ hx509_print.3 hx509_print_stdout.3 \ hx509_print.3 hx509_validate_cert.3 \ hx509_print.3 hx509_validate_ctx_add_flags.3 \ hx509_print.3 hx509_validate_ctx_free.3 \ hx509_print.3 hx509_validate_ctx_init.3 \ hx509_print.3 hx509_validate_ctx_set_print.3 \ hx509_revoke.3 hx509_ocsp_request.3 \ hx509_revoke.3 hx509_revoke_add_crl.3 \ hx509_revoke.3 hx509_revoke_add_ocsp.3 \ hx509_revoke.3 hx509_revoke_free.3 \ hx509_revoke.3 hx509_revoke_init.3 \ hx509_revoke.3 hx509_revoke_ocsp_print.3 \ hx509_revoke.3 hx509_revoke_verify.3 \ hx509_verify.3 hx509_context_set_missing_revoke.3 \ hx509_verify.3 hx509_crl_add_revoked_certs.3 \ hx509_verify.3 hx509_crl_alloc.3 \ hx509_verify.3 hx509_crl_free.3 \ hx509_verify.3 hx509_crl_lifetime.3 \ hx509_verify.3 hx509_crl_sign.3 \ hx509_verify.3 hx509_ocsp_verify.3 \ hx509_verify.3 hx509_verify_attach_anchors.3 \ hx509_verify.3 hx509_verify_attach_revoke.3 \ hx509_verify.3 hx509_verify_destroy_ctx.3 \ hx509_verify.3 hx509_verify_init_ctx.3 \ hx509_verify.3 hx509_verify_path.3 \ hx509_verify.3 hx509_verify_set_max_depth.3 \ hx509_verify.3 hx509_verify_set_proxy_certificate.3 \ hx509_verify.3 hx509_verify_set_strict_rfc3280_verification.3 \ hx509_verify.3 hx509_verify_set_time.3 INCS= hx509-private.h \ hx509-protos.h \ hx509.h \ hx509_err.h SRCS= ca.c \ cert.c \ cms.c \ collector.c \ crypto.c \ doxygen.c \ error.c \ env.c \ file.c \ sel.c \ sel-gram.y \ sel-lex.l \ keyset.c \ ks_dir.c \ ks_file.c \ ks_mem.c \ ks_null.c \ ks_p11.c \ ks_p12.c \ ks_keychain.c \ lock.c \ name.c \ peer.c \ print.c \ softp11.c \ req.c \ revoke.c SRCS+= hx509_err.c \ hx509_err.h SRCS+= ${GEN_OCSP:S/.x$/.c/:S/.hx$/.h/} \ ${GEN_PKCS10:S/.x$/.c/:S/.hx$/.h/} CFLAGS+=-I${KRB5DIR}/lib/hx509 CFLAGS+=-I${KRB5DIR}/lib/hx509/ref CFLAGS+=-I${KRB5DIR}/lib/asn1 CFLAGS+=-I${KRB5DIR}/lib/wind CFLAGS+=-I${KRB5DIR}/lib/roken -I. GEN_OCSP= \ asn1_OCSPBasicOCSPResponse.x \ asn1_OCSPCertID.x \ asn1_OCSPCertStatus.x \ asn1_OCSPInnerRequest.x \ asn1_OCSPKeyHash.x \ asn1_OCSPRequest.x \ asn1_OCSPResponderID.x \ asn1_OCSPResponse.x \ asn1_OCSPResponseBytes.x \ asn1_OCSPResponseData.x \ asn1_OCSPResponseStatus.x \ asn1_OCSPSignature.x \ asn1_OCSPSingleResponse.x \ asn1_OCSPTBSRequest.x \ asn1_OCSPVersion.x \ asn1_id_pkix_ocsp.x \ asn1_id_pkix_ocsp_basic.x \ asn1_id_pkix_ocsp_nonce.x \ ocsp_asn1.hx \ ocsp_asn1-priv.hx GEN_PKCS10= \ asn1_CertificationRequestInfo.x \ asn1_CertificationRequest.x \ pkcs10_asn1.hx \ pkcs10_asn1-priv.hx GEN_CRMF= \ asn1_CRMFRDNSequence.x \ asn1_CertReqMessages.x \ asn1_CertReqMsg.x \ asn1_CertRequest.x \ asn1_CertTemplate.x \ asn1_Controls.x \ asn1_PBMParameter.x \ asn1_PKMACValue.x \ asn1_POPOPrivKey.x \ asn1_POPOSigningKey.x \ asn1_POPOSigningKeyInput.x \ asn1_ProofOfPossession.x \ asn1_SubsequentMessage.x \ crmf_asn1.hx \ crmf_asn1-priv.hx GEN+= ${GEN_OCSP} GEN+= ${GEN_PKCS10} GEN+= ${GEN_CRMF} CLEANFILES= ${GEN} ${GEN:S/.x$/.c/:S/.hx$/.h/} ocsp_asn1_files \ pkcs10_asn1_files crmf_asn1_files ocsp_asn1-template.[ch]* \ pkcs10_asn1-template.[ch]* crmf_asn1-template.[ch]* INCS+= ocsp_asn1.h pkcs10_asn1.h crmf_asn1.h .ORDER: ${GEN_OCSP} +${GEN_OCSP:[2..-1]}: .NOMETA ${GEN_OCSP}: ocsp.asn1 ocsp.opt ${ASN1_COMPILE} --option-file=${.ALLSRC:M*.opt} \ ${.ALLSRC:M*.asn1} ocsp_asn1 .ORDER: ${GEN_PKCS10} +${GEN_PKCS10:[2..-1]}: .NOMETA ${GEN_PKCS10}: pkcs10.asn1 pkcs10.opt ${ASN1_COMPILE} --option-file=${.ALLSRC:M*.opt} \ ${.ALLSRC:M*.asn1} pkcs10_asn1 .ORDER: ${GEN_CRMF} +${GEN_CRMF:[2..-1]}: .NOMETA ${GEN_CRMF}: crmf.asn1 ${ASN1_COMPILE} ${.ALLSRC:M*.asn1} crmf_asn1 .SUFFIXES: .h .c .x .hx .x.c: ${CP} ${.IMPSRC} ${.TARGET} .hx.h: ${CP} ${.IMPSRC} ${.TARGET} .include .SUFFIXES: .h .c .x .hx .PATH: ${KRB5DIR}/lib/hx509 ${KRB5DIR}/lib/asn1 ${KRB5DIR}/doc/doxyout/hx509/man/man3 Index: head/share/mk/bsd.dep.mk =================================================================== --- head/share/mk/bsd.dep.mk (revision 301284) +++ head/share/mk/bsd.dep.mk (revision 301285) @@ -1,301 +1,303 @@ # $FreeBSD$ # # The include file handles Makefile dependencies. # # # +++ variables +++ # # CLEANDEPENDDIRS Additional directories to remove for the cleandepend # target. # # CLEANDEPENDFILES Additional files to remove for the cleandepend target. # # CTAGS A tags file generation program [gtags] # # CTAGSFLAGS Options for ctags(1) [not set] # # DEPENDFILE dependencies file [.depend] # # GTAGSFLAGS Options for gtags(1) [-o] # # HTAGSFLAGS Options for htags(1) [not set] # # SRCS List of source files (c, c++, assembler) # # DPSRCS List of source files which are needed for generating # dependencies, ${SRCS} are always part of it. # # +++ targets +++ # # cleandepend: # remove ${CLEANDEPENDFILES}; remove ${CLEANDEPENDDIRS} and all # contents. # # depend: # Make the dependencies for the source files, and store # them in the file ${DEPENDFILE}. # # tags: # In "ctags" mode, create a tags file for the source files. # In "gtags" mode, create a (GLOBAL) gtags file for the # source files. If HTML is defined, htags(1) is also run # after gtags(1). .if !target(____) .error bsd.dep.mk cannot be included directly. .endif CTAGS?= gtags CTAGSFLAGS?= GTAGSFLAGS?= -o HTAGSFLAGS?= .if ${MK_DIRDEPS_BUILD} == "no" .MAKE.DEPENDFILE= ${DEPENDFILE} .endif CLEANDEPENDFILES+= ${DEPENDFILE} ${DEPENDFILE}.* .if ${MK_META_MODE} == "yes" CLEANDEPENDFILES+= *.meta .endif # Keep `tags' here, before SRCS are mangled below for `depend'. .if !target(tags) && defined(SRCS) && !defined(NO_TAGS) tags: ${SRCS} .if ${CTAGS:T} == "gtags" @cd ${.CURDIR} && ${CTAGS} ${GTAGSFLAGS} ${.OBJDIR} .if defined(HTML) @cd ${.CURDIR} && htags ${HTAGSFLAGS} -d ${.OBJDIR} ${.OBJDIR} .endif .else @${CTAGS} ${CTAGSFLAGS} -f /dev/stdout \ ${.ALLSRC:N*.h} | sed "s;${.CURDIR}/;;" > ${.TARGET} .endif .endif # Skip reading .depend when not needed to speed up tree-walks # and simple lookups. .if !empty(.MAKEFLAGS:M-V${_V_READ_DEPEND}) || make(obj) || make(clean*) || \ make(install*) || make(analyze) _SKIP_READ_DEPEND= 1 .if ${MK_DIRDEPS_BUILD} == "no" .MAKE.DEPENDFILE= /dev/null .endif .endif .if defined(SRCS) CLEANFILES?= .for _S in ${SRCS:N*.[dhly]} OBJS_DEPEND_GUESS.${_S:R}.o= ${_S} .endfor # Lexical analyzers .for _LSRC in ${SRCS:M*.l:N*/*} .for _LC in ${_LSRC:R}.c ${_LC}: ${_LSRC} ${LEX} ${LFLAGS} -o${.TARGET} ${.ALLSRC} OBJS_DEPEND_GUESS.${_LC:R}.o= ${_LC} SRCS:= ${SRCS:S/${_LSRC}/${_LC}/} CLEANFILES+= ${_LC} .endfor .endfor # Yacc grammars .for _YSRC in ${SRCS:M*.y:N*/*} .for _YC in ${_YSRC:R}.c SRCS:= ${SRCS:S/${_YSRC}/${_YC}/} CLEANFILES+= ${_YC} .if !empty(YFLAGS:M-d) && !empty(SRCS:My.tab.h) .ORDER: ${_YC} y.tab.h +y.tab.h: .NOMETA ${_YC} y.tab.h: ${_YSRC} ${YACC} ${YFLAGS} ${.ALLSRC} cp y.tab.c ${_YC} CLEANFILES+= y.tab.c y.tab.h .elif !empty(YFLAGS:M-d) .for _YH in ${_YC:R}.h .ORDER: ${_YC} ${_YH} +${_YH}: .NOMETA ${_YC} ${_YH}: ${_YSRC} ${YACC} ${YFLAGS} -o ${_YC} ${.ALLSRC} SRCS+= ${_YH} CLEANFILES+= ${_YH} .endfor .else ${_YC}: ${_YSRC} ${YACC} ${YFLAGS} -o ${_YC} ${.ALLSRC} .endif OBJS_DEPEND_GUESS.${_YC:R}.o= ${_YC} .endfor .endfor # DTrace probe definitions .if ${SRCS:M*.d} CFLAGS+= -I${.OBJDIR} .endif .for _DSRC in ${SRCS:M*.d:N*/*} .for _D in ${_DSRC:R} SRCS+= ${_D}.h ${_D}.h: ${_DSRC} ${DTRACE} ${DTRACEFLAGS} -h -s ${.ALLSRC} SRCS:= ${SRCS:S/^${_DSRC}$//} OBJS+= ${_D}.o CLEANFILES+= ${_D}.h ${_D}.o ${_D}.o: ${_DSRC} ${OBJS:S/^${_D}.o$//} @rm -f ${.TARGET} ${DTRACE} ${DTRACEFLAGS} -G -o ${.TARGET} -s ${.ALLSRC:N*.h} .if defined(LIB) CLEANFILES+= ${_D}.So ${_D}.po ${_D}.So: ${_DSRC} ${SOBJS:S/^${_D}.So$//} @rm -f ${.TARGET} ${DTRACE} ${DTRACEFLAGS} -G -o ${.TARGET} -s ${.ALLSRC:N*.h} ${_D}.po: ${_DSRC} ${POBJS:S/^${_D}.po$//} @rm -f ${.TARGET} ${DTRACE} ${DTRACEFLAGS} -G -o ${.TARGET} -s ${.ALLSRC:N*.h} .endif .endfor .endfor .if !empty(.MAKE.MODE:Mmeta) && empty(.MAKE.MODE:Mnofilemon) _meta_filemon= 1 .endif .if ${MAKE_VERSION} < 20160220 DEPEND_MP?= -MP .endif # Handle OBJS=../somefile.o hacks. Just replace '/' rather than use :T to # avoid collisions. DEPEND_FILTER= C,/,_,g DEPENDSRCS= ${SRCS:M*.[cSC]} ${SRCS:M*.cxx} ${SRCS:M*.cpp} ${SRCS:M*.cc} .if !empty(DEPENDSRCS) DEPENDOBJS+= ${DEPENDSRCS:R:S,$,.o,} .endif DEPENDFILES_OBJS= ${DEPENDOBJS:O:u:${DEPEND_FILTER}:C/^/${DEPENDFILE}./} DEPEND_CFLAGS+= -MD ${DEPEND_MP} -MF${DEPENDFILE}.${.TARGET:${DEPEND_FILTER}} DEPEND_CFLAGS+= -MT${.TARGET} # Skip generating or including .depend.* files if in meta+filemon mode since # it will track dependencies itself. OBJS_DEPEND_GUESS is still used though. .if !defined(_meta_filemon) .if defined(.PARSEDIR) # Only add in DEPEND_CFLAGS for CFLAGS on files we expect from DEPENDOBJS # as those are the only ones we will include. DEPEND_CFLAGS_CONDITION= "${DEPENDOBJS:M${.TARGET:${DEPEND_FILTER}}}" != "" CFLAGS+= ${${DEPEND_CFLAGS_CONDITION}:?${DEPEND_CFLAGS}:} .else CFLAGS+= ${DEPEND_CFLAGS} .endif .if !defined(_SKIP_READ_DEPEND) .for __depend_obj in ${DEPENDFILES_OBJS} .if ${MAKE_VERSION} < 20160220 .sinclude "${.OBJDIR}/${__depend_obj}" .else .dinclude "${.OBJDIR}/${__depend_obj}" .endif .endfor .endif # !defined(_SKIP_READ_DEPEND) .endif # !defined(_meta_filemon) .endif # defined(SRCS) .if ${MK_DIRDEPS_BUILD} == "yes" # Prevent meta.autodep.mk from tracking "local dependencies". .depend: .include # If using filemon then _EXTRADEPEND is skipped since it is not needed. .if empty(.MAKE.MODE:Mnofilemon) # this depend: bypasses that below # the dependency helps when bootstrapping depend: beforedepend ${DPSRCS} ${SRCS} afterdepend beforedepend: afterdepend: beforedepend .endif .endif # Guess some dependencies for when no ${DEPENDFILE}.OBJ is generated yet. # For meta+filemon the .meta file is checked for since it is the dependency # file used. .for __obj in ${DEPENDOBJS:O:u} .if (defined(_meta_filemon) && !exists(${.OBJDIR}/${__obj}.meta)) || \ (!defined(_meta_filemon) && !exists(${.OBJDIR}/${DEPENDFILE}.${__obj})) ${__obj}: ${OBJS_DEPEND_GUESS} ${__obj}: ${OBJS_DEPEND_GUESS.${__obj}} .elif defined(_meta_filemon) # For meta mode we still need to know which file to depend on to avoid # ambiguous suffix transformation rules from .PATH. Meta mode does not # use .depend files. We really only need source files, not headers. ${__obj}: ${OBJS_DEPEND_GUESS:N*.h} ${__obj}: ${OBJS_DEPEND_GUESS.${__obj}:N*.h} .endif .endfor # Always run 'make depend' to generate dependencies early and to avoid the # need for manually running it. The dirdeps build should only do this in # sub-makes though since MAKELEVEL0 is for dirdeps calculations. .if ${MK_DIRDEPS_BUILD} == "no" || ${.MAKE.LEVEL} > 0 beforebuild: depend .endif .if !target(depend) .if defined(SRCS) depend: beforedepend ${DEPENDFILE} afterdepend # Tell bmake not to look for generated files via .PATH .NOPATH: ${DEPENDFILE} ${DEPENDFILES_OBJS} DPSRCS+= ${SRCS} # A .depend file will only be generated if there are commands in # beforedepend/_EXTRADEPEND/afterdepend. The target is kept # to allow 'make depend' to generate files. ${DEPENDFILE}: ${DPSRCS} .if !empty(.MAKE.MODE:Mmeta) || exists(${.OBJDIR}/${DEPENDFILE}) rm -f ${DEPENDFILE} .endif .if target(_EXTRADEPEND) _EXTRADEPEND: .USE ${DEPENDFILE}: _EXTRADEPEND .endif .ORDER: ${DEPENDFILE} afterdepend .else depend: beforedepend afterdepend .endif .if !target(beforedepend) beforedepend: .else .ORDER: beforedepend ${DEPENDFILE} .ORDER: beforedepend afterdepend .endif .if !target(afterdepend) afterdepend: .endif .endif .if defined(SRCS) .if ${CTAGS:T} == "gtags" CLEANDEPENDFILES+= GPATH GRTAGS GSYMS GTAGS .if defined(HTML) CLEANDEPENDDIRS+= HTML .endif .else CLEANDEPENDFILES+= tags .endif .endif .if !target(cleandepend) cleandepend: .if !empty(CLEANDEPENDFILES) rm -f ${CLEANDEPENDFILES} .endif .if !empty(CLEANDEPENDDIRS) rm -rf ${CLEANDEPENDDIRS} .endif .endif .if !target(checkdpadd) && (defined(DPADD) || defined(LDADD)) _LDADD_FROM_DPADD= ${DPADD:R:T:C;^lib(.*)$;-l\1;g} # Ignore -Wl,--start-group/-Wl,--end-group as it might be required in the # LDADD list due to unresolved symbols _LDADD_CANONICALIZED= ${LDADD:N:R:T:C;^lib(.*)$;-l\1;g:N-Wl,--[es]*-group} checkdpadd: .if ${_LDADD_FROM_DPADD} != ${_LDADD_CANONICALIZED} @echo ${.CURDIR} @echo "DPADD -> ${_LDADD_FROM_DPADD}" @echo "LDADD -> ${_LDADD_CANONICALIZED}" .endif .endif Index: head/share/mk/bsd.snmpmod.mk =================================================================== --- head/share/mk/bsd.snmpmod.mk (revision 301284) +++ head/share/mk/bsd.snmpmod.mk (revision 301285) @@ -1,27 +1,28 @@ # $FreeBSD$ INCSDIR= ${INCLUDEDIR}/bsnmp SHLIB_NAME= snmp_${MOD}.so.${SHLIB_MAJOR} SRCS+= ${MOD}_oid.h ${MOD}_tree.c ${MOD}_tree.h CLEANFILES+= ${MOD}_oid.h ${MOD}_tree.c ${MOD}_tree.h CFLAGS+= -I. ${MOD}_oid.h: ${MOD}_tree.def ${EXTRAMIBDEFS} ${EXTRAMIBSYMS} cat ${.ALLSRC} | gensnmptree -e ${XSYM} > ${.TARGET} .ORDER: ${MOD}_tree.c ${MOD}_tree.h +${MOD}_tree.h: .NOMETA ${MOD}_tree.c ${MOD}_tree.h: ${MOD}_tree.def ${EXTRAMIBDEFS} cat ${.ALLSRC} | gensnmptree -p ${MOD}_ .if defined(DEFS) FILESGROUPS+= DEFS DEFSDIR?= ${SHAREDIR}/snmp/defs .endif .if defined(BMIBS) FILESGROUPS+= BMIBS BMIBSDIR?= ${SHAREDIR}/snmp/mibs .endif .include Index: head/usr.sbin/acpi/iasl/Makefile =================================================================== --- head/usr.sbin/acpi/iasl/Makefile (revision 301284) +++ head/usr.sbin/acpi/iasl/Makefile (revision 301285) @@ -1,126 +1,129 @@ # $FreeBSD$ PROG= iasl # common SRCS= acfileio.c adfile.c adisasm.c adwalk.c ahids.c \ ahpredef.c ahtable.c ahuuids.c cmfsize.c dmextern.c \ dmrestag.c dmtable.c dmtables.c dmtbdump.c dmtbinfo.c \ getopt.c # compiler SRCS+= aslanalyze.c aslascii.c aslbtypes.c aslcodegen.c \ aslcompile.c aslcompiler.y.h aslcompilerlex.c \ aslcompilerparse.c asldebug.c aslerror.c aslexternal.c \ aslfileio.c aslfiles.c aslfold.c aslhex.c asllength.c \ asllisting.c asllistsup.c aslload.c asllookup.c \ aslmain.c aslmap.c aslmapenter.c aslmapoutput.c \ aslmaputils.c aslmessages.c aslmethod.c aslnamesp.c \ asloffset.c aslopcodes.c asloperands.c aslopt.c \ asloptions.c aslpld.c aslpredef.c aslprepkg.c \ aslprintf.c aslprune.c aslresource.c aslrestype1.c \ aslrestype1i.c aslrestype2.c aslrestype2d.c \ aslrestype2e.c aslrestype2q.c aslrestype2s.c \ aslrestype2w.c aslstartup.c aslstubs.c asltransform.c \ asltree.c aslutils.c asluuid.c aslwalks.c aslxref.c \ aslxrefout.c dtcompile.c dtexpress.c dtfield.c dtio.c \ dtparser.y.h dtparserlex.c dtparserparse.c dtsubtable.c \ dttable.c dttable1.c dttable2.c dttemplate.c dtutils.c \ prexpress.c prmacros.c prparser.y.h prparserlex.c \ prparserparse.c prscan.c prutils.c # components/debugger SRCS+= dbfileio.c # components/disassembler SRCS+= dmbuffer.c dmcstyle.c dmdeferred.c dmnames.c dmopcode.c \ dmresrc.c dmresrcl.c dmresrcl2.c dmresrcs.c dmutils.c \ dmwalk.c # components/dispatcher SRCS+= dsargs.c dscontrol.c dsfield.c dsobject.c dsopcode.c \ dsutils.c dswexec.c dswload.c dswload2.c dswscope.c \ dswstate.c # components/executer SRCS+= exconcat.c exconvrt.c excreate.c exdump.c exmisc.c \ exmutex.c exnames.c exoparg1.c exoparg2.c exoparg3.c \ exoparg6.c exprep.c exresnte.c exresolv.c exresop.c \ exstore.c exstoren.c exstorob.c exsystem.c exutils.c # components/parser SRCS+= psargs.c psloop.c psobject.c psopcode.c psopinfo.c \ psparse.c psscope.c pstree.c psutils.c pswalk.c # components/namespace SRCS+= nsaccess.c nsalloc.c nsdump.c nsnames.c nsobject.c \ nsparse.c nssearch.c nsutils.c nswalk.c # components/tables SRCS+= tbdata.c tbfadt.c tbinstal.c tbprint.c tbutils.c \ tbxface.c tbxfload.c # components/utilities SRCS+= utaddress.c utalloc.c utascii.c utbuffer.c utcache.c \ utcopy.c utdebug.c utdecode.c utdelete.c uterror.c \ utexcep.c utglobal.c uthex.c utinit.c utlock.c utmath.c \ utmisc.c utmutex.c utnonansi.c utobject.c utownerid.c \ utpredef.c utprint.c utresrc.c utstate.c utstring.c \ utuuid.c utxface.c utxferror.c # os_specific/service_layers SRCS+= oslibcfs.c osunixxf.c WARNS?= 2 MAN= iasl.8 CFLAGS+= -DACPI_ASL_COMPILER -I. LFLAGS= -i -s YFLAGS= -d CLEANFILES= aslcompiler.y aslcompiler.y.h aslcompilerlex.c \ aslcompilerparse.c aslcompilerparse.h dtparser.y.h \ dtparserlex.c dtparserparse.c dtparserparse.h \ prparser.y.h prparserlex.c prparserparse.c \ prparserparse.h PARSER= aslcstyle.y aslparser.y aslresources.y aslrules.y \ aslsupport.y asltokens.y asltypes.y aslcompilerlex.c: aslcompiler.l aslsupport.l ${LEX} ${LFLAGS} -PAslCompiler -o${.TARGET} \ ${ACPICA_DIR}/compiler/aslcompiler.l aslcompiler.y: ${PARSER} m4 -P -I${ACPICA_DIR}/compiler \ ${ACPICA_DIR}/compiler/aslparser.y > ${.TARGET} .ORDER: aslcompilerparse.c aslcompilerparse.h +aslcompilerparse.h: .NOMETA aslcompilerparse.c aslcompilerparse.h: aslcompiler.y ${YACC} ${YFLAGS} -pAslCompiler -oaslcompilerparse.c ${.ALLSRC} aslcompiler.y.h: aslcompilerparse.h .NOMETA ln -f ${.ALLSRC} ${.TARGET} dtparserlex.c: dtparser.l ${LEX} ${LFLAGS} -PDtParser -o${.TARGET} ${.ALLSRC} .ORDER: dtparserparse.c dtparserparse.h +dtparserparse.h: .NOMETA dtparserparse.c dtparserparse.h: dtparser.y ${YACC} ${YFLAGS} -pDtParser -odtparserparse.c ${.ALLSRC} dtparser.y.h: dtparserparse.h .NOMETA ln -f ${.ALLSRC} ${.TARGET} prparserlex.c: prparser.l ${LEX} ${LFLAGS} -PPrParser -o${.TARGET} ${.ALLSRC} .ORDER: prparserparse.c prparserparse.h +prparserparse.h: .NOMETA prparserparse.c prparserparse.h: prparser.y ${YACC} ${YFLAGS} -pPrParser -oprparserparse.c ${.ALLSRC} prparser.y.h: prparserparse.h .NOMETA ln -f ${.ALLSRC} ${.TARGET} .include Index: head/usr.sbin/bsnmpd/bsnmpd/Makefile =================================================================== --- head/usr.sbin/bsnmpd/bsnmpd/Makefile (revision 301284) +++ head/usr.sbin/bsnmpd/bsnmpd/Makefile (revision 301285) @@ -1,53 +1,54 @@ # $FreeBSD$ # # Author: Harti Brandt .include CONTRIB=${.CURDIR}/../../../contrib/bsnmp .PATH: ${CONTRIB}/snmpd PROG= bsnmpd SRCS= main.c action.c config.c export.c trap.c trans_udp.c trans_lsock.c SRCS+= oid.h tree.c tree.h XSYM= snmpMIB begemotSnmpdModuleTable begemotSnmpd begemotTrapSinkTable \ sysUpTime snmpTrapOID coldStart authenticationFailure \ begemotSnmpdTransUdp begemotSnmpdTransLsock begemotSnmpdLocalPortTable \ freeBSD freeBSDVersion CLEANFILES= oid.h tree.c tree.h MAN= bsnmpd.1 snmpmod.3 FILESGROUPS= BMIBS DEFS BMIBS= FOKUS-MIB.txt BEGEMOT-MIB.txt BEGEMOT-SNMPD.txt BMIBSDIR= ${SHAREDIR}/snmp/mibs DEFS= tree.def DEFSDIR= ${SHAREDIR}/snmp/defs CFLAGS+= -DSNMPTREE_TYPES CFLAGS+= -I${CONTRIB}/lib -I${CONTRIB}/snmpd -I. -DUSE_LIBBEGEMOT CFLAGS+= -DUSE_TCPWRAPPERS CFLAGS+= -DHAVE_STDINT_H -DHAVE_INTTYPES_H -DHAVE_ERR_H -DHAVE_STRLCPY LIBADD= begemot bsnmp wrap LDFLAGS= -Wl,-export-dynamic .if ${MK_OPENSSL} != "no" CFLAGS+= -DHAVE_LIBCRYPTO .endif oid.h: tree.def Makefile gensnmptree -e ${XSYM} < ${.ALLSRC:M*.def} > ${.TARGET} .ORDER: tree.c tree.h +tree.h: .NOMETA tree.c tree.h: tree.def gensnmptree -l < ${.ALLSRC} MANFILTER= sed -e 's%@MODPATH@%${LIBDIR}/%g' \ -e 's%@DEFPATH@%${DEFSDIR}/%g' \ -e 's%@MIBSPATH@%${BMIBSDIR}/%g' NO_WCAST_ALIGN= yes WARNS?= 6 .include