diff options
51 files changed, 215 insertions, 374 deletions
@@ -93,7 +93,7 @@ # TGTS= all all-man buildkernel buildworld checkdpadd clean \ cleandepend cleandir depend distribute distributeworld everything \ - hierarchy includes install installcheck installkernel \ + hierarchy includes incsinstall install installcheck installkernel \ reinstallkernel installmost installworld libraries lint maninstall \ mk most obj objlink regress rerelease tags update diff --git a/Makefile.inc1 b/Makefile.inc1 index 1e7fd4d..beb2fdc 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -234,8 +234,8 @@ USRDIRS= usr/bin usr/lib/compat/aout usr/games usr/libdata/ldscripts \ usr/share/groff_font/devutf8 \ usr/share/tmac/mdoc usr/share/tmac/mm -INCDIRS= arpa dev fs g++/std isc isofs objc protocols \ - readline rpc rpcsvc openssl security ufs +INCDIRS= arpa dev fs g++/std isc isofs libmilter objc openssl \ + protocols readline rpc rpcsvc security ufs # # buildworld @@ -299,7 +299,7 @@ _includes: @echo "--------------------------------------------------------------" @echo ">>> stage 4: populating ${WORLDTMP}/usr/include" @echo "--------------------------------------------------------------" - cd ${.CURDIR}; ${WMAKE} SHARED=symlinks includes + cd ${.CURDIR}; ${WMAKE} SHARED=symlinks includes incsinstall _libraries: @echo @echo "--------------------------------------------------------------" @@ -537,13 +537,9 @@ most: @echo "--------------------------------------------------------------" @echo ">>> Building programs only" @echo "--------------------------------------------------------------" - cd ${.CURDIR}/bin; ${MAKE} all - cd ${.CURDIR}/sbin; ${MAKE} all - cd ${.CURDIR}/libexec; ${MAKE} all - cd ${.CURDIR}/usr.bin; ${MAKE} all - cd ${.CURDIR}/usr.sbin; ${MAKE} all - cd ${.CURDIR}/gnu/usr.bin; ${MAKE} all - cd ${.CURDIR}/gnu/usr.sbin; ${MAKE} all +.for _dir in bin sbin libexec usr.bin usr.sbin gnu/usr.bin gnu/usr.sbin + cd ${.CURDIR}/${_dir}; ${MAKE} DIRPRFX=${_dir}/ all +.endfor # # installmost @@ -555,13 +551,9 @@ installmost: @echo "--------------------------------------------------------------" @echo ">>> Installing programs only" @echo "--------------------------------------------------------------" - cd ${.CURDIR}/bin; ${MAKE} install - cd ${.CURDIR}/sbin; ${MAKE} install - cd ${.CURDIR}/libexec; ${MAKE} install - cd ${.CURDIR}/usr.bin; ${MAKE} install - cd ${.CURDIR}/usr.sbin; ${MAKE} install - cd ${.CURDIR}/gnu/usr.bin; ${MAKE} install - cd ${.CURDIR}/gnu/usr.sbin; ${MAKE} install +.for _dir in bin sbin libexec usr.bin usr.sbin gnu/usr.bin gnu/usr.sbin + cd ${.CURDIR}/${_dir}; ${MAKE} DIRPRFX=${_dir}/ install +.endfor # # ------------------------------------------------------------------------ @@ -590,10 +582,10 @@ bootstrap-tools: usr.sbin/config usr.sbin/kbdcontrol \ ${_cxx_consumers} gnu/usr.bin/texinfo cd ${.CURDIR}/${_tool}; \ - ${MAKE} obj; \ - ${MAKE} depend; \ - ${MAKE} all; \ - ${MAKE} DESTDIR=${MAKEOBJDIRPREFIX} install + ${MAKE} DIRPRFX=${_tool}/ obj; \ + ${MAKE} DIRPRFX=${_tool}/ depend; \ + ${MAKE} DIRPRFX=${_tool}/ all; \ + ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX} install .endfor # @@ -630,7 +622,7 @@ build-tools: .for _tool in bin/csh bin/sh ${_games} gnu/usr.bin/cc/cc_tools ${_fortran} \ ${_perl} ${_libroken4} ${_libkrb5} lib/libncurses ${_share} \ usr.bin/awk usr.bin/file usr.sbin/sysinstall - cd ${.CURDIR}/${_tool}; ${MAKE} build-tools + cd ${.CURDIR}/${_tool}; ${MAKE} DIRPRFX=${_tool}/ build-tools .endfor # @@ -651,10 +643,10 @@ cross-tools: gnu/usr.bin/binutils usr.bin/objformat usr.sbin/crunch/crunchide \ gnu/usr.bin/cc ${_xlint} cd ${.CURDIR}/${_tool}; \ - ${MAKE} obj; \ - ${MAKE} depend; \ - ${MAKE} all; \ - ${MAKE} DESTDIR=${MAKEOBJDIRPREFIX} install + ${MAKE} DIRPRFX=${_tool}/ obj; \ + ${MAKE} DIRPRFX=${_tool}/ depend; \ + ${MAKE} DIRPRFX=${_tool}/ all; \ + ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX} install .endfor # @@ -666,84 +658,6 @@ hierarchy: .if ${CXX} == "c++" NO_CXX= yes .endif -# -# includes - possibly generate and install the include files. -# -includes: - cd ${.CURDIR}/include; ${MAKE} -B all install - cd ${.CURDIR}/gnu/include; ${MAKE} install - cd ${.CURDIR}/gnu/lib/libdialog; ${MAKE} beforeinstall - cd ${.CURDIR}/gnu/lib/libobjc; ${MAKE} beforeinstall - cd ${.CURDIR}/gnu/lib/libreadline/readline; ${MAKE} beforeinstall - cd ${.CURDIR}/gnu/lib/libregex; ${MAKE} beforeinstall -.if !defined(NO_CXX) - cd ${.CURDIR}/gnu/lib/libstdc++; ${MAKE} beforeinstall - cd ${.CURDIR}/gnu/usr.bin/cc/cc1plus; ${MAKE} beforeinstall -.endif -.if exists(${.CURDIR}/kerberos5) && !defined(NOCRYPT) && \ - defined(MAKE_KERBEROS5) - cd ${.CURDIR}/kerberos5/lib/libasn1; ${MAKE} beforeinstall - cd ${.CURDIR}/kerberos5/lib/libhdb; ${MAKE} beforeinstall - cd ${.CURDIR}/kerberos5/lib/libkadm5clnt; ${MAKE} beforeinstall - cd ${.CURDIR}/kerberos5/lib/libkadm5srv; ${MAKE} beforeinstall - cd ${.CURDIR}/kerberos5/lib/libkafs5; ${MAKE} beforeinstall - cd ${.CURDIR}/kerberos5/lib/libkrb5; ${MAKE} beforeinstall - cd ${.CURDIR}/kerberos5/lib/libsl; ${MAKE} beforeinstall -.endif -.if exists(${.CURDIR}/kerberosIV) && !defined(NOCRYPT) && \ - defined(MAKE_KERBEROS4) - cd ${.CURDIR}/kerberosIV/lib/libacl; ${MAKE} beforeinstall - cd ${.CURDIR}/kerberosIV/lib/libkadm; ${MAKE} beforeinstall - cd ${.CURDIR}/kerberosIV/lib/libkafs; ${MAKE} beforeinstall - cd ${.CURDIR}/kerberosIV/lib/libkdb; ${MAKE} beforeinstall - cd ${.CURDIR}/kerberosIV/lib/libkrb; ${MAKE} beforeinstall - cd ${.CURDIR}/kerberosIV/lib/libtelnet; ${MAKE} beforeinstall -.elif exists(${.CURDIR}/secure) && !defined(NOCRYPT) && !defined(NOSECURE) - cd ${.CURDIR}/secure/lib/libtelnet; ${MAKE} beforeinstall -.else - cd ${.CURDIR}/lib/libtelnet; ${MAKE} beforeinstall -.endif - cd ${.CURDIR}/lib/libalias; ${MAKE} beforeinstall - cd ${.CURDIR}/lib/libatm; ${MAKE} beforeinstall - cd ${.CURDIR}/lib/libc; ${MAKE} beforeinstall - cd ${.CURDIR}/lib/libcalendar; ${MAKE} beforeinstall - cd ${.CURDIR}/lib/libcam; ${MAKE} beforeinstall - cd ${.CURDIR}/lib/libcom_err; ${MAKE} beforeinstall - cd ${.CURDIR}/lib/libdevstat; ${MAKE} beforeinstall - cd ${.CURDIR}/lib/libdisk; ${MAKE} beforeinstall - cd ${.CURDIR}/lib/libedit; ${MAKE} beforeinstall - cd ${.CURDIR}/lib/libfetch; ${MAKE} beforeinstall - cd ${.CURDIR}/lib/libftpio; ${MAKE} beforeinstall - cd ${.CURDIR}/lib/libkvm; ${MAKE} beforeinstall - cd ${.CURDIR}/lib/libmd; ${MAKE} beforeinstall - cd ${.CURDIR}/lib/libmp; ${MAKE} beforeinstall - cd ${.CURDIR}/lib/libncp; ${MAKE} beforeinstall - cd ${.CURDIR}/lib/libncurses; ${MAKE} beforeinstall - cd ${.CURDIR}/lib/libnetgraph; ${MAKE} beforeinstall - cd ${.CURDIR}/lib/libopie; ${MAKE} beforeinstall - cd ${.CURDIR}/lib/libpam/libpam; ${MAKE} beforeinstall - cd ${.CURDIR}/lib/libpcap; ${MAKE} beforeinstall - cd ${.CURDIR}/lib/libradius; ${MAKE} beforeinstall - cd ${.CURDIR}/lib/librpcsvc; ${MAKE} beforeinstall - cd ${.CURDIR}/lib/libsbuf; ${MAKE} beforeinstall - cd ${.CURDIR}/lib/libstand; ${MAKE} beforeinstall - cd ${.CURDIR}/lib/libtacplus; ${MAKE} beforeinstall - cd ${.CURDIR}/lib/libusbhid; ${MAKE} beforeinstall - cd ${.CURDIR}/lib/libutil; ${MAKE} beforeinstall - cd ${.CURDIR}/lib/libvgl; ${MAKE} beforeinstall - cd ${.CURDIR}/lib/libwrap; ${MAKE} beforeinstall - cd ${.CURDIR}/lib/libypclnt; ${MAKE} beforeinstall - cd ${.CURDIR}/lib/libz; ${MAKE} beforeinstall - cd ${.CURDIR}/lib/msun; ${MAKE} beforeinstall -.if exists(${.CURDIR}/secure) && !defined(NOCRYPT) && !defined(NOSECURE) -.if exists(${.CURDIR}/secure/lib/libcrypto) - cd ${.CURDIR}/secure/lib/libcrypto; ${MAKE} beforeinstall -.endif -.if exists(${.CURDIR}/secure/lib/libssl) - cd ${.CURDIR}/secure/lib/libssl; ${MAKE} beforeinstall -.endif -.endif - cd ${.CURDIR}/usr.bin/lex; ${MAKE} beforeinstall # # libraries - build all libraries, and install them under ${DESTDIR}. @@ -821,9 +735,9 @@ _generic_libs+= usr.sbin/pcvt/keycap ${_lib}__L: .PHONY .if exists(${.CURDIR}/${_lib}) cd ${.CURDIR}/${_lib}; \ - ${MAKE} depend; \ - ${MAKE} all; \ - ${MAKE} install + ${MAKE} DIRPRFX=${_lib}/ depend; \ + ${MAKE} DIRPRFX=${_lib}/ all; \ + ${MAKE} DIRPRFX=${_lib}/ install .endif .endfor diff --git a/gnu/include/Makefile b/gnu/include/Makefile index c6cce86..d7d0936 100644 --- a/gnu/include/Makefile +++ b/gnu/include/Makefile @@ -1,9 +1,6 @@ # $FreeBSD$ NOOBJ= noobj - -beforeinstall: - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 values.h \ - ${DESTDIR}/usr/include +INCS= values.h .include <bsd.prog.mk> diff --git a/gnu/lib/libdialog/Makefile b/gnu/lib/libdialog/Makefile index 9bca202..40d98b4 100644 --- a/gnu/lib/libdialog/Makefile +++ b/gnu/lib/libdialog/Makefile @@ -2,6 +2,7 @@ # $FreeBSD$ LIB= dialog +INCS= dialog.h MAN= dialog.3 SHLIB_MAJOR= 4 @@ -20,10 +21,6 @@ CFLAGS+= -I${.CURDIR} -Wall -Wstrict-prototypes -DLOCALE LDADD+= -lncurses DPADD+= ${LIBNCURSES} -beforeinstall: - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/dialog.h \ - ${DESTDIR}/usr/include - .if !defined(NOHTML) afterinstall: .for file in ${EXAMPLES} diff --git a/gnu/lib/libg2c/Makefile b/gnu/lib/libg2c/Makefile index 4656b87..264d5ff 100644 --- a/gnu/lib/libg2c/Makefile +++ b/gnu/lib/libg2c/Makefile @@ -117,8 +117,6 @@ ${E77OBJS:.o=.po}: f2cext.c @mv ${.TARGET}.tmp ${.TARGET} .endif -beforeinstall: - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/g2c.h \ - ${DESTDIR}/usr/include +INCS= g2c.h .include <bsd.lib.mk> diff --git a/gnu/lib/libiberty/Makefile b/gnu/lib/libiberty/Makefile index 06b3f20..7dd6ef0 100644 --- a/gnu/lib/libiberty/Makefile +++ b/gnu/lib/libiberty/Makefile @@ -2,7 +2,7 @@ SRCDIR= ${.CURDIR}/../../../contrib/binutils/libiberty -.PATH: ${SRCDIR} +.PATH: ${SRCDIR} ${SRCDIR}/../include LIB= iberty NOPIC= true @@ -18,11 +18,8 @@ SRCS= argv.c choose-temp.c concat.c cplus-dem.c fdmatch.c fnmatch.c getopt.c \ CFLAGS+= -I${SRCDIR}/../include -I${.CURDIR} CFLAGS+= -DHAVE_CONFIG_H -HDRS= alloca-conf.h ansidecl.h demangle.h floatformat.h fnmatch.h getopt.h \ - libiberty.h objalloc.h obstack.h - -#beforeinstall: -# ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ -# ${HDRS:S;^;${SRCDIR}/../include/;} ${DESTDIR}/usr/include/libiberty +#INCS= alloca-conf.h ansidecl.h demangle.h floatformat.h fnmatch.h getopt.h \ +# libiberty.h objalloc.h obstack.h +#INCSDIR=${INCLUDEDIR}/libiberty .include <bsd.lib.mk> diff --git a/gnu/lib/libobjc/Makefile b/gnu/lib/libobjc/Makefile index 65c5c63..35cf26a 100644 --- a/gnu/lib/libobjc/Makefile +++ b/gnu/lib/libobjc/Makefile @@ -14,18 +14,15 @@ SRCS= archive.c class.c encoding.c gc.c hash.c init.c misc.c \ thr.c thr-single.c \ NXConstStr.m Object.m Protocol.m linking.m -HDRS= encoding.h hash.h objc-api.h objc-list.h objc.h runtime.h \ +INCS= encoding.h hash.h objc-api.h objc-list.h objc.h runtime.h \ sarray.h thr.h typedstream.h NXConstStr.h Object.h Protocol.h +INCSDIR=${INCLUDEDIR}/objc CFLAGS+= -fgnu-runtime -DHAVE_GTHR_DEFAULT -DIN_TARGET_LIBS CFLAGS+= -I. -I${.CURDIR}/../../usr.bin/cc/cc_tools CFLAGS+= -I${OBJCDIR}/objc -I${OBJCDIR} CFLAGS+= -I${GCCDIR}/config -I${GCCDIR} -beforeinstall: - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${HDRS:S;^;${OBJCDIR}/objc/;} ${DESTDIR}/usr/include/objc - GENHDRS= runtime-info.h tconfig.h CLEANFILES+= ${GENHDRS} SRCS+= ${GENHDRS} diff --git a/gnu/lib/libreadline/readline/Makefile b/gnu/lib/libreadline/readline/Makefile index 9159302..57fa012 100644 --- a/gnu/lib/libreadline/readline/Makefile +++ b/gnu/lib/libreadline/readline/Makefile @@ -17,7 +17,7 @@ INSTALLED_HEADERS= readline.h chardefs.h keymaps.h history.h tilde.h \ DPADD= ${LIBNCURSES} LDADD= -lncurses -INCDIR= /usr/include/readline +INCSDIR=${INCLUDEDIR}/readline .for hdr in ${INSTALLED_HEADERS} INCS+= ${SRCDIR}/${hdr} diff --git a/gnu/lib/libregex/Makefile b/gnu/lib/libregex/Makefile index 968308e..d351027 100644 --- a/gnu/lib/libregex/Makefile +++ b/gnu/lib/libregex/Makefile @@ -7,12 +7,10 @@ SHLIB_MAJOR= 2 SHLIB_MINOR= 0 SRCS= regex.c +INCS= regex.h +INCSNAME= gnuregex.h NOMAN= noman CFLAGS+=-I${.CURDIR} -DHAVE_STRING_H=1 -DSTDC_HEADERS=1 -DNO_POSIX_COMPAT=1 -beforeinstall: - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/regex.h \ - ${DESTDIR}/usr/include/gnuregex.h - .include <bsd.lib.mk> diff --git a/gnu/lib/libstdc++/Makefile b/gnu/lib/libstdc++/Makefile index 3e7e943..d27fe64 100644 --- a/gnu/lib/libstdc++/Makefile +++ b/gnu/lib/libstdc++/Makefile @@ -2,7 +2,7 @@ SRCDIR= ${.CURDIR}/../../../contrib/libstdc++-v3/src .PATH: ${SRCDIR}/src ${SRCDIR}/libmath ${SRCDIR}/config/io \ - ${SRCDIR}/config/locale/generic ${SRCDIR} + ${SRCDIR}/config/locale/generic ${SRCDIR} ${SRCDIR}/std SUBDIR= doc @@ -87,19 +87,10 @@ THDHDRS=gthr.h gthr-single.h gthr-posix.h gthr-default.h BASEDHDRS_renamed= ${BASEDHDRS:Mstd_*:S/std_//g:S/.h//g} STDHDRS_renamed= ${STDHDRS:Mstd_*:S/std_//g:S/.h//g} -#------------------------------------------------------------------------------ +INCS= _G_config.h ${HDRS:S;^;${SRCDIR}/;} ${IHDRS} ${STLHDRS} -# gxx_include_dir = $(prefix)/include/g++-v3 -beforeinstall: - mkdir -p ${DESTDIR}/usr/include/g++/{backward,ext} - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.CURDIR}/_G_config.h \ - ${HDRS:S;^;${SRCDIR}/;} \ - ${IHDRS:S;^;${SRCDIR}/../libio/;} \ - ${STLHDRS:S;^;${SRCDIR}/stl/;} \ - ${DESTDIR}/usr/include/g++ - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${STDHDRS:S;^;${SRCDIR}/std/;} \ - ${DESTDIR}/usr/include/g++/std +INCSGROUPS= INCS STDHDRS +INCSDIR= ${INCLUDEDIR}/g++ +STDHDRSDIR= ${INCLUDEDIR}/g++/std .include <bsd.lib.mk> diff --git a/gnu/lib/libsupc++/Makefile b/gnu/lib/libsupc++/Makefile index a35befc..2e5b1cc 100644 --- a/gnu/lib/libsupc++/Makefile +++ b/gnu/lib/libsupc++/Makefile @@ -19,10 +19,7 @@ CXXFLAGS+= -nostdinc++ \ -fno-implicit-templates -ffunction-sections -fdata-sections HDRS= exception new typeinfo cxxabi.h exception_defines.h - -beforeinstall: - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${HDRS:S;^;${SRCDIR}/;} \ - ${DESTDIR}/usr/include/g++-v3 +INCS= ${HDRS:S;^;${SRCDIR}/;} +INCSDIR=${INCLUDEDIR}/g++-v3 .include <bsd.lib.mk> diff --git a/include/Makefile b/include/Makefile index c8ba2b6..3dc44de 100644 --- a/include/Makefile +++ b/include/Makefile @@ -7,8 +7,8 @@ # links. CLEANFILES= osreldate.h version vers.c -SUBDIR= rpcsvc rpc -HDRS= a.out.h ar.h assert.h bitstring.h complex.h ctype.h db.h \ +SUBDIR= arpa protocols rpcsvc rpc +INCS= a.out.h ar.h assert.h bitstring.h complex.h ctype.h db.h \ dirent.h \ dlfcn.h elf.h elf-hints.h err.h fnmatch.h fstab.h \ fts.h glob.h grp.h \ @@ -23,10 +23,6 @@ HDRS= a.out.h ar.h assert.h bitstring.h complex.h ctype.h db.h \ string.h stringlist.h strings.h sysexits.h tar.h time.h timers.h \ ttyent.h unistd.h utime.h utmp.h vis.h wchar.h wctype.h -ARPAHDRS= ftp.h inet.h nameser.h nameser_compat.h telnet.h tftp.h - -PROTOHDRS= dumprestore.h routed.h rwhod.h talkd.h timed.h - MHDRS= float.h floatingpoint.h stdarg.h varargs.h # posix4/aio.h conflicts with dysons and isn't installed: @@ -57,7 +53,7 @@ LSYMSUBDIRS= ${LSUBDIRS:Ncam/scsi:Nnetatm/*} #SHARED= symlinks SHARED?= copies -all: osreldate.h +INCS+= osreldate.h osreldate.h: ${.CURDIR}/../sys/conf/newvers.sh \ ${.CURDIR}/../sys/sys/param.h \ @@ -73,28 +69,14 @@ osreldate.h: ${.CURDIR}/../sys/conf/newvers.sh \ echo \#'define __FreeBSD_version' $$RELDATE >> osreldate.h; \ echo "#endif" >> osreldate.h -beforeinstall: ${SHARED} - @rm -f ${DESTDIR}/usr/include/timepps.h - cd ${.CURDIR}; \ - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${HDRS} ${DESTDIR}/usr/include - cd ${.CURDIR}/arpa; \ - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${ARPAHDRS} ${DESTDIR}/usr/include/arpa - cd ${.CURDIR}/protocols; \ - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${PROTOHDRS} ${DESTDIR}/usr/include/protocols - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.OBJDIR}/osreldate.h \ - ${DESTDIR}/usr/include .for i in ${LHDRS} - ln -sf sys/$i ${DESTDIR}/usr/include/$i +INCSLINKS+= sys/$i ${INCLUDEDIR}/$i .endfor .for i in ${MHDRS} - ln -sf machine/$i ${DESTDIR}/usr/include/$i +INCSLINKS+= machine/$i ${INCLUDEDIR}/$i .endfor .for i in ${PHDRS} - ln -sf posix4/$i ${DESTDIR}/usr/include/$i +INCSLINKS+= posix4/$i ${INCLUDEDIR}/$i .endfor copies: @@ -134,4 +116,6 @@ symlinks: rm -rf ${DESTDIR}/usr/include/machine ln -s ../../sys/${MACHINE_ARCH}/include ${DESTDIR}/usr/include/machine +_incsinstall: ${SHARED} + .include <bsd.prog.mk> diff --git a/include/arpa/Makefile b/include/arpa/Makefile new file mode 100644 index 0000000..2e6086b --- /dev/null +++ b/include/arpa/Makefile @@ -0,0 +1,7 @@ +# $FreeBSD$ + +NOOBJ= noobj +INCS= ftp.h inet.h nameser.h nameser_compat.h telnet.h tftp.h +INCSDIR=${INCLUDEDIR}/arpa + +.include <bsd.prog.mk> diff --git a/include/protocols/Makefile b/include/protocols/Makefile new file mode 100644 index 0000000..3c79142 --- /dev/null +++ b/include/protocols/Makefile @@ -0,0 +1,7 @@ +# $FreeBSD$ + +NOOBJ= noobj +INCS= dumprestore.h routed.h rwhod.h talkd.h timed.h +INCSDIR=${INCLUDEDIR}/protocols + +.include <bsd.prog.mk> diff --git a/include/rpc/Makefile b/include/rpc/Makefile index 1d15974..a7a40a2 100644 --- a/include/rpc/Makefile +++ b/include/rpc/Makefile @@ -22,14 +22,8 @@ HFILES+= auth_kerb.h CLEANFILES+= ${HDRS} -all: ${HDRS} - -beforeinstall: - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${HFILES:S;^;${.CURDIR}/;} \ - ${XFILES:S;^;${.CURDIR}/;} \ - ${HDRS} \ - ${DESTDIR}/usr/include/rpc +INCS= ${HFILES} ${XFILES} ${HDRS} +INCSDIR=${INCLUDEDIR}/rpc .x.h: ${RPCCOM} -h -DWANT_NFS3 ${.IMPSRC} -o ${.TARGET} diff --git a/include/rpcsvc/Makefile b/include/rpcsvc/Makefile index 48e78a6..d7d093f 100644 --- a/include/rpcsvc/Makefile +++ b/include/rpcsvc/Makefile @@ -17,16 +17,11 @@ HFILES= yp_prot.h ypclnt.h nis_db.h nis_tags.h nislib.h CLEANFILES+= ${HDRS} -all: ${HDRS} - -beforeinstall: - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${HFILES:S;^;${.CURDIR}/;} \ - ${XFILES:S;^;${.CURDIR}/;} \ - ${HDRS} \ - ${DESTDIR}/usr/include/rpcsvc - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 key_prot.h \ - ${DESTDIR}/usr/include/rpc +INCSGROUPS= INCS RPCHDRS +INCS= ${HFILES} ${XFILES} ${HDRS} +INCSDIR= ${INCLUDEDIR}/rpcsvc +RPCHDRS= key_prot.h +RPCHDRSDIR= ${INCLUDEDIR}/rpc .x.h: ${RPCCOM} -h -DWANT_NFS3 ${.IMPSRC} -o ${.TARGET} diff --git a/kerberos5/Makefile.inc b/kerberos5/Makefile.inc index 882c268..918b803 100644 --- a/kerberos5/Makefile.inc +++ b/kerberos5/Makefile.inc @@ -4,13 +4,12 @@ DISTRIBUTION?= krb5 .if !defined(INCLUDEOBJDIR) -INCLUDEDIR= ${.CURDIR}/../../include KRB4DIR= ${.CURDIR}/../../../crypto/kerberosIV KRB5DIR= ${.CURDIR}/../../../crypto/heimdal ROKENDIR= ${.CURDIR}/../../lib/libroken TELNETDIR= ${.CURDIR}/../../../crypto/telnet -CFLAGS+=-Wall -I${INCLUDEDIR} -I${INCLUDEOBJDIR} -DHAVE_CONFIG_H +CFLAGS+=-Wall -I${INCLUDEOBJDIR} -DHAVE_CONFIG_H .if defined(MAKE_KERBEROS4) CFLAGS+=-DKRB5_KRB4_COMPAT -DKRB4 @@ -148,14 +147,6 @@ k524_err.c k524_err.h: \ CLEANFILES+=k524_err.h k524_err.c k524_err.et -.if defined(INCLUDES) -beforeinstall: ${INCLUDES} -.for INC in ${INCLUDES} - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${INC} ${DESTDIR}/usr/include -.endfor -.endif - roken.h: make-roken ./make-roken > tmp.h ;\ if [ -f roken.h ] && cmp -s tmp.h roken.h ; then rm -f tmp.h ; \ @@ -168,7 +159,6 @@ CLEANFILES+= make-roken.c make-roken roken.h .else -INCLUDEDIR= ${.CURDIR}/../../include KRB4DIR= ${.CURDIR}/../../crypto/kerberosIV KRB5DIR= ${.CURDIR}/../../crypto/heimdal ROKENDIR= ${.CURDIR}/../../lib/libroken diff --git a/kerberos5/lib/libasn1/Makefile b/kerberos5/lib/libasn1/Makefile index 7e0313d..c0b5156 100644 --- a/kerberos5/lib/libasn1/Makefile +++ b/kerberos5/lib/libasn1/Makefile @@ -63,7 +63,7 @@ GEN= \ asn1_TransitedEncoding.x \ asn1_UNSIGNED.x -INCLUDES=krb5_asn1.h asn1_err.h +INCS= krb5_asn1.h asn1_err.h .include <bsd.lib.mk> diff --git a/kerberos5/lib/libgssapi/Makefile b/kerberos5/lib/libgssapi/Makefile index bf7902e..0492756 100644 --- a/kerberos5/lib/libgssapi/Makefile +++ b/kerberos5/lib/libgssapi/Makefile @@ -50,10 +50,8 @@ SRCS= \ wrap.c \ address_to_krb5addr.c -INCLUDES=${KRB5DIR}/lib/gssapi/gssapi.h heim_err.h krb5_err.h k524_err.h +INCS= gssapi.h heim_err.h krb5_err.h k524_err.h .include <bsd.lib.mk> .PATH: ${KRB5DIR}/lib/gssapi - -beforedepend all: heim_err.h krb5_err.h k524_err.h diff --git a/kerberos5/lib/libkrb5/Makefile b/kerberos5/lib/libkrb5/Makefile index fd58464..73f8dbc 100644 --- a/kerberos5/lib/libkrb5/Makefile +++ b/kerberos5/lib/libkrb5/Makefile @@ -111,8 +111,8 @@ SRCS= \ heim_err.c \ heim_err.h -INCLUDES=${KRB5DIR}/lib/krb5/krb5.h ${.CURDIR}/../../include/krb5-types.h \ - ${KRB5DIR}/lib/krb5/krb5-protos.h heim_err.h krb5_err.h k524_err.h +INCS= krb5.h ${.CURDIR}/../../include/krb5-types.h \ + krb5-protos.h heim_err.h krb5_err.h k524_err.h MAN3= \ krb5.3 \ @@ -152,5 +152,3 @@ MAN8= \ .PATH: ${KRB5DIR}/lib/krb5 .PATH: ${KRB5DIR}/lib/des - -beforedepend all: asn1_err.h krb5_err.h k524_err.h diff --git a/kerberos5/lib/libroken/Makefile b/kerberos5/lib/libroken/Makefile index 7311f97..5cdf110 100644 --- a/kerberos5/lib/libroken/Makefile +++ b/kerberos5/lib/libroken/Makefile @@ -58,7 +58,7 @@ SRCS= \ strupr.c \ roken.h -INCLUDES= roken.h ${KRB5DIR}/lib/roken/roken-common.h +INCS= roken.h ${KRB5DIR}/lib/roken/roken-common.h .include <bsd.lib.mk> diff --git a/kerberos5/lib/libtelnet/Makefile b/kerberos5/lib/libtelnet/Makefile index d62356f..2286cf9 100644 --- a/kerberos5/lib/libtelnet/Makefile +++ b/kerberos5/lib/libtelnet/Makefile @@ -20,7 +20,7 @@ CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DSRA -I${TELNETDIR} CFLAGS+= -DKRB5 -I${KRB5DIR}/lib/krb5 -I${KRB5OBJDIR} -I${ASN1OBJDIR} INCS= ${TELNETDIR}/arpa/telnet.h -INCDIR= /usr/include/arpa +INCSDIR= ${INCLUDEDIR}/arpa .include <bsd.lib.mk> diff --git a/kerberos5/usr.bin/krb5-config/Makefile b/kerberos5/usr.bin/krb5-config/Makefile index aea7e69..f3a632f 100644 --- a/kerberos5/usr.bin/krb5-config/Makefile +++ b/kerberos5/usr.bin/krb5-config/Makefile @@ -10,7 +10,7 @@ krb5-config: krb5-config.in -e "s,@prefix\@,/,g" \ -e "s,@exec_prefix\@,/,g" \ -e "s,@libdir\@,${LIBDIR},g" \ - -e "s,@includedir\@,${INCDIR},g" \ + -e "s,@includedir\@,${INCLUDEDIR},g" \ -e "s,@LIB_crypt\@,-lcrypt,g" \ -e "s,@LIB_dbopen\@,,g" \ -e "s,@LIB_des_appl\@,-lcrypto,g" \ diff --git a/kerberosIV/Makefile.inc b/kerberosIV/Makefile.inc index d21105c..97aa76c 100644 --- a/kerberosIV/Makefile.inc +++ b/kerberosIV/Makefile.inc @@ -91,14 +91,6 @@ ${KRBOBJDIR}/krb_err.c ${KRBOBJDIR}/krb_err.h: ${KRB4DIR}/lib/krb/krb_err.et CLEANFILES+=${KRBOBJDIR}/krb_err.h ${KRBOBJDIR}/krb_err.c ${KRBOBJDIR}/krb_err.et -.if defined(INCLUDES) -beforeinstall: ${INCLUDES} -.for INC in ${INCLUDES} - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${INC} ${DESTDIR}/usr/include -.endfor -.endif - .else KRB4DIR= ${.CURDIR}/../../crypto/kerberosIV diff --git a/kerberosIV/lib/libacl/Makefile b/kerberosIV/lib/libacl/Makefile index 87c360f..347131b 100644 --- a/kerberosIV/lib/libacl/Makefile +++ b/kerberosIV/lib/libacl/Makefile @@ -8,6 +8,7 @@ CFLAGS+= -I${KRB4DIR}/include \ -I${INCLUDEOBJDIR} \ -I${.OBJDIR} SRCS= acl_files.c protos.h +INCS= acl.h MAN= ${KRB4DIR}/man/acl_check.3 MLINKS= acl_check.3 acl_canonicalize_principal.3 \ acl_check.3 acl_exact_match.3 \ @@ -15,8 +16,6 @@ MLINKS= acl_check.3 acl_canonicalize_principal.3 \ acl_check.3 acl_delete.3 \ acl_check.3 acl_initialize.3 -INCLUDES= ${KRB4DIR}/lib/acl/acl.h - .include <bsd.lib.mk> .PATH: ${KRB4DIR}/lib/acl diff --git a/kerberosIV/lib/libkadm/Makefile b/kerberosIV/lib/libkadm/Makefile index b868be2..9019aae 100644 --- a/kerberosIV/lib/libkadm/Makefile +++ b/kerberosIV/lib/libkadm/Makefile @@ -13,8 +13,7 @@ CFLAGS+= -I${KRB4DIR}/include \ SRCS= kadm_cli_wrap.c kadm_stream.c kadm_supp.c \ ${KADMOBJDIR}/kadm_err.c ${KADMOBJDIR}/kadm_err.h \ ${KRBOBJDIR}/krb_err.h check_password.c protos.h - -INCLUDES= ${KRB4DIR}/lib/kadm/kadm.h ${KADMOBJDIR}/kadm_err.h +INCS= kadm.h ${KADMOBJDIR}/kadm_err.h .include <bsd.lib.mk> diff --git a/kerberosIV/lib/libkafs/Makefile b/kerberosIV/lib/libkafs/Makefile index ee6952c..93af2f8 100644 --- a/kerberosIV/lib/libkafs/Makefile +++ b/kerberosIV/lib/libkafs/Makefile @@ -8,14 +8,12 @@ CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/lib/kafs SRCS= afssys.c afskrb.c common.c issuid.c \ strlcpy.c strlcat.c +INCS= kafs.h MAN= ${KRB4DIR}/man/kafs.3 MLINKS= kafs.3 k_hasafs.3 kafs.3 k_afsklog.3 kafs.3 k_afsklog_uid.3 \ kafs.3 k_pioctl.3 kafs.3 k_unlog.3 kafs.3 k_setpag.3 \ kafs.3 k_afs_cell_of_file.3 - -INCLUDES= ${KRB4DIR}/lib/kafs/kafs.h - .include <bsd.lib.mk> .PATH: ${KRB4DIR}/lib/kafs diff --git a/kerberosIV/lib/libkdb/Makefile b/kerberosIV/lib/libkdb/Makefile index 1e3878a..fc5db4d 100644 --- a/kerberosIV/lib/libkdb/Makefile +++ b/kerberosIV/lib/libkdb/Makefile @@ -9,8 +9,7 @@ CFLAGS+= -I${KRB4DIR}/include \ -I${KADMOBJDIR} SRCS= krb_cache.c krb_kdb_utils.c copykey.c krb_lib.c krb_dbm.c \ print_princ.c - -INCLUDES= ${KRB4DIR}/lib/kdb/kdc.h ${KRB4DIR}/lib/kdb/krb_db.h +INCS= kdc.h krb_db.h .include <bsd.lib.mk> diff --git a/kerberosIV/lib/libkrb/Makefile b/kerberosIV/lib/libkrb/Makefile index ddaa813..69af18b 100644 --- a/kerberosIV/lib/libkrb/Makefile +++ b/kerberosIV/lib/libkrb/Makefile @@ -30,6 +30,7 @@ SRCS= check_time.c cr_err_reply.c create_auth_reply.c \ strcasecmp.c strlcat.c strlcpy.c strdup.c strncasecmp.c \ strnlen.c strtok_r.c swab.c ${KRBOBJDIR}/krb_err.c \ ${KRBOBJDIR}/krb_err.h protos.h +INCS= krb.h klog.h krb-protos.h prot.h ${KRBOBJDIR}/krb_err.h MAN= ${KRB4DIR}/man/kerberos.3 \ ${KRB4DIR}/man/krb_realmofhost.3 \ ${KRB4DIR}/man/krb_sendauth.3 \ @@ -61,10 +62,6 @@ MLINKS= kerberos.3 krb_mk_req.3 \ tf_util.3 tf_get_cred.3 \ tf_util.3 tf_close.3 -INCLUDES= ${KRB4DIR}/lib/krb/krb.h ${KRB4DIR}/lib/krb/klog.h \ - ${KRB4DIR}/lib/krb/krb-protos.h \ - ${KRB4DIR}/lib/krb/prot.h ${KRBOBJDIR}/krb_err.h - .include <bsd.lib.mk> .PATH: ${KRB4DIR}/lib/krb diff --git a/kerberosIV/lib/libtelnet/Makefile b/kerberosIV/lib/libtelnet/Makefile index 068622f..7b3f012 100644 --- a/kerberosIV/lib/libtelnet/Makefile +++ b/kerberosIV/lib/libtelnet/Makefile @@ -16,7 +16,7 @@ CFLAGS+= -DKRB4 -I${KRB4DIR}/lib/krb WARNS?= 2 INCS= ${TELNETDIR}/arpa/telnet.h -INCDIR= /usr/include/arpa +INCSDIR= ${INCLUDEDIR}/arpa .include <bsd.lib.mk> diff --git a/lib/libisc/Makefile b/lib/libisc/Makefile index 9423563..3733343 100644 --- a/lib/libisc/Makefile +++ b/lib/libisc/Makefile @@ -27,7 +27,7 @@ INCS= ${BIND_DIR}/include/isc/assertions.h \ ${BIND_DIR}/include/isc/memcluster.h \ ${BIND_DIR}/include/isc/misc.h \ ${BIND_DIR}/include/isc/tree.h -INCDIR= /usr/include/isc +INCSDIR= ${INCLUDEDIR}/isc MAN= assertions.3 bitncmp.3 eventlib.3 heap.3 \ logging.3 memcluster.3 tree.3 diff --git a/lib/libmilter/Makefile b/lib/libmilter/Makefile index b3444e5..371933e 100644 --- a/lib/libmilter/Makefile +++ b/lib/libmilter/Makefile @@ -12,7 +12,7 @@ CFLAGS+=-D_THREAD_SAFE # User customizations to the sendmail build environment CFLAGS+=${SENDMAIL_CFLAGS} -INCDIR= /usr/include/libmilter +INCSDIR=${INCLUDEDIR}/libmilter INCS= ${SENDMAIL_DIR}/include/libmilter/mfapi.h \ ${SENDMAIL_DIR}/include/libmilter/mfdef.h LIB= milter diff --git a/lib/libmp/Makefile b/lib/libmp/Makefile index 76bdd8f..a6381f3 100644 --- a/lib/libmp/Makefile +++ b/lib/libmp/Makefile @@ -10,8 +10,4 @@ SRCS= mpasbn.c INCS= mp.h MAN3= libmp.3 -beforeinstall: - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.CURDIR}/mp.h ${DESTDIR}/usr/include - .include <bsd.lib.mk> diff --git a/lib/libncurses/Makefile b/lib/libncurses/Makefile index f73af6c..0bad7af 100644 --- a/lib/libncurses/Makefile +++ b/lib/libncurses/Makefile @@ -34,8 +34,8 @@ ONEUL= 1UL .PATH: ${NCURSES}/include .PATH: ${NCURSES}/man -INCS= -I. -I${.CURDIR} -I${NCURSES}/ncurses -I${NCURSES}/include -CFLAGS+=${INCS} -Wall -DFREEBSD_NATIVE -DNDEBUG -DHAVE_CONFIG_H -DTERMIOS +CFLAGS+=-I. -I${.CURDIR} -I${NCURSES}/ncurses -I${NCURSES}/include +CFLAGS+=-Wall -DFREEBSD_NATIVE -DNDEBUG -DHAVE_CONFIG_H -DTERMIOS GENSRC= \ codes.c \ @@ -60,6 +60,8 @@ GENHDR= \ # Installed HEADERS=curses.h term.h termcap.h unctrl.h SRCHDRS=ncurses_dll.h +INCS= ${HEADERS} ${SRCHDRS} +INCSLINKS= curses.h ${INCLUDEDIR}/ncurses.h # Components of names.c and codes.c NAMESRC=boolnames boolfnames numnames numfnames strnames strfnames @@ -251,15 +253,6 @@ SYMLINKS+=libncurses_p.a ${LIBDIR}/libtinfo_p.a DOCSDIR= /usr/share/doc/ncurses DOCS= ncurses-intro.html hackguide.html -beforeinstall: ${HEADERS} - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${HEADERS} \ - ${DESTDIR}/usr/include - cd ${NCURSES}/include ; \ - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${SRCHDRS} \ - ${DESTDIR}/usr/include - rm -f ${DESTDIR}/usr/include/ncurses.h - ln -s curses.h ${DESTDIR}/usr/include/ncurses.h - .if !defined(NOHTML) afterinstall: .for file in ${DOCS} @@ -282,7 +275,7 @@ codes.c: namehdr ${CODESRC} codeftr cat namehdr ${CODESRC} codeftr > $@ lib_gen.c: MKlib_gen.sh curses.h - sh ${NCURSES}/ncurses/base/MKlib_gen.sh "${CC} -E ${INCS}" \ + sh ${NCURSES}/ncurses/base/MKlib_gen.sh "${CC} -E ${CFLAGS}" \ "${AWK}" < curses.h >$@ lib_keyname.c: keys.list MKkeyname.awk @@ -308,7 +301,7 @@ ncurses_def.h: MKncurses_def.sh ncurses_defs ${NCURSES}/include/ncurses_defs > ncurses_def.h nomacros.h: MKlib_gen.sh curses.h - sh ${NCURSES}/ncurses/base/MKlib_gen.sh "${CC} -E ${INCS}" \ + sh ${NCURSES}/ncurses/base/MKlib_gen.sh "${CC} -E ${CFLAGS}" \ "${AWK}" < curses.h | fgrep undef > $@ init_keytry.h: keys.list make_keys diff --git a/lib/libpam/libpam/Makefile b/lib/libpam/libpam/Makefile index e8118ad..5c0750e 100644 --- a/lib/libpam/libpam/Makefile +++ b/lib/libpam/libpam/Makefile @@ -135,7 +135,7 @@ HEADERS += security/pam_constants.h HEADERS += security/pam_modules.h HEADERS += security/pam_types.h -ADD_HEADERS = pam_mod_misc.h +ADD_HEADERS = security/pam_mod_misc.h # Static modules MODULE_DIR = ../modules @@ -154,15 +154,8 @@ openpam_static_modules.o: openpam_static.o ${STATIC_MODULES} .endif # Headers -beforeinstall: -.for HEADER in ${HEADERS} - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${OPENPAM}/include/${HEADER} ${DESTDIR}/usr/include/${HEADER} -.endfor -.for HEADER in ${ADD_HEADERS} - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.CURDIR}/security/${HEADER} ${DESTDIR}/usr/include/security/${HEADER} -.endfor +INCS= ${HEADERS} ${ADD_HEADERS} +INCSDIR= ${INCLUDEDIR}/security .include <bsd.lib.mk> .PATH: ${OPENPAM}/include diff --git a/lib/libpcap/Makefile b/lib/libpcap/Makefile index a2c9be6..b87bb9b 100644 --- a/lib/libpcap/Makefile +++ b/lib/libpcap/Makefile @@ -6,6 +6,7 @@ SRCS= grammar.y tokdefs.h pcap-bpf.c \ pcap.c inet.c gencode.c optimize.c nametoaddr.c \ etherent.c savefile.c bpf_filter.c bpf_image.c bpf_dump.c \ scanner.l version.c +INCS= pcap.h pcap-int.h pcap-namedb.h MAN= pcap.3 CLEANFILES=tokdefs.h version.c @@ -29,12 +30,6 @@ version.c: ${PCAP_DISTDIR}/VERSION @rm -f $@ sed 's/.*/char pcap_version[] = "&";/' ${PCAP_DISTDIR}/VERSION > $@ -beforeinstall: -.for i in pcap.h pcap-int.h pcap-namedb.h - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${PCAP_DISTDIR}/$i \ - ${DESTDIR}/usr/include -.endfor - tokdefs.h: grammar.h ln -sf grammar.h tokdefs.h diff --git a/lib/libstand/Makefile b/lib/libstand/Makefile index 55b71b9..38c0312 100644 --- a/lib/libstand/Makefile +++ b/lib/libstand/Makefile @@ -9,6 +9,7 @@ LIB= stand NOPROFILE= YES NOPIC= YES +INCS= stand.h MAN= libstand.3 CFLAGS+= -ffreestanding @@ -151,8 +152,4 @@ SRCS+= netif.c nfs.c SRCS+= dosfs.c ext2fs.c SRCS+= splitfs.c -beforeinstall: - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/stand.h \ - ${DESTDIR}/usr/include - .include <bsd.lib.mk> diff --git a/lib/libwrap/Makefile b/lib/libwrap/Makefile index e1af867..8304710 100644 --- a/lib/libwrap/Makefile +++ b/lib/libwrap/Makefile @@ -7,6 +7,7 @@ MAINTAINER=markm@FreeBSD.org LIB= wrap SHLIB_MAJOR= 3 SHLIB_MINOR= 0 +INCS= tcpd.h MAN= hosts_access.3 MAN+= hosts_access.5 hosts_options.5 @@ -26,9 +27,4 @@ SRCS= clean_exit.c diag.c eval.c fix_options.c fromhost.c \ percent_m.c percent_x.c refuse.c rfc931.c shell_cmd.c \ socket.c tli.c update.c workarounds.c libvars.c -beforeinstall: - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.CURDIR}/../../contrib/tcp_wrappers/tcpd.h \ - ${DESTDIR}/usr/include - .include <bsd.lib.mk> diff --git a/lib/msun/Makefile b/lib/msun/Makefile index b7c5184..1fb2169 100644 --- a/lib/msun/Makefile +++ b/lib/msun/Makefile @@ -117,6 +117,8 @@ ${ARCH_PREFIX}${i}: ${.CURDIR}/${ARCH}/${i} cp ${.ALLSRC} ${.TARGET} .endfor +INCS= math.h + 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 j0.3 lgamma.3 math.3 rint.3 sin.3 sinh.3 sqrt.3 \ @@ -157,9 +159,4 @@ MLINKS+=sqrt.3 cbrt.3 sqrt.3 cbrtf.3 sqrt.3 sqrtf.3 MLINKS+=tan.3 tanf.3 MLINKS+=tanh.3 tanhf.3 -# XXX we should have only one math.h, and a rule for installing .h's... -beforeinstall: - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/src/math.h \ - ${DESTDIR}/usr/include - .include <bsd.lib.mk> diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile index f73af6c..0bad7af 100644 --- a/lib/ncurses/ncurses/Makefile +++ b/lib/ncurses/ncurses/Makefile @@ -34,8 +34,8 @@ ONEUL= 1UL .PATH: ${NCURSES}/include .PATH: ${NCURSES}/man -INCS= -I. -I${.CURDIR} -I${NCURSES}/ncurses -I${NCURSES}/include -CFLAGS+=${INCS} -Wall -DFREEBSD_NATIVE -DNDEBUG -DHAVE_CONFIG_H -DTERMIOS +CFLAGS+=-I. -I${.CURDIR} -I${NCURSES}/ncurses -I${NCURSES}/include +CFLAGS+=-Wall -DFREEBSD_NATIVE -DNDEBUG -DHAVE_CONFIG_H -DTERMIOS GENSRC= \ codes.c \ @@ -60,6 +60,8 @@ GENHDR= \ # Installed HEADERS=curses.h term.h termcap.h unctrl.h SRCHDRS=ncurses_dll.h +INCS= ${HEADERS} ${SRCHDRS} +INCSLINKS= curses.h ${INCLUDEDIR}/ncurses.h # Components of names.c and codes.c NAMESRC=boolnames boolfnames numnames numfnames strnames strfnames @@ -251,15 +253,6 @@ SYMLINKS+=libncurses_p.a ${LIBDIR}/libtinfo_p.a DOCSDIR= /usr/share/doc/ncurses DOCS= ncurses-intro.html hackguide.html -beforeinstall: ${HEADERS} - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${HEADERS} \ - ${DESTDIR}/usr/include - cd ${NCURSES}/include ; \ - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ${SRCHDRS} \ - ${DESTDIR}/usr/include - rm -f ${DESTDIR}/usr/include/ncurses.h - ln -s curses.h ${DESTDIR}/usr/include/ncurses.h - .if !defined(NOHTML) afterinstall: .for file in ${DOCS} @@ -282,7 +275,7 @@ codes.c: namehdr ${CODESRC} codeftr cat namehdr ${CODESRC} codeftr > $@ lib_gen.c: MKlib_gen.sh curses.h - sh ${NCURSES}/ncurses/base/MKlib_gen.sh "${CC} -E ${INCS}" \ + sh ${NCURSES}/ncurses/base/MKlib_gen.sh "${CC} -E ${CFLAGS}" \ "${AWK}" < curses.h >$@ lib_keyname.c: keys.list MKkeyname.awk @@ -308,7 +301,7 @@ ncurses_def.h: MKncurses_def.sh ncurses_defs ${NCURSES}/include/ncurses_defs > ncurses_def.h nomacros.h: MKlib_gen.sh curses.h - sh ${NCURSES}/ncurses/base/MKlib_gen.sh "${CC} -E ${INCS}" \ + sh ${NCURSES}/ncurses/base/MKlib_gen.sh "${CC} -E ${CFLAGS}" \ "${AWK}" < curses.h | fgrep undef > $@ init_keytry.h: keys.list make_keys diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile index 71166cb..9ad59f0 100644 --- a/secure/lib/libcrypto/Makefile +++ b/secure/lib/libcrypto/Makefile @@ -365,11 +365,9 @@ MLINKS= des_crypt.3 des_read_password.3 \ des_crypt.3 des_enc_read.3 des_crypt.3 des_enc_write.3 \ des_crypt.3 des_set_odd_parity.3 des_crypt.3 des_is_weak_key.3 -beforeinstall: openssl/opensslconf.h openssl/evp.h - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${CRYPTO_HDRS} openssl/evp.h openssl/opensslconf.h \ - ${DESTDIR}/usr/include/openssl - ln -fs openssl/des.h ${DESTDIR}/usr/include/des.h +INCS= ${HDRS} openssl/evp.h openssl/opensslconf.h +INCSDIR= /usr/include/openssl +INCSLINKS= openssl/des.h ${INCLUDEDIR}/des.h afterinstall: .if !defined(NOPIC) diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/Makefile.inc index ec09438..352d915 100644 --- a/secure/lib/libcrypto/Makefile.inc +++ b/secure/lib/libcrypto/Makefile.inc @@ -29,10 +29,6 @@ HDRS= asn1/asn1.h asn1/asn1_mac.h bio/bio.h bf/blowfish.h bn/bn.h \ HDRS+= idea/idea.h .endif -.for h in ${HDRS} -CRYPTO_HDRS+= ${LCRYPTO_SRC}/${h} -.endfor - SRCS+= buildinf.h openssl/opensslconf.h openssl/evp.h CLEANFILES+= buildinf.h openssl/opensslconf.h openssl/evp.h CLEANDIRS+= openssl @@ -46,17 +42,16 @@ buildinf.h: echo "#endif" ) > ${.TARGET} # XXX: The openssl/ dependencies are not correct, in that a change in -# any of ${CRYPTO_HDRS} ${EXTRA_HDRS} will no repopulate openssl/. +# any of ${HDRS} ${EXTRA_HDRS} will no repopulate openssl/. # This deficiency will be fixed in a later commit. -.ORDER: openssl/opensslconf.h openssl/evp.h - openssl/opensslconf.h: ../libcrypto/opensslconf-${MACHINE_ARCH}.h mkdir -p openssl cp ${.OODATE} ${.TARGET} - ${INSTALL} -C -m 444 ${CRYPTO_HDRS} ${EXTRA_HDRS} openssl + ${INSTALL} -C -m 444 ${HDRS:S;^;${LCRYPTO_SRC}/;} ${EXTRA_HDRS} openssl openssl/evp.h: ${LCRYPTO_SRC}/evp/evp.h + mkdir -p openssl .if !defined(MAKE_IDEA) || ${MAKE_IDEA} != YES sed '/^#ifndef NO_IDEA$$/,/^#endif$$/d' ${.OODATE} > ${.TARGET} .else diff --git a/secure/lib/libssl/Makefile b/secure/lib/libssl/Makefile index daf4a4f..9fbaf33 100644 --- a/secure/lib/libssl/Makefile +++ b/secure/lib/libssl/Makefile @@ -18,18 +18,8 @@ SRCS+= bio_ssl.c s23_clnt.c s23_lib.c s23_meth.c s23_pkt.c s23_srvr.c \ ssl_err.c ssl_err2.c ssl_lib.c ssl_rsa.c ssl_sess.c ssl_stat.c \ ssl_txt.c t1_clnt.c t1_enc.c t1_lib.c t1_meth.c t1_srvr.o \ -HDRS= ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h - -.for h in ${HDRS} -CRYPTO_HDRS+= ${LCRYPTOSSL_SRC}/${h} -.endfor - -.for h in ${HDRS} -SSL_HDRS+= ${LCRYPTOSSL_SRC}/${h} -.endfor - -beforeinstall: openssl/opensslconf.h openssl/evp.h - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${SSL_HDRS} ${DESTDIR}/usr/include/openssl +INCS= ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h +INCSDIR=${INCLUDEDIR}/openssl +HDRS+= ${INCS:S;^;../ssl/;} .include <bsd.lib.mk> diff --git a/secure/lib/libtelnet/Makefile b/secure/lib/libtelnet/Makefile index b964e16..1e0fb0c 100644 --- a/secure/lib/libtelnet/Makefile +++ b/secure/lib/libtelnet/Makefile @@ -15,7 +15,7 @@ CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DSRA \ WARNS?= 2 INCS= ${TELNETDIR}/arpa/telnet.h -INCDIR= /usr/include/arpa +INCSDIR= ${INCLUDEDIR}/arpa .include <bsd.lib.mk> diff --git a/share/mk/Makefile b/share/mk/Makefile index 87cafe7..9dd75ce 100644 --- a/share/mk/Makefile +++ b/share/mk/Makefile @@ -2,7 +2,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/8/93 FILES= bsd.README -FILES+= bsd.cpu.mk bsd.dep.mk bsd.doc.mk bsd.info.mk bsd.init.mk +FILES+= bsd.cpu.mk bsd.dep.mk bsd.doc.mk bsd.info.mk bsd.incs.mk bsd.init.mk FILES+= bsd.kern.mk bsd.kmod.mk FILES+= bsd.lib.mk bsd.libnames.mk bsd.man.mk bsd.nls.mk bsd.obj.mk bsd.own.mk FILES+= bsd.port.mk bsd.port.post.mk bsd.port.pre.mk bsd.port.subdir.mk diff --git a/share/mk/bsd.incs.mk b/share/mk/bsd.incs.mk new file mode 100644 index 0000000..c619590 --- /dev/null +++ b/share/mk/bsd.incs.mk @@ -0,0 +1,81 @@ +# $FreeBSD$ + +.if !target(__<bsd.init.mk>__) +.error bsd.incs.mk cannot be included directly. +.endif + +INCSGROUPS?= INCS + +.if !target(includes) +.for group in ${INCSGROUPS} +includes: ${${group}} +.endfor +.endif + +_incsinstall: .USE + +.if !target(incsinstall) +incsinstall: _incsinstall +.endif + +.for group in ${INCSGROUPS} +.if defined(${group}) && !empty(${group}) + +all: ${${group}} + +${group}OWN?= ${BINOWN} +${group}GRP?= ${BINGRP} +${group}MODE?= ${NOBINMODE} +${group}DIR?= ${INCLUDEDIR} + +_${group}INCS= +.for header in ${${group}} +.if defined(${group}OWN_${header:T}) || defined(${group}GRP_${header:T}) || \ + defined(${group}MODE_${header:T}) || defined(${group}DIR_${header:T}) || \ + defined(${group}NAME_${header:T}) +${group}OWN_${header:T}?= ${${group}OWN} +${group}GRP_${header:T}?= ${${group}GRP} +${group}MODE_${header:T}?= ${${group}MODE} +${group}DIR_${header:T}?= ${${group}DIR} +.if defined(${group}NAME) +${group}NAME_${header:T}?= ${${group}NAME} +.else +${group}NAME_${header:T}?= ${header:T} +.endif +_incsinstall: _${group}INS_${header:T} +_${group}INS_${header:T}: ${header} + ${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \ + -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ + ${.ALLSRC} \ + ${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}} +.else +_${group}INCS+= ${header} +.endif +.endfor +.if !empty(_${group}INCS) +_incsinstall: _${group}INS +_${group}INS: ${_${group}INCS} +.if defined(${group}NAME) + ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ + ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME} +.else + ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ + ${.ALLSRC} ${DESTDIR}${${group}DIR} +.endif +.endif + +.endif defined(${group}) && !empty(${group}) +.endfor + +.if defined(INCSLINKS) && !empty(INCSLINKS) +_incsinstall: + @set ${INCSLINKS}; \ + while test $$# -ge 2; do \ + l=$$1; \ + shift; \ + t=${DESTDIR}$$1; \ + shift; \ + ${ECHO} $$t -\> $$l; \ + ln -fs $$l $$t; \ + done; true +.endif diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index 4272ec8..a007f59 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -271,18 +271,6 @@ _EXTRADEPEND: .endif .if !target(install) -.if !target(beforeinstall) -beforeinstall: _includeinstall -.endif - -_includeinstall: -.if defined(INCS) -.for header in ${INCS} - cd ${.CURDIR} && \ - ${INSTALL} -C -o ${INCOWN} -g ${INCGRP} -m ${INCMODE} \ - ${header} ${DESTDIR}${INCDIR} -.endfor -.endif .if defined(PRECIOUSLIB) && !defined(NOFSCHG) SHLINSTALLFLAGS+= -fschg @@ -297,7 +285,6 @@ _SHLINSTALLFLAGS:= ${SHLINSTALLFLAGS} _SHLINSTALLFLAGS:= ${_SHLINSTALLFLAGS${ie}} .endfor -realinstall: beforeinstall realinstall: _libinstall _libinstall: .if !defined(INTERNALLIB) @@ -320,6 +307,12 @@ _libinstall: ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${LIBDIR} .endif +.if defined(WANT_LINT) && defined(LIB) && defined(LINTOBJS) && !empty(LINTOBJS) + ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + ${_INSTALLFLAGS} ${LINTLIB} ${DESTDIR}${LINTLIBDIR} +.endif + +realinstall: .if defined(LINKS) && !empty(LINKS) @set ${LINKS}; \ while test $$# -ge 2; do \ @@ -342,17 +335,13 @@ _libinstall: ln -fs $$l $$t; \ done; true .endif -.if defined(WANT_LINT) && defined(LIB) && defined(LINTOBJS) && !empty(LINTOBJS) - ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${_INSTALLFLAGS} ${LINTLIB} ${DESTDIR}${LINTLIBDIR} -.endif + +realinstall: _incsinstall .if !defined(NOMAN) realinstall: _maninstall .endif -install: afterinstall -afterinstall: realinstall .endif .if !target(lint) @@ -360,6 +349,8 @@ lint: ${SRCS:M*.c} ${LINT} ${LINTOBJFLAGS} ${CFLAGS:M-[DIU]*} ${.ALLSRC} .endif +.include <bsd.incs.mk> + .if !defined(NOMAN) .include <bsd.man.mk> .endif diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 3b39b4e..6d80dfe 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -39,14 +39,6 @@ # # NOBINMODE Mode for non-executable files. [444] # -# INCOWN Include owner. [root] -# -# INCGRP Include group. [wheel] -# -# INCMODE Include mode. [444] -# -# INCDIR Base path for include files. [/usr/include] -# # LIBDIR Base path for libraries. [/usr/lib] # # LIBCOMPATDIR Base path for compat libraries. [/usr/lib/compat] @@ -133,11 +125,6 @@ BINGRP?= wheel BINMODE?= 555 NOBINMODE?= 444 -INCOWN?= root -INCGRP?= wheel -INCMODE?= 444 -INCDIR?= /usr/include - KMODDIR?= /boot/kernel KMODOWN?= ${BINOWN} KMODGRP?= ${BINGRP} diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index 0a5fcc7..83f57a5 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -94,9 +94,6 @@ _EXTRADEPEND: .endif .if !target(install) -.if !target(beforeinstall) -beforeinstall: -.endif _INSTALLFLAGS:= ${INSTALLFLAGS} .for ie in ${INSTALLFLAGS_EDIT} @@ -144,7 +141,6 @@ realinstall: done; true .endif .endif !target(realinstall) -realinstall: beforeinstall .if defined(SCRIPTS) && !empty(SCRIPTS) realinstall: _scriptsinstall @@ -200,12 +196,12 @@ _FILESINS_${file:T}: ${file} .endfor .endif +realinstall: _incsinstall + .if !defined(NOMAN) realinstall: _maninstall .endif -install: afterinstall -afterinstall: realinstall .endif .if !target(lint) @@ -229,6 +225,8 @@ tags: ${SRCS} .endif .endif +.include <bsd.incs.mk> + .if !defined(NOMAN) .include <bsd.man.mk> .endif diff --git a/share/mk/bsd.subdir.mk b/share/mk/bsd.subdir.mk index 1043802..9a6d466 100644 --- a/share/mk/bsd.subdir.mk +++ b/share/mk/bsd.subdir.mk @@ -58,7 +58,7 @@ ${SUBDIR}:: .for __target in all all-man checkdpadd clean cleandepend cleandir \ - depend distribute lint maninstall \ + depend distribute includes incsinstall lint maninstall \ obj objlink realinstall regress tags ${__target}: _SUBDIR .endfor diff --git a/usr.bin/lex/Makefile b/usr.bin/lex/Makefile index 9abc03f..479cda5 100644 --- a/usr.bin/lex/Makefile +++ b/usr.bin/lex/Makefile @@ -18,6 +18,8 @@ SRCS= scan.c ccl.c dfa.c ecs.c gen.c main.c misc.c nfa.c parse.y \ skel.c sym.c tblcmp.c yylex.c LFLAGS+= -is CFLAGS+= -I. -I${.CURDIR} +INCS= FlexLexer.h +INCSDIR= ${INCLUDEDIR}/g++ MLINKS+= lex.1 flex.1 MLINKS+= lex.1 flex++.1 MLINKS+= lex.1 lex++.1 @@ -29,10 +31,6 @@ SUBDIR= lib skel.c: mkskel.sh flex.skl sh ${.CURDIR}/mkskel.sh ${.CURDIR}/flex.skl > skel.c -beforeinstall: - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.CURDIR}/FlexLexer.h ${DESTDIR}/usr/include/g++ - bootstrap: initscan.c @cmp -s ${.CURDIR}/initscan.c scan.c || { \ echo "Bootstrapping flex" ; \ |
