diff options
| author | tv <tv@NetBSD.org> | 2001-12-12 00:51:00 +0000 |
|---|---|---|
| committer | tv <tv@NetBSD.org> | 2001-12-12 00:51:00 +0000 |
| commit | 001067bbd1d3794241ea2698341fccc62b44a289 (patch) | |
| tree | db1d422c268232acdb1a9a086083a0cacb7db78d /lib | |
| parent | ebb6a0679929e9afb76d42e47d5f0e877decc3a1 (diff) | |
Readability cleanups; MKfoo=no -> NOfoo.
Diffstat (limited to 'lib')
31 files changed, 300 insertions, 327 deletions
diff --git a/lib/libarch/m68k/Makefile.inc b/lib/libarch/m68k/Makefile.inc index 53d71a6a20f..85b6580d774 100644 --- a/lib/libarch/m68k/Makefile.inc +++ b/lib/libarch/m68k/Makefile.inc @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.inc,v 1.5 1999/06/10 00:49:52 simonb Exp $ +# $NetBSD: Makefile.inc,v 1.6 2001/12/12 00:51:00 tv Exp $ .if (${MACHINE_ARCH} == "m68k") -SRCS= m68k_sync_icache.S -MKLINT=no +SRCS= m68k_sync_icache.S +NOLINT= # defined .endif -MAN+= m68k_sync_icache.2 +MAN+= m68k_sync_icache.2 diff --git a/lib/libasn1/Makefile b/lib/libasn1/Makefile index 72bb05ce6d1..9849ef427ff 100644 --- a/lib/libasn1/Makefile +++ b/lib/libasn1/Makefile @@ -1,14 +1,14 @@ -# $NetBSD: Makefile,v 1.18 2001/10/31 16:15:00 tv Exp $ +# $NetBSD: Makefile,v 1.19 2001/12/12 00:51:00 tv Exp $ + +NOLINT= # defined .include <bsd.own.mk> DIST= ${.CURDIR}/../../crypto/dist -.PATH: ${DIST}/heimdal/lib/asn1 - -WARNS?= 1 -MKLINT= no +.PATH: ${DIST}/heimdal/lib/asn1 -LIB= asn1 +WARNS?= 1 +LIB= asn1 .if ${USETOOLS} != "yes" COMPILEETOBJ!= cd ${.CURDIR}/../libcom_err/compile_et && ${PRINTOBJDIR} @@ -113,7 +113,7 @@ asn1_files: k5.asn1 ${ASN1_COMPILE} ${SRCS}: krb5_asn1.h -CLEANFILES = ${BUILT_SOURCES} ${gen_files} asn1_files krb5_asn1.h krb5_asn1.hx +CLEANFILES= ${BUILT_SOURCES} ${gen_files} asn1_files krb5_asn1.h krb5_asn1.hx .if ${USETOOLS} != "yes" SUBDIR= asn1_compile diff --git a/lib/libasn1/asn1_compile/Makefile b/lib/libasn1/asn1_compile/Makefile index ad1c7d79b9c..956d91e4192 100644 --- a/lib/libasn1/asn1_compile/Makefile +++ b/lib/libasn1/asn1_compile/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.13 2001/11/15 22:02:42 tv Exp $ +# $NetBSD: Makefile,v 1.14 2001/12/12 00:51:00 tv Exp $ DIST= ${.CURDIR}/../../../crypto/dist .PATH: ${DIST}/heimdal/lib/asn1 ${DIST}/heimdal/lib/roken ${DIST}/heimdal/lib/vers PROG= asn1_compile -MKLINT= no -MKMAN= no +NOLINT= # defined +NOMAN= # defined WARNS?= 1 asn1_compile_SRCS = \ @@ -33,7 +33,7 @@ roken_SRCS = \ SRCS= $(asn1_compile_SRCS) \ $(roken_SRCS) -YHEADER= +YHEADER= # defined #LIBROKEN!= cd ${.CURDIR}/../../libroken && ${PRINTOBJDIR} # -I${LIBROKEN} \ diff --git a/lib/libbz2/Makefile b/lib/libbz2/Makefile index 12b88fd25fe..71ee66a85cd 100644 --- a/lib/libbz2/Makefile +++ b/lib/libbz2/Makefile @@ -1,25 +1,25 @@ -# $NetBSD: Makefile,v 1.5 2001/06/03 13:42:00 simonb Exp $ +# $NetBSD: Makefile,v 1.6 2001/12/12 00:51:01 tv Exp $ -LIB= bz2 -MKMAN= no -DIST= ${.CURDIR}/../../dist/bzip2 -.PATH: ${DIST} +LIB= bz2 +NOMAN= # defined +DIST= ${.CURDIR}/../../dist/bzip2 +.PATH: ${DIST} -SRCS= blocksort.c huffman.c crctable.c randtable.c compress.c decompress.c \ - bzlib.c -INCS= bzlib.h -INCSDIR=/usr/include +SRCS= blocksort.c huffman.c crctable.c randtable.c compress.c \ + decompress.c bzlib.c +INCS= bzlib.h +INCSDIR= /usr/include TEXINFO= bzip2.info CLEANFILES+= bzip2.texi -bzip2.texi: manual.texi - @-rm -f $@ - sed -e 's/@parindent.*//' \ - -e 's/@parskip.*//' \ - -e 's/@node Overview, Implementation, Top, Top/@node Overview, (dir), Top, (dir)/' \ - -e 's/@itemize$$/@itemize @bullet/' \ - <$> >$@ +bzip2.texi: manual.texi + @-rm -f $@ + sed -e 's/@parindent.*//' \ + -e 's/@parskip.*//' \ + -e 's/@node Overview, Implementation, Top, Top/@node Overview, (dir), Top, (dir)/' \ + -e 's/@itemize$$/@itemize @bullet/' \ + <$> >$@ .include <bsd.own.mk> diff --git a/lib/libcdk/Makefile b/lib/libcdk/Makefile index 63cc7b9c9b4..e2865334745 100644 --- a/lib/libcdk/Makefile +++ b/lib/libcdk/Makefile @@ -1,12 +1,11 @@ -# $NetBSD: Makefile,v 1.3 2001/11/05 15:24:48 lukem Exp $ -DIST= ${.CURDIR}/../../dist -.PATH: ${DIST}/cdk -.PATH: ${DIST}/cdk/include -.PATH: ${DIST}/cdk/man +# $NetBSD: Makefile,v 1.4 2001/12/12 00:51:01 tv Exp $ -MKLINT= no +DIST= ${.CURDIR}/../../dist +.PATH: ${DIST}/cdk ${DIST}/cdk/include ${DIST}/cdk/man -LIB= cdk +LIB= cdk +NOLINT= # defined +CPPFLAGS+= -I. -I${DIST}/cdk/include -DHAVE_CONFIG_H SRCS= alphalist.c binding.c buttonbox.c calendar.c cdk.c cdkscreen.c \ debug.c dialog.c draw.c entry.c fselect.c graph.c histogram.c \ @@ -29,10 +28,6 @@ MAN= cdk_alphalist.3 cdk_binding.3 cdk_buttonbox.3 cdk_calendar.3 \ MLINKS= cdk_cdk.3 cdk.3 -INCSDIR= /usr/include/cdk - -CPPFLAGS+= -I. \ - -I${DIST}/cdk/include \ - -DHAVE_CONFIG_H +INCSDIR= /usr/include/cdk .include <bsd.lib.mk> diff --git a/lib/libcom_err/Makefile b/lib/libcom_err/Makefile index 3630e6344e0..b3c300ea85d 100644 --- a/lib/libcom_err/Makefile +++ b/lib/libcom_err/Makefile @@ -1,35 +1,35 @@ -# $NetBSD: Makefile,v 1.10 2001/11/21 05:40:30 gmcgarry Exp $ +# $NetBSD: Makefile,v 1.11 2001/12/12 00:51:01 tv Exp $ + +NOLINT= # defined .include <bsd.own.mk> DIST= ${.CURDIR}/../../crypto/dist -.PATH: ${DIST}/heimdal/lib/com_err - -MKLINT= no +.PATH: ${DIST}/heimdal/lib/com_err -LIB= com_err -SRCS= error.c com_err.c roken_rename.h +LIB= com_err +SRCS= error.c com_err.c roken_rename.h -INCS= com_err.h com_right.h +INCS= com_err.h com_right.h -MAN= com_err.3 -MLINKS= com_err.3 com_err_va.3 \ - com_err.3 error_message.3 \ - com_err.3 error_table_name.3 \ - com_err.3 init_error_table.3 \ - com_err.3 set_com_err_hook.3 \ - com_err.3 reset_com_err_hook.3 +MAN= com_err.3 +MLINKS= com_err.3 com_err_va.3 \ + com_err.3 error_message.3 \ + com_err.3 error_table_name.3 \ + com_err.3 init_error_table.3 \ + com_err.3 set_com_err_hook.3 \ + com_err.3 reset_com_err_hook.3 .if ${USETOOLS} != "yes" -.PHONY: compile_et - -includes: compile_et +.PHONY: compile_et +includes: compile_et +SUBDIR= compile_et compile_et: @cd ${.CURDIR}/compile_et && ${MAKE} .endif -INCSDIR=/usr/include/krb5 +INCSDIR= /usr/include/krb5 CPPFLAGS+= -I. \ -I${.CURDIR}/../../include/heimdal \ @@ -38,10 +38,6 @@ CPPFLAGS+= -I. \ -I${DIST}/heimdal/lib/roken \ -DHAVE_CONFIG_H -.if ${USETOOLS} != "yes" -SUBDIR= compile_et -.endif - .include <bsd.lib.mk> .if ${USETOOLS} != "yes" .include <bsd.subdir.mk> diff --git a/lib/libcom_err/compile_et/Makefile b/lib/libcom_err/compile_et/Makefile index ace8c29b690..9099dd785a3 100644 --- a/lib/libcom_err/compile_et/Makefile +++ b/lib/libcom_err/compile_et/Makefile @@ -1,14 +1,14 @@ -# $NetBSD: Makefile,v 1.9 2001/09/17 12:34:41 assar Exp $ +# $NetBSD: Makefile,v 1.10 2001/12/12 00:51:01 tv Exp $ -NOMAN= noman +NOMAN= # defined .include <bsd.own.mk> DIST= ${.CURDIR}/../../../crypto/dist # uncommon library functions -.PATH: ${.CURDIR}/../../libc/string -SRCS+= strlcpy.c strlcat.c +.PATH: ${.CURDIR}/../../libc/string +SRCS+= strlcpy.c strlcat.c .PATH: ${DIST}/heimdal/lib/com_err ${DIST}/heimdal/lib/roken ${DIST}/heimdal/lib/vers @@ -17,9 +17,9 @@ HOSTPROG= compile_et SRCS+= compile_et.c parse.y lex.l \ getarg.c print_version.c warnerr.c strupr.c get_window_size.c -YHEADER= 1 +YHEADER= # defined -BINDIR= /usr/bin +BINDIR= /usr/bin LIBROKEN!= cd ${.CURDIR}/../../libroken && ${PRINTOBJDIR} @@ -30,7 +30,7 @@ HOST_CPPFLAGS+= -I. \ -I${DIST}/heimdal/lib/roken \ -DHAVE_CONFIG_H -DPSRCS= print_version.h +DPSRCS= print_version.h make-print-version.lo: ${.CURDIR}/../../../include/heimdal/version.h diff --git a/lib/libcrypto_idea/Makefile b/lib/libcrypto_idea/Makefile index a400150aa47..2d64d6d26a2 100644 --- a/lib/libcrypto_idea/Makefile +++ b/lib/libcrypto_idea/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/08/08 14:04:42 itojun Exp $ +# $NetBSD: Makefile,v 1.4 2001/12/12 00:51:01 tv Exp $ # RCSid: # Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp @@ -16,32 +16,32 @@ # sjg@quick.com.au # +NOPIC= # defined +#NOPROFILE= # defined +#NOLINT= # defined + .include <bsd.own.mk> # XXX There's a bit of work to do before we can enable warnings. -WARNS=0 +WARNS= 0 -LIB= crypto_idea -CPPFLAGS+= -Dlib${LIB} -I. -I${OPENSSLSRC}/crypto +LIB= crypto_idea +CPPFLAGS+= -Dlib${LIB} -I. -I${OPENSSLSRC}/crypto CRYPTODIST= ${.CURDIR}/../../crypto/dist .include "../../crypto/Makefile.openssl" -.PATH: ${OPENSSLSRC} -.PATH: ${OPENSSLSRC}/crypto/idea ${OPENSSLSRC}/crypto/evp +.PATH: ${OPENSSLSRC} ${OPENSSLSRC}/crypto/idea ${OPENSSLSRC}/crypto/evp + CPPFLAGS+= -I${OPENSSLSRC}/crypto/idea -SRCS+=i_cbc.c i_skey.c e_idea.c c_allc.c +SRCS+= i_cbc.c i_skey.c e_idea.c c_allc.c # XXX .if ${OBJECT_FMT} == "ELF" -AFLAGS+=-DELF +AFLAGS+= -DELF .else -AFLAGS+=-DOUT +AFLAGS+= -DOUT .endif -MKPIC=no -#MKPROFILE=no -#MKLINT=no - .include <bsd.lib.mk> diff --git a/lib/libcrypto_rc5/Makefile b/lib/libcrypto_rc5/Makefile index a43040e3165..9fd0e91525d 100644 --- a/lib/libcrypto_rc5/Makefile +++ b/lib/libcrypto_rc5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2001/08/08 14:04:43 itojun Exp $ +# $NetBSD: Makefile,v 1.4 2001/12/12 00:51:02 tv Exp $ # RCSid: # Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp @@ -16,32 +16,32 @@ # sjg@quick.com.au # +NOPIC= # defined +#NOPROFILE= # defined +#NOLINT= # defined + .include <bsd.own.mk> # XXX There's a bit of work to do before we can enable warnings. -WARNS=0 +WARNS= 0 -LIB= crypto_rc5 -CPPFLAGS+= -Dlib${LIB} -I. -I${OPENSSLSRC}/crypto +LIB= crypto_rc5 +CPPFLAGS+= -Dlib${LIB} -I. -I${OPENSSLSRC}/crypto CRYPTODIST= ${.CURDIR}/../../crypto/dist .include "../../crypto/Makefile.openssl" -.PATH: ${OPENSSLSRC} -.PATH: ${OPENSSLSRC}/crypto/rc5 ${OPENSSLSRC}/crypto/evp +.PATH: ${OPENSSLSRC} ${OPENSSLSRC}/crypto/rc5 ${OPENSSLSRC}/crypto/evp + CPPFLAGS+= -I${OPENSSLSRC}/crypto/rc5 -SRCS+=rc5_skey.c rc5_enc.c e_rc5.c c_allc.c +SRCS+= rc5_skey.c rc5_enc.c e_rc5.c c_allc.c # XXX .if ${OBJECT_FMT} == "ELF" -AFLAGS+=-DELF +AFLAGS+= -DELF .else -AFLAGS+=-DOUT +AFLAGS+= -DOUT .endif -MKPIC=no -#MKPROFILE=no -#MKLINT=no - .include <bsd.lib.mk> diff --git a/lib/libedit/readline/Makefile b/lib/libedit/readline/Makefile index ea8f093e174..bc73accf5ff 100644 --- a/lib/libedit/readline/Makefile +++ b/lib/libedit/readline/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/05/16 07:09:26 enami Exp $ +# $NetBSD: Makefile,v 1.5 2001/12/12 00:51:02 tv Exp $ .PATH: ${CURDIR}/.. @@ -6,7 +6,7 @@ INCS= readline.h INCSDIR= /usr/include/readline SYMLINKS= readline.h ${INCSDIR}/history.h -MKOBJ= no +NOOBJ= # defined incinstall:: linksinstall diff --git a/lib/libgssapi/Makefile b/lib/libgssapi/Makefile index ae7805bf9b7..6688e943609 100644 --- a/lib/libgssapi/Makefile +++ b/lib/libgssapi/Makefile @@ -1,14 +1,15 @@ -# $NetBSD: Makefile,v 1.6 2001/09/17 12:34:41 assar Exp $ +# $NetBSD: Makefile,v 1.7 2001/12/12 00:51:02 tv Exp $ + +NOLINT= # defined .include <bsd.own.mk> DIST= ${.CURDIR}/../../crypto/dist -.PATH: ${DIST}/heimdal/lib/gssapi +.PATH: ${DIST}/heimdal/lib/gssapi -WARNS?= 1 -MKLINT= no +WARNS?= 1 -LIB= gssapi +LIB= gssapi SRCS = \ 8003.c \ @@ -50,12 +51,11 @@ SRCS = \ wrap.c \ address_to_krb5addr.c -INCSDIR= /usr/include/gssapi - -INCS= gssapi.h +INCS= gssapi.h +INCSDIR= /usr/include/gssapi -ASN1!= cd ${.CURDIR}/../libasn1 && ${PRINTOBJDIR} -KRB5!= cd ${.CURDIR}/../libkrb5 && ${PRINTOBJDIR} +ASN1!= cd ${.CURDIR}/../libasn1 && ${PRINTOBJDIR} +KRB5!= cd ${.CURDIR}/../libkrb5 && ${PRINTOBJDIR} CPPFLAGS+= -I. \ -I${DIST}/heimdal/lib/gssapi \ diff --git a/lib/libhdb/Makefile b/lib/libhdb/Makefile index d66b0aebc12..53a305c3d9c 100644 --- a/lib/libhdb/Makefile +++ b/lib/libhdb/Makefile @@ -1,14 +1,15 @@ -# $NetBSD: Makefile,v 1.12 2001/10/31 16:15:00 tv Exp $ +# $NetBSD: Makefile,v 1.13 2001/12/12 00:51:02 tv Exp $ + +NOLINT= # defined .include <bsd.own.mk> DIST= ${.CURDIR}/../../crypto/dist -.PATH: ${DIST}/heimdal/lib/hdb +.PATH: ${DIST}/heimdal/lib/hdb -WARNS?= 1 -MKLINT= no +WARNS?= 1 -LIB= hdb +LIB= hdb .if ${USETOOLS} != "yes" COMPILEETOBJ!= cd ${.CURDIR}/../libcom_err/compile_et && ${PRINTOBJDIR} @@ -18,14 +19,14 @@ COMPILE_ET= ${COMPILEETOBJ}/compile_et hdb_err.c hdb_err.h: hdb_err.et ${COMPILE_ET} ${DIST}/heimdal/lib/hdb/hdb_err.et -ERR_FILES = hdb_err.c +ERR_FILES= hdb_err.c -gen_files = asn1_Key.x asn1_Event.x asn1_HDBFlags.x asn1_hdb_entry.x \ - asn1_Salt.x asn1_GENERATION.x +gen_files= asn1_Key.x asn1_Event.x asn1_HDBFlags.x asn1_hdb_entry.x \ + asn1_Salt.x asn1_GENERATION.x -DPSRCS= hdb_asn1.h hdb_err.h +DPSRCS= hdb_asn1.h hdb_err.h -BUILT_SOURCES = $(gen_files:.x=.c) hdb_err.c +BUILT_SOURCES= ${gen_files:.x=.c} hdb_err.c SRCS= \ common.c \ @@ -39,20 +40,19 @@ SRCS= \ print.c \ $(BUILT_SOURCES) -INCS= hdb.h hdb_err.h hdb_asn1.h hdb-protos.h hdb-private.h - -INCSDIR= /usr/include/krb5 +INCS= hdb.h hdb_err.h hdb_asn1.h hdb-protos.h hdb-private.h +INCSDIR= /usr/include/krb5 .if ${USETOOLS} != "yes" ASN1_COMPILE!= cd ${.CURDIR}/../libasn1/asn1_compile && ${PRINTOBJDIR} -ASN1_COMPILE:=${ASN1_COMPILE}/asn1_compile +ASN1_COMPILE:= ${ASN1_COMPILE}/asn1_compile .endif asn1_files hdb_asn1.hx: hdb.asn1 ${ASN1_COMPILE} ${DIST}/heimdal/lib/hdb/hdb.asn1 hdb_asn1 -ASN1!= cd ${.CURDIR}/../libasn1 && ${PRINTOBJDIR} -KRB5!= cd ${.CURDIR}/../libkrb5 && ${PRINTOBJDIR} +ASN1!= cd ${.CURDIR}/../libasn1 && ${PRINTOBJDIR} +KRB5!= cd ${.CURDIR}/../libkrb5 && ${PRINTOBJDIR} CPPFLAGS+= -I. \ -I${DIST}/heimdal/lib/hdb \ @@ -67,12 +67,13 @@ CPPFLAGS+= -I. \ -I${DIST}/heimdal/lib/roken \ -DHAVE_CONFIG_H -$(gen_files) hdb_asn1.h: asn1_files +${gen_files} hdb_asn1.h: asn1_files hdb_asn1.h: hdb_asn1.hx -$(SRCS): hdb_err.h hdb_asn1.h +${SRCS}: hdb_err.h hdb_asn1.h -CLEANFILES = $(gen_files) $(BUILT_SOURCES) hdb_asn1.h hdb_asn1.hx asn1_files hdb_err.h +CLEANFILES= ${gen_files} ${BUILT_SOURCES} \ + hdb_asn1.h hdb_asn1.hx asn1_files hdb_err.h .include <bsd.lib.mk> diff --git a/lib/libkadm/Makefile b/lib/libkadm/Makefile index aaffed77649..edd8ddcd2d8 100644 --- a/lib/libkadm/Makefile +++ b/lib/libkadm/Makefile @@ -1,14 +1,15 @@ -# $NetBSD: Makefile,v 1.8 2001/10/31 16:15:00 tv Exp $ +# $NetBSD: Makefile,v 1.9 2001/12/12 00:51:03 tv Exp $ + +NOLINT= # defined .include <bsd.own.mk> DIST= ${.CURDIR}/../../crypto/dist -.PATH: ${DIST}/krb4/lib/kadm +.PATH: ${DIST}/krb4/lib/kadm -WARNS?= 1 -MKLINT= no +WARNS?= 1 -LIB= kadm +LIB= kadm .if ${USETOOLS} != "yes" COMPILEETOBJ!= cd ${.CURDIR}/../libcom_err/compile_et && ${PRINTOBJDIR} @@ -19,7 +20,6 @@ kadm_err.c kadm_err.h: kadm_err.et ${COMPILE_ET} ${DIST}/krb4/lib/kadm/kadm_err.et ERR_FILES= kadm_err.c - DPSRCS= kadm_err.h SRCS= \ @@ -29,10 +29,8 @@ SRCS= \ kadm_supp.c \ check_password.c -INCSDIR= /usr/include/kerberosIV - -INCS= kadm.h \ - kadm_err.h +INCS= kadm.h kadm_err.h +INCSDIR= /usr/include/kerberosIV LIBKRBINC!= cd ${.CURDIR}/../libkrb && ${PRINTOBJDIR} @@ -48,8 +46,8 @@ CPPFLAGS+= -I. \ -I${DIST}/heimdal/lib/roken \ -DHAVE_CONFIG_H -CLEANFILES = $(ERR_FILES) kadm_err.h +CLEANFILES= ${ERR_FILES} kadm_err.h -$(SRCS:.c=.o): kadm_err.h +${SRCS:.c=.o}: kadm_err.h .include <bsd.lib.mk> diff --git a/lib/libkadm5clnt/Makefile b/lib/libkadm5clnt/Makefile index 12412827273..a9573099cbf 100644 --- a/lib/libkadm5clnt/Makefile +++ b/lib/libkadm5clnt/Makefile @@ -1,14 +1,15 @@ -# $NetBSD: Makefile,v 1.13 2001/10/31 16:15:01 tv Exp $ +# $NetBSD: Makefile,v 1.14 2001/12/12 00:51:03 tv Exp $ + +NOLINT= # defined .include <bsd.own.mk> DIST= ${.CURDIR}/../../crypto/dist -.PATH: ${DIST}/heimdal/lib/kadm5 +.PATH: ${DIST}/heimdal/lib/kadm5 -WARNS?= 1 -MKLINT= no +WARNS?= 1 -LIB= kadm5clnt +LIB= kadm5clnt .if ${USETOOLS} != "yes" COMPILEETOBJ!= cd ${.CURDIR}/../libcom_err/compile_et && ${PRINTOBJDIR} @@ -42,13 +43,12 @@ SRCS = \ client_glue.c \ $(ERR_FILES) -INCSDIR= /usr/include/kadm5 - -INCS= kadm5_err.h admin.h kadm5-protos.h private.h kadm5-private.h +INCS= kadm5_err.h admin.h kadm5-protos.h private.h kadm5-private.h +INCSDIR= /usr/include/kadm5 -ASN1!= cd ${.CURDIR}/../libasn1 && ${PRINTOBJDIR} -KRB5!= cd ${.CURDIR}/../libkrb5 && ${PRINTOBJDIR} -HDB!= cd ${.CURDIR}/../libhdb && ${PRINTOBJDIR} +ASN1!= cd ${.CURDIR}/../libasn1 && ${PRINTOBJDIR} +KRB5!= cd ${.CURDIR}/../libkrb5 && ${PRINTOBJDIR} +HDB!= cd ${.CURDIR}/../libhdb && ${PRINTOBJDIR} CPPFLAGS+= -I. \ -I${ASN1} \ @@ -65,9 +65,9 @@ CPPFLAGS+= -I. \ -I${DIST}/heimdal/lib/roken \ -DHAVE_CONFIG_H -$(SRCS:.c=.o): kadm5_err.h +${SRCS:.c=.o}: kadm5_err.h -CLEANFILES = kadm5_err.h kadm5_err.c +CLEANFILES= kadm5_err.h kadm5_err.c # Prevent collision with old MIT Kerberos includes -- require manual # intervention of the operator. diff --git a/lib/libkadm5srv/Makefile b/lib/libkadm5srv/Makefile index 1a7b1b9ecd9..c879bfd586c 100644 --- a/lib/libkadm5srv/Makefile +++ b/lib/libkadm5srv/Makefile @@ -1,16 +1,17 @@ -# $NetBSD: Makefile,v 1.13 2001/10/31 16:15:01 tv Exp $ +# $NetBSD: Makefile,v 1.14 2001/12/12 00:51:03 tv Exp $ + +NOLINT= # defined .include <bsd.own.mk> DIST= ${.CURDIR}/../../crypto/dist -.PATH: ${DIST}/heimdal/lib/kadm5 +.PATH: ${DIST}/heimdal/lib/kadm5 -WARNS?= 1 -MKLINT= no +WARNS?= 1 .include <bsd.own.mk> -LIB= kadm5srv +LIB= kadm5srv .if ${USETOOLS} != "yes" COMPILEETOBJ!= cd ${.CURDIR}/../libcom_err/compile_et && ${PRINTOBJDIR} @@ -20,7 +21,7 @@ COMPILE_ET= ${COMPILEETOBJ}/compile_et kadm5_err.c kadm5_err.h: kadm5_err.et ${COMPILE_ET} ${DIST}/heimdal/lib/kadm5/kadm5_err.et -ERR_FILES = kadm5_err.c +ERR_FILES= kadm5_err.c SRCS = \ acl.c \ @@ -64,9 +65,9 @@ SRCS = \ set_modifier.c \ $(ERR_FILES) -ASN1!= cd ${.CURDIR}/../libasn1 && ${PRINTOBJDIR} -KRB5!= cd ${.CURDIR}/../libkrb5 && ${PRINTOBJDIR} -HDB!= cd ${.CURDIR}/../libhdb && ${PRINTOBJDIR} +ASN1!= cd ${.CURDIR}/../libasn1 && ${PRINTOBJDIR} +KRB5!= cd ${.CURDIR}/../libkrb5 && ${PRINTOBJDIR} +HDB!= cd ${.CURDIR}/../libhdb && ${PRINTOBJDIR} CPPFLAGS+= -I. \ -I${ASN1} \ @@ -83,12 +84,12 @@ CPPFLAGS+= -I. \ -I${DIST}/heimdal/lib/roken \ -DHAVE_CONFIG_H -.if defined(NOPIC) +.if ${MKPIC} == "no" CPPFLAGS+= -DNO_DLOPEN .endif -$(SRCS:.c=.o): kadm5_err.h +${SRCS:.c=.o}: kadm5_err.h -CLEANFILES = kadm5_err.h kadm5_err.c +CLEANFILES= kadm5_err.h kadm5_err.c .include <bsd.lib.mk> diff --git a/lib/libkafs/Makefile b/lib/libkafs/Makefile index 9786b23eca3..c768d07f39a 100644 --- a/lib/libkafs/Makefile +++ b/lib/libkafs/Makefile @@ -1,23 +1,18 @@ -# $NetBSD: Makefile,v 1.3 2001/11/05 15:05:55 hubertf Exp $ -DIST= ${.CURDIR}/../../crypto/dist -.PATH: ${DIST}/heimdal/lib/kafs - -WARNS?= 1 -MKLINT= no +# $NetBSD: Makefile,v 1.4 2001/12/12 00:51:03 tv Exp $ -LIB= kafs +DIST= ${.CURDIR}/../../crypto/dist +.PATH: ${DIST}/heimdal/lib/kafs -SRCS= \ - afssys.c \ - afskrb.c \ - afskrb5.c \ - common.c \ +WARNS?= 1 +NOLINT= # defined -INCSDIR= /usr/include/kerberosIV +LIB= kafs -INCS= kafs.h +SRCS= afssys.c afskrb.c afskrb5.c common.c -MAN= kafs.3 +INCS= kafs.h +INCSDIR= /usr/include/kerberosIV +MAN= kafs.3 CPPFLAGS+= -I. \ -I${DIST}/heimdal/lib/kafs \ diff --git a/lib/libkdb/Makefile b/lib/libkdb/Makefile index 4747cc25372..a27bfe0c95f 100644 --- a/lib/libkdb/Makefile +++ b/lib/libkdb/Makefile @@ -1,25 +1,21 @@ -# $NetBSD: Makefile,v 1.3 2001/09/17 12:34:42 assar Exp $ +# $NetBSD: Makefile,v 1.4 2001/12/12 00:51:03 tv Exp $ + +NOLINT= # defined .include <bsd.own.mk> DIST= ${.CURDIR}/../../crypto/dist -.PATH: ${DIST}/krb4/lib/kdb - -WARNS?= 1 -MKLINT= no +.PATH: ${DIST}/krb4/lib/kdb -LIB= kdb +WARNS?= 1 -SRCS= krb_cache.c \ - krb_kdb_utils.c \ - copykey.c \ - krb_lib.c \ - krb_dbm.c \ - print_princ.c +LIB= kdb -INCSDIR= /usr/include/kerberosIV +SRCS= krb_cache.c krb_kdb_utils.c copykey.c \ + krb_lib.c krb_dbm.c print_princ.c -INCS= krb_db.h +INCS= krb_db.h +INCSDIR= /usr/include/kerberosIV LIBKRBINC!= cd ${.CURDIR}/../libkrb && ${PRINTOBJDIR} diff --git a/lib/libkrb/Makefile b/lib/libkrb/Makefile index 30ae2ba74ab..0f30da67358 100644 --- a/lib/libkrb/Makefile +++ b/lib/libkrb/Makefile @@ -1,29 +1,28 @@ -# $NetBSD: Makefile,v 1.15 2001/10/31 16:15:01 tv Exp $ +# $NetBSD: Makefile,v 1.16 2001/12/12 00:51:04 tv Exp $ + +NOLINT= # defined .include <bsd.own.mk> DIST= ${.CURDIR}/../../crypto/dist -.PATH: ${DIST}/krb4/lib/krb -.PATH: ${DIST}/krb4/doc -.PATH: ${DIST}/openssl/crypto/des -.PATH: ${DIST}/krb4/man - -MAN= kerberos.3 krb_realmofhost.3 krb_sendauth.3 krb_set_tkt_string.3 \ - krb.conf.5 krb.equiv.5 krb.extra.5 krb.realms.5 -MLINKS= kerberos.3 krb_mk_req.3 kerberos.3 krb_rd_req.3 \ - kerberos.3 krb_kntoln.3 kerberos.3 krb_set_key.3 \ - kerberos.3 krb_get_cred.3 kerberos.3 krb_mk_priv.3 \ - kerberos.3 krb_rd_priv.3 kerberos.3 krb_mk_safe.3 \ - kerberos.3 krb_rd_safe.3 kerberos.3 krb_mk_err.3 \ - kerberos.3 krb_rd_err.3 kerberos.3 krb_ck_repl.3 \ - krb_realmofhost.3 krb_get_krbhst.3 \ - krb_realmofhost.3 krb_get_lrealm.3 \ - krb_realmofhost.3 krb_get_phost.3 - -WARNS?= 1 -MKLINT= no - -LIB= krb +.PATH: ${DIST}/krb4/lib/krb ${DIST}/krb4/doc \ + ${DIST}/openssl/crypto/des ${DIST}/krb4/man + +MAN= kerberos.3 krb_realmofhost.3 krb_sendauth.3 krb_set_tkt_string.3 \ + krb.conf.5 krb.equiv.5 krb.extra.5 krb.realms.5 +MLINKS= kerberos.3 krb_mk_req.3 kerberos.3 krb_rd_req.3 \ + kerberos.3 krb_kntoln.3 kerberos.3 krb_set_key.3 \ + kerberos.3 krb_get_cred.3 kerberos.3 krb_mk_priv.3 \ + kerberos.3 krb_rd_priv.3 kerberos.3 krb_mk_safe.3 \ + kerberos.3 krb_rd_safe.3 kerberos.3 krb_mk_err.3 \ + kerberos.3 krb_rd_err.3 kerberos.3 krb_ck_repl.3 \ + krb_realmofhost.3 krb_get_krbhst.3 \ + krb_realmofhost.3 krb_get_lrealm.3 \ + krb_realmofhost.3 krb_get_phost.3 + +WARNS?= 1 + +LIB= krb .if ${USETOOLS} != "yes" COMPILEETOBJ!= cd ${.CURDIR}/../libcom_err/compile_et && ${PRINTOBJDIR} @@ -110,7 +109,7 @@ SRCS= \ verify_user.c \ krb_ip_realm.c -INCSDIR= /usr/include/kerberosIV +INCSDIR= /usr/include/kerberosIV INCS= krb.h \ krb_err.h \ @@ -130,7 +129,7 @@ CPPFLAGS+= -I. \ -I${DIST}/heimdal/lib/roken \ -DHAVE_CONFIG_H -CLEANFILES = $(ERR_FILES) krb_err.h ktypes.h krb.h +CLEANFILES= ${ERR_FILES} krb_err.h ktypes.h krb.h krb.h: krb.h.in sed 's,@DES_H@,openssl/des.h,' < ${.ALLSRC} > ${.TARGET} @@ -138,7 +137,7 @@ krb.h: krb.h.in ktypes.h: cp ${.CURDIR}/../../include/heimdal/$@ $@ -$(SRCS:.c=.o): krb_err.h +${SRCS:.c=.o}: krb_err.h TEXINFO= kth-krb.texi INFOFLAGS= -I${DIST}/krb4/doc diff --git a/lib/libkrb5/Makefile b/lib/libkrb5/Makefile index b4109f77e09..3da14c3c9a9 100644 --- a/lib/libkrb5/Makefile +++ b/lib/libkrb5/Makefile @@ -1,15 +1,15 @@ -# $NetBSD: Makefile,v 1.19 2001/11/09 15:44:31 joda Exp $ +# $NetBSD: Makefile,v 1.20 2001/12/12 00:51:04 tv Exp $ + +NOLINT= # defined .include <bsd.own.mk> DIST= ${.CURDIR}/../../crypto/dist -.PATH: ${DIST}/heimdal/lib/krb5 -.PATH: ${DIST}/heimdal/doc +.PATH: ${DIST}/heimdal/lib/krb5 ${DIST}/heimdal/doc -WARNS?= 1 -MKLINT= no +WARNS?= 1 -LIB= krb5 +LIB= krb5 .if ${USETOOLS} != "yes" COMPILEETOBJ!= cd ${.CURDIR}/../libcom_err/compile_et && ${PRINTOBJDIR} @@ -25,9 +25,8 @@ heim_err.c heim_err.h: heim_err.et k524_err.c k524_err.h: k524_err.et ${COMPILE_ET} ${DIST}/heimdal/lib/krb5/k524_err.et -ERR_FILES= krb5_err.c heim_err.c k524_err.c - -DPSRCS= krb5_err.h heim_err.h k524_err.h +ERR_FILES= krb5_err.c heim_err.c k524_err.c +DPSRCS= krb5_err.h heim_err.h k524_err.h SRCS= \ acl.c \ @@ -237,9 +236,9 @@ MLINKS= \ krb5-types.h: cp ${.CURDIR}/../../include/heimdal/$@ $@ -INCSDIR= /usr/include/krb5 +INCSDIR= /usr/include/krb5 -ASN1!= cd ${.CURDIR}/../libasn1 && ${PRINTOBJDIR} +ASN1!= cd ${.CURDIR}/../libasn1 && ${PRINTOBJDIR} CPPFLAGS+= -I. \ -I${DIST}/heimdal/lib/krb5 \ @@ -252,9 +251,9 @@ CPPFLAGS+= -I. \ -I${DIST}/heimdal/lib/roken \ -DHAVE_CONFIG_H -CLEANFILES = $(ERR_FILES) krb5_err.h heim_err.h krb5-types.h k524_err.h +CLEANFILES= ${ERR_FILES} krb5_err.h heim_err.h krb5-types.h k524_err.h -$(SRCS:.c=.o): krb5_err.h heim_err.h k524_err.h +${SRCS:.c=.o}: krb5_err.h heim_err.h k524_err.h TEXINFO= heimdal.texi INFOFLAGS= -I${DIST}/heimdal/doc @@ -273,8 +272,8 @@ INFOFLAGS= -I${DIST}/heimdal/doc .include <bsd.info.mk> .if ${MKSHARE} != "no" -FILES= ${DIST}/heimdal/krb5.conf -FILESDIR=/usr/share/examples/kerberos +FILES= ${DIST}/heimdal/krb5.conf +FILESDIR= /usr/share/examples/kerberos .endif .include <bsd.files.mk> diff --git a/lib/libl/Makefile b/lib/libl/Makefile index 77f477e5edb..6a3796bc447 100644 --- a/lib/libl/Makefile +++ b/lib/libl/Makefile @@ -1,14 +1,14 @@ -# $NetBSD: Makefile,v 1.8 1999/04/03 16:28:49 simonb Exp $ +# $NetBSD: Makefile,v 1.9 2001/12/12 00:51:04 tv Exp $ -LIB= l -SRCS= libmain.c libyywrap.c -MKPIC= no +LIB= l +SRCS= libmain.c libyywrap.c +NOPIC= # defined -LINKS= /usr/lib/libl.a /usr/lib/libfl.a +LINKS= /usr/lib/libl.a /usr/lib/libfl.a -.PATH: ${.CURDIR}/../../usr.bin/lex +.PATH: ${.CURDIR}/../../usr.bin/lex .include <bsd.lib.mk> .if ${MKPROFILE} != "no" -LINKS+= ${LIBDIR}/libl_p.a ${LIBDIR}/libfl_p.a +LINKS+= ${LIBDIR}/libl_p.a ${LIBDIR}/libfl_p.a .endif diff --git a/lib/libm/Makefile b/lib/libm/Makefile index 439b0a4e26f..de2fa4af11b 100644 --- a/lib/libm/Makefile +++ b/lib/libm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.54 2001/11/05 15:22:23 lukem Exp $ +# $NetBSD: Makefile,v 1.55 2001/12/12 00:51:05 tv Exp $ # # @(#)Makefile 5.1beta 93/09/24 # @@ -42,10 +42,13 @@ # default standard # +# XXX lint buts on some archs and needs stubs +NOLINT= # defined + # require this for the value of I387_LIBM from mk.conf, if set. .include <bsd.own.mk> -WARNS?=1 +WARNS?= 1 .if (${MACHINE_ARCH} == "alpha") .PATH: ${.CURDIR}/arch/alpha @@ -161,9 +164,6 @@ SRCS:=${SRCS} n_sqrt.S n_argred.S n_infnan.S n_atan2.S n_cabs.S n_cbrt.S \ n_support.S .endif -# XXX lint buts on some archs and needs stubs -MKLINT=no - MAN+= acos.3 acosh.3 asin.3 asinh.3 atan.3 atan2.3 atanh.3 ceil.3 \ cos.3 cosh.3 erf.3 exp.3 fabs.3 floor.3 fmod.3 hypot.3 ieee.3 \ ieee_test.3 isinff.3 j0.3 lgamma.3 math.3 rint.3 sin.3 sinh.3 sqrt.3 \ diff --git a/lib/libm/arch/i387/Makefile b/lib/libm/arch/i387/Makefile index 26015bde9c1..17f115ef5e8 100644 --- a/lib/libm/arch/i387/Makefile +++ b/lib/libm/arch/i387/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.1 1999/12/13 09:36:29 christos Exp $ +# $NetBSD: Makefile,v 1.2 2001/12/12 00:51:04 tv Exp $ # -NOLINT=yes -LIB= m387 +NOLINT= # defined +LIB= m387 + SRCS=e_acos.S e_asin.S e_atan2.S e_exp.S e_expf.S e_fmod.S e_log.S \ e_logf.S e_log10.S e_log10f.S e_remainder.S e_remainderf.S \ e_scalb.S e_scalbf.S e_sqrt.S e_sqrtf.S s_atan.S s_atanf.S \ diff --git a/lib/librmt/Makefile b/lib/librmt/Makefile index 7a6499438a0..ecb1c475908 100644 --- a/lib/librmt/Makefile +++ b/lib/librmt/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.6 2000/07/03 03:56:22 matt Exp $ +# $NetBSD: Makefile,v 1.7 2001/12/12 00:51:05 tv Exp $ -LIB= rmt -SRCS= rmtlib.c -MAN= rmtops.3 +LIB= rmt +SRCS= rmtlib.c +MAN= rmtops.3 -CPPFLAGS += -D_REENTRANT -MKPROFILE=no -MKPIC= no +CPPFLAGS+= -D_REENTRANT +NOPIC= # defined +NOPROFILE= # defined .include <bsd.lib.mk> diff --git a/lib/libroken/Makefile b/lib/libroken/Makefile index df14612e27f..2bd26112427 100644 --- a/lib/libroken/Makefile +++ b/lib/libroken/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.10 2001/09/17 12:34:43 assar Exp $ +# $NetBSD: Makefile,v 1.11 2001/12/12 00:51:05 tv Exp $ + DIST= ${.CURDIR}/../../crypto/dist -.PATH: ${DIST}/heimdal/lib/roken -.PATH: ${.CURDIR}/../../include/heimdal +.PATH: ${DIST}/heimdal/lib/roken ${.CURDIR}/../../include/heimdal -WARNS?= 1 -MKLINT= no +WARNS?= 1 +NOLINT= # defined -LIB= roken +LIB= roken SRCS= \ base64.c \ @@ -54,16 +54,15 @@ SRCS= \ warnerr.c \ write_pid.c -INCS= base64.h getarg.h parse_bytes.h parse_time.h parse_units.h \ - resolve.h roken.h roken-common.h rtbl.h - -INCSDIR= /usr/include/krb5 +INCS= base64.h getarg.h parse_bytes.h parse_time.h parse_units.h \ + resolve.h roken.h roken-common.h rtbl.h +INCSDIR= /usr/include/krb5 CPPFLAGS+= -I. \ -I${.CURDIR}/../../include/heimdal \ -I${DIST}/heimdal/lib/roken \ -DHAVE_CONFIG_H -HOST_CPPFLAGS+= -I${.CURDIR}/../../include/heimdal -DHAVE_CONFIG_H +HOST_CPPFLAGS+= -I${.CURDIR}/../../include/heimdal -DHAVE_CONFIG_H .include <bsd.lib.mk> diff --git a/lib/librpcsvc/Makefile b/lib/librpcsvc/Makefile index 12929eeb76d..d0f0de524ae 100644 --- a/lib/librpcsvc/Makefile +++ b/lib/librpcsvc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2001/11/01 15:03:07 tv Exp $ +# $NetBSD: Makefile,v 1.34 2001/12/12 00:51:05 tv Exp $ RPCSRCS= bootparam_prot.x klm_prot.x mount.x nfs_prot.x\ nlm_prot.x rex.x rnusers.x rusers.x rquota.x rstat.x rwall.x\ @@ -11,8 +11,8 @@ INCS= ${HDRS} ${RPCSRCS} INCSDIR= /usr/include/rpcsvc LIB= rpcsvc -MKMAN= no -MKPIC= no +NOMAN= # defined +NOPIC= # defined .include <bsd.lib.mk> diff --git a/lib/libsl/Makefile b/lib/libsl/Makefile index 14700512d3c..7dfc021a4ba 100644 --- a/lib/libsl/Makefile +++ b/lib/libsl/Makefile @@ -1,16 +1,14 @@ -# $NetBSD: Makefile,v 1.3 2001/11/05 15:24:49 lukem Exp $ -DIST= ${.CURDIR}/../../crypto/dist -.PATH: ${DIST}/heimdal/lib/sl - -MKLINT= no +# $NetBSD: Makefile,v 1.4 2001/12/12 00:51:05 tv Exp $ -LIB= sl - -SRCS= sl.c +DIST= ${.CURDIR}/../../crypto/dist +.PATH: ${DIST}/heimdal/lib/sl -INCS= sl.h +NOLINT= # defined -INCSDIR= /usr/include/krb5 +LIB= sl +SRCS= sl.c +INCS= sl.h +INCSDIR= /usr/include/krb5 CPPFLAGS+= -I. \ -I${DIST}/heimdal/lib/sl \ diff --git a/lib/libss/Makefile b/lib/libss/Makefile index 51066047469..c8777c43be0 100644 --- a/lib/libss/Makefile +++ b/lib/libss/Makefile @@ -1,17 +1,15 @@ -# $NetBSD: Makefile,v 1.2 2000/06/16 22:46:45 thorpej Exp $ -DIST= ${.CURDIR}/../../crypto/dist -.PATH: ${DIST}/heimdal/lib/sl - -WARNS?= 1 -MKLINT= no +# $NetBSD: Makefile,v 1.3 2001/12/12 00:51:02 tv Exp $ -LIB= ss - -SRCS= sl.c ss.c +DIST= ${.CURDIR}/../../crypto/dist +.PATH: ${DIST}/heimdal/lib/sl -INCS= ss.h +WARNS?= 1 +NOLINT= # defined -INCSDIR= /usr/include/krb5 +LIB= ss +SRCS= sl.c ss.c +INCS= ss.h +INCSDIR= /usr/include/krb5 CPPFLAGS+= -I. \ -I${DIST}/heimdal/lib/sl \ diff --git a/lib/libvers/Makefile b/lib/libvers/Makefile index f010f4bbac9..4126ad2f324 100644 --- a/lib/libvers/Makefile +++ b/lib/libvers/Makefile @@ -1,29 +1,27 @@ -# $NetBSD: Makefile,v 1.3 2001/11/05 15:24:49 lukem Exp $ -DIST= ${.CURDIR}/../../crypto/dist -.PATH: ${DIST}/heimdal/lib/vers +# $NetBSD: Makefile,v 1.4 2001/12/12 00:51:06 tv Exp $ -MKLINT= no +DIST= ${.CURDIR}/../../crypto/dist +.PATH: ${DIST}/heimdal/lib/vers -LIB= vers +MKLINT= # defined -NOPROFILE= noprofile -NOPIC= nopic +LIB= vers -# not installed, only linked against in source tree -libinstall:: +NOLINKLIB= # defined +NOPIC= # defined +NOPROFILE= # defined includes: print_version.h -SRCS= print_version.c - -DPSRCS= print_version.h +SRCS= print_version.c +DPSRCS= print_version.h CPPFLAGS+= -I. \ -I${.CURDIR}/../../include/heimdal \ -I${DIST}/heimdal/lib/roken \ -DHAVE_CONFIG_H -HOST_CPPFLAGS+= -I${.CURDIR}/../../include/heimdal -DHAVE_CONFIG_H +HOST_CPPFLAGS+= -I${.CURDIR}/../../include/heimdal -DHAVE_CONFIG_H make-print-version.lo: ${.CURDIR}/../../include/heimdal/version.h @@ -33,8 +31,8 @@ make-print-version: make-print-version.lo print_version.h: make-print-version ./make-print-version print_version.h -print_version.o print_version.so print_version.po print_version.So print_version.ln: print_version.h +print_version.o print_version.ln: print_version.h -CLEANFILES+= print_version.h make-print-version make-print-version.lo +CLEANFILES+= print_version.h make-print-version make-print-version.lo .include <bsd.lib.mk> diff --git a/lib/liby/Makefile b/lib/liby/Makefile index d922e716afe..0dd25dad575 100644 --- a/lib/liby/Makefile +++ b/lib/liby/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.8 1999/02/13 02:54:30 lukem Exp $ +# $NetBSD: Makefile,v 1.9 2001/12/12 00:51:06 tv Exp $ # from: @(#)Makefile 8.1 (Berkeley) 6/4/93 -LIB= y -SRCS= main.c yyerror.c -MKPIC= no +LIB= y +SRCS= main.c yyerror.c +NOPIC= # defined .include <bsd.lib.mk> diff --git a/lib/libz/Makefile b/lib/libz/Makefile index 43da04364ab..13f563b2a9c 100644 --- a/lib/libz/Makefile +++ b/lib/libz/Makefile @@ -1,19 +1,17 @@ -# $NetBSD: Makefile,v 1.14 1999/10/26 03:42:58 itojun Exp $ +# $NetBSD: Makefile,v 1.15 2001/12/12 00:51:06 tv Exp $ -LIB= z -MKMAN= no +LIB= z +NOMAN= # defined SRCS= adler32.c compress.c crc32.c deflate.c gzio.c infblock.c \ infcodes.c inffast.c inflate.c inftrees.c infutil.c trees.c uncompr.c \ - zutil.c -SRCS+= gzio_compat.c + zutil.c gzio_compat.c -CPPFLAGS+= -I${.CURDIR} +CPPFLAGS+= -I${.CURDIR} +CLEANFILES+= minigzip -CLEANFILES+= minigzip - -INCS= zconf.h zlib.h -INCSDIR=/usr/include +INCS= zconf.h zlib.h +INCSDIR= /usr/include .include <bsd.lib.mk> @@ -22,5 +20,5 @@ test: minigzip # Note: CFLAGS ommitted by intention! # This is to verify that zlib.h works standalone. -minigzip : minigzip.c libz.a - $(CC) -o minigzip ${.CURDIR}/minigzip.c libz.a +minigzip: minigzip.c libz.a + ${CC} -o minigzip ${.CURDIR}/minigzip.c libz.a diff --git a/lib/runemodule/Makefile.inc b/lib/runemodule/Makefile.inc index 5d0cf3cdbd5..4bd5d9f9c49 100644 --- a/lib/runemodule/Makefile.inc +++ b/lib/runemodule/Makefile.inc @@ -1,4 +1,8 @@ -# $NetBSD: Makefile.inc,v 1.3 2001/11/05 15:04:54 lukem Exp $ +# $NetBSD: Makefile.inc,v 1.4 2001/12/12 00:51:06 tv Exp $ + +NOLINT= # defined +NOPICINSTALL= # defined +NOPROFILE= # defined .include <bsd.own.mk> @@ -8,9 +12,6 @@ SHLIB_VERSION_FILE= ${.CURDIR}/../shlib_version SHLIBDIR= /usr/lib/runemodule LIBDIR= /usr/lib/runemodule INTERNALLIB= yes -MKPROFILE= no -MKPICINSTALL= no -MKLINT= no CPPFLAGS+= -I${.CURDIR}/../../libc/locale CPPFLAGS+= -DRUNEMOD_MAJOR=${SHLIB_MAJOR} BASENAME!= basename ${.CURDIR} |
