diff options
| -rw-r--r-- | kerberos5/lib/libroken/Makefile | 1 | ||||
| -rw-r--r-- | share/mk/bsd.README | 23 | ||||
| -rw-r--r-- | share/mk/bsd.prog.mk | 1 | ||||
| -rw-r--r-- | share/mk/bsd.progs.mk | 4 |
4 files changed, 23 insertions, 6 deletions
diff --git a/kerberos5/lib/libroken/Makefile b/kerberos5/lib/libroken/Makefile index cf9368b..39e15a5 100644 --- a/kerberos5/lib/libroken/Makefile +++ b/kerberos5/lib/libroken/Makefile @@ -77,7 +77,6 @@ SRCS= base64.c \ write_pid.c \ xfree.c -CPPFLAGS+= -DBUILD_ROKEN_LIB CFLAGS+=-I${KRB5DIR}/lib/roken -I. CLEANFILES= roken.h diff --git a/share/mk/bsd.README b/share/mk/bsd.README index 89f5f7e..6872a6b 100644 --- a/share/mk/bsd.README +++ b/share/mk/bsd.README @@ -262,9 +262,26 @@ PROGS_CXX PROG and PROGS_CXX in one Makefile. To define LDADD.foo= -lutil SRCS.bar= bar_src.c - The supported variables are BINDIR BINGRP BINMODE BINOWN - CFLAGS CPPFLAGS CXXFLAGS DPADD DPLIBS DPSRCS LDADD - LDFLAGS MAN MLINKS PROGNAME SRCS. + The supported variables are: + - BINDIR + - BINGRP + - BINMODE + - BINOWN + - CFLAGS + - CXXFLAGS + - DEBUG_FLAGS + - DPADD + - DPSRCS + - LDADD + - LDFLAGS + - LINKS + - MAN + - MLINKS + - NO_WERROR + - PROGNAME + - SRCS + - STRIP + - WARNS PROGNAME The name that the above program will be installed as, if different from ${PROG}. diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index bc8bffd..dc7e426 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -7,6 +7,7 @@ # XXX The use of COPTS in modern makefiles is discouraged. .if defined(COPTS) +.warning COPTS should be CFLAGS. CFLAGS+=${COPTS} .endif diff --git a/share/mk/bsd.progs.mk b/share/mk/bsd.progs.mk index 8aecbdf..69cb1bf 100644 --- a/share/mk/bsd.progs.mk +++ b/share/mk/bsd.progs.mk @@ -34,8 +34,8 @@ UPDATE_DEPENDFILE_PROG?= no .if defined(PROG) # just one of many PROG_OVERRIDE_VARS += BINDIR BINGRP BINOWN BINMODE DPSRCS MAN NO_WERROR \ - PROGNAME SRCS WARNS -PROG_VARS += CFLAGS CPPFLAGS CXXFLAGS DPADD DPLIBS LDADD LINKS \ + PROGNAME SRCS STRIP WARNS +PROG_VARS += CFLAGS CXXFLAGS DEBUG_FLAGS DPADD LDADD LIBADD LINKS \ LDFLAGS MLINKS ${PROG_OVERRIDE_VARS} .for v in ${PROG_VARS:O:u} .if empty(${PROG_OVERRIDE_VARS:M$v}) |
