Index: stable/4/gnu/lib/csu/Makefile =================================================================== --- stable/4/gnu/lib/csu/Makefile (revision 100376) +++ stable/4/gnu/lib/csu/Makefile (revision 100377) @@ -1,76 +1,74 @@ # $FreeBSD$ GCCDIR= ${.CURDIR}/../../../contrib/gcc .if ${MACHINE_ARCH} == "alpha" .PATH: ${GCCDIR}/config/alpha SRCS= crtbegin.s crtend.s UGLYHACK= -x assembler .else .PATH: ${GCCDIR} SRCS= crtstuff.c tm.h .endif OBJS= crtbegin.o crtend.o SOBJS= crtbegin.So crtend.So CFLAGS+= -I${GCCDIR}/config -I. -DIN_GCC \ -finhibit-size-directive -fno-inline-functions \ -fno-exceptions -fno-omit-frame-pointer -NOMAN= true -NOPIC= true -NOPROFILE= true -INTERNALLIB= true CLEANFILES+= tm.h CRTS_CFLAGS= -DCRTSTUFFS_O ${PICFLAG} all: ${OBJS} ${SOBJS} + +CLEANFILES+= ${OBJS} ${SOBJS} .if ${MACHINE_ARCH} == "alpha" crtbegin.o crtbegin.So: crtbegin.s crtend.o crtend.So: crtend.s .for PART in begin end CLEANFILES+= crt${PART}.s crt${PART}.s: crt${PART}.asm ln -sf ${.ALLSRC} ${.TARGET} .endfor .else crtbegin.o crtbegin.So crtend.o crtend.So: ${SRCS} .endif crtbegin.o: ${CC} ${CFLAGS} -g0 -DCRT_BEGIN \ -c -o ${.TARGET} ${UGLYHACK} ${.ALLSRC:N*.h} crtbegin.So: ${CC} ${CFLAGS} -g0 -DCRT_BEGIN ${CRTS_CFLAGS} \ -c -o ${.TARGET} ${UGLYHACK} ${.ALLSRC:N*.h} crtend.o: ${CC} ${CFLAGS} -g0 -DCRT_END \ -c -o ${.TARGET} ${UGLYHACK} ${.ALLSRC:N*.h} crtend.So: ${CC} ${CFLAGS} -g0 -DCRT_END ${CRTS_CFLAGS} \ -c -o ${.TARGET} ${UGLYHACK} ${.ALLSRC:N*.h} CLEANFILES+= tm.h # KEEP THIS IN SYNC with src/gnu/usr.bin/cc/cc_tools/Makefile !! tm.h: echo '#include "${MACHINE_ARCH}/${MACHINE_ARCH}.h"' > ${.TARGET} .if ${MACHINE_ARCH} == "i386" echo '#include "${MACHINE_ARCH}/att.h"' >> ${.TARGET} .endif echo '#include ' >> ${.TARGET} echo '#include "${MACHINE_ARCH}/freebsd.h"' >> ${.TARGET} .if ${MACHINE_ARCH} == "i386" echo '#include "${MACHINE_ARCH}/perform.h"' >> ${.TARGET} .endif realinstall: .for file in ${OBJS} ${SOBJS} ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${file} ${DESTDIR}${LIBDIR}/${file:S/.So$/S.o/} .endfor .include Index: stable/4/gnu/libexec/uucp/libunix/Makefile =================================================================== --- stable/4/gnu/libexec/uucp/libunix/Makefile (revision 100376) +++ stable/4/gnu/libexec/uucp/libunix/Makefile (revision 100377) @@ -1,23 +1,19 @@ # This subdirectory contains Unix specific support functions. # $FreeBSD$ LIB= unix +INTERNALLIB= YES SRCS = access.c addbas.c app3.c app4.c basnam.c bytfre.c corrup.c \ chmod.c cohtty.c cusub.c cwd.c detach.c efopen.c epopen.c \ exists.c failed.c filnam.c fsusg.c indir.c init.c isdir.c \ isfork.c iswait.c jobid.c lcksys.c link.c locfil.c lock.c \ loctim.c mail.c mkdirs.c mode.c move.c opensr.c pause.c \ picksb.c pipe.c portnm.c priv.c proctm.c recep.c run.c seq.c \ serial.c signal.c sindir.c size.c sleep.c spawn.c splcmd.c \ splnam.c spool.c srmdir.c statsb.c status.c sync.c tcp.c \ time.c tli.c tmpfil.c trunc.c uacces.c ufopen.c uid.c ultspl.c \ unknwn.c uuto.c walk.c wldcrd.c work.c xqtfil.c xqtsub.c ftw.c CFLAGS+= -I$(.CURDIR)/../common_sources \ -DOWNER=\"$(owner)\" -DSBINDIR=\"$(libxdir)\" - -NOMAN= noman -NOPROFILE= noprofile - -install: .include Index: stable/4/gnu/libexec/uucp/libuuconf/Makefile =================================================================== --- stable/4/gnu/libexec/uucp/libuuconf/Makefile (revision 100376) +++ stable/4/gnu/libexec/uucp/libuuconf/Makefile (revision 100377) @@ -1,27 +1,23 @@ # This is the Makefile for the Taylor UUCP uuconf library # $FreeBSD$ LIB= uuconf +INTERNALLIB= YES SRCS = addblk.c addstr.c allblk.c alloc.c base.c bool.c callin.c \ calout.c chatc.c cmdarg.c cmdfil.c cmdlin.c debfil.c deblev.c \ diacod.c dial.c diasub.c dnams.c errno.c errstr.c filnam.c \ freblk.c fredia.c free.c freprt.c fresys.c grdcmp.c hdial.c \ hdnams.c hinit.c hlocnm.c hport.c hrmunk.c hsinfo.c hsnams.c \ hsys.c hunk.c iniglb.c init.c int.c lckdir.c lineno.c llocnm.c \ local.c locnm.c logfil.c maxuxq.c mrgblk.c paramc.c port.c \ prtsub.c pubdir.c rdlocs.c rdperm.c reliab.c remunk.c runuxq.c \ sinfo.c snams.c split.c spool.c stafil.c strip.c syssub.c \ tcalou.c tdial.c tdialc.c tdnams.c tgcmp.c thread.c time.c \ tinit.c tlocnm.c tport.c tportc.c tsinfo.c tsnams.c tsys.c \ tval.c ugtlin.c unk.c val.c vinit.c vport.c vsinfo.c vsnams.c \ vsys.c CFLAGS+= -I$(.CURDIR)/../common_sources \ -DNEWCONFIGLIB=\"$(newconfigdir)\"\ -DOLDCONFIGLIB=\"$(oldconfigdir)\" - -NOMAN= noman -NOPROFILE= noprofile - -install: .include Index: stable/4/gnu/libexec/uucp/libuucp/Makefile =================================================================== --- stable/4/gnu/libexec/uucp/libuucp/Makefile (revision 100376) +++ stable/4/gnu/libexec/uucp/libuucp/Makefile (revision 100377) @@ -1,15 +1,11 @@ # This is the Makefile for the libuucp subdirectory of Taylor UUCP # $FreeBSD$ LIB= uucp +INTERNALLIB= YES SRCS = buffer.c crc.c debug.c escape.c getopt.c getop1.c parse.c spool.c \ status.c xfree.c xmall.c xreall.c \ getlin.c CFLAGS+= -I$(.CURDIR)/../common_sources - -NOMAN= noman -NOPROFILE= noprofile - -install: .include Index: stable/4/gnu/usr.bin/binutils/libbfd/Makefile =================================================================== --- stable/4/gnu/usr.bin/binutils/libbfd/Makefile (revision 100376) +++ stable/4/gnu/usr.bin/binutils/libbfd/Makefile (revision 100377) @@ -1,59 +1,56 @@ # # $FreeBSD$ # .include "../Makefile.inc0" .PATH: ${SRCDIR}/bfd ${SRCDIR}/opcodes LIB= bfd SRCS+= archive.c archures.c bfd.c binary.c cache.c \ coffgen.c corefile.c elf.c format.c hash.c ihex.c \ init.c libbfd.c linker.c opncls.c reloc.c section.c \ srec.c stab-syms.c stabs.c syms.c targets.c tekhex.c \ targmatch.h dwarf1.c dwarf2.c CFLAGS+= -I${SRCDIR}/bfd CFLAGS+= -DBFD_VERSION=\"${VERSION}\" -NOPROFILE= true -NOPIC= true INTERNALLIB= true -INTERNALSTATICLIB=true CLEANFILES+= targmatch.h # If set, BINUTILSDISTDIR is the path to a directory containing the full GNU # binutils release. FreeBSD only distributes the bits that are required to # build native architectures. BINUTILSDISTDIR is needed to build cross tools. .if defined(BINUTILSDISTDIR) && exists(${BINUTILSDISTDIR}) .PATH: ${BINUTILSDISTDIR}/bfd ${BINUTILSDISTDIR}/opcodes CFLAGS+= -I${BINUTILSDISTDIR}/bfd CFLAGS+= -I${BINUTILSDISTDIR}/include .endif SELARCH= .if ${BINUTIL_ARCH} == "sparc64" SELARCH=&bfd_sparc_arch .else .for _a in ${ARCHS} .if ${SELARCH} == "" SELARCH+=&bfd_${_a}_arch .else SELARCH+=,&bfd_${_a}_arch .endif .endfor .endif CFLAGS+= -DSELECT_ARCHITECTURES="${SELARCH}" SELVEC= .for _v in ${VECS} .if ${SELVEC} == "" SELVEC+=&${_v} .else SELVEC+=,&${_v} .endif .endfor CFLAGS+= -DSELECT_VECS="${SELVEC}" targmatch.h: targmatch.sed config.bfd sed -f ${.ALLSRC:M*.sed} ${.ALLSRC:M*.bfd} > ${.TARGET} .include Index: stable/4/gnu/usr.bin/binutils/libbinutils/Makefile =================================================================== --- stable/4/gnu/usr.bin/binutils/libbinutils/Makefile (revision 100376) +++ stable/4/gnu/usr.bin/binutils/libbinutils/Makefile (revision 100377) @@ -1,22 +1,19 @@ # # $FreeBSD$ # .include "../Makefile.inc0" .PATH: ${SRCDIR}/binutils LIB= binutils SRCS+= arlex.l arparse.y arsup.c bucomm.c debug.c filemode.c \ ieee.c rdcoff.c rddbg.c rename.c stabs.c unwind-ia64.c \ wrstabs.c version.c CFLAGS+= -DTARGET=\"${TARGET_ARCH}-unknown-freebsd\" CFLAGS+= -DVERSION=\"${VERSION}\" CFLAGS+= -I${SRCDIR}/binutils CFLAGS+= -I${SRCDIR}/bfd -NOPROFILE= true -NOPIC= true INTERNALLIB= true -INTERNALSTATICLIB=true .include Index: stable/4/gnu/usr.bin/binutils/libiberty/Makefile =================================================================== --- stable/4/gnu/usr.bin/binutils/libiberty/Makefile (revision 100376) +++ stable/4/gnu/usr.bin/binutils/libiberty/Makefile (revision 100377) @@ -1,22 +1,19 @@ # $FreeBSD$ .include "../Makefile.inc0" .PATH: ${SRCDIR}/libiberty LIB= iberty SRCS= argv.c choose-temp.c concat.c cp-demangle.c cplus-dem.c \ dyn-string.c getopt.c getopt1.c getpwd.c getruntime.c \ hex.c floatformat.c lbasename.c objalloc.c obstack.c safe-ctype.c \ xatexit.c xexit.c xmalloc.c \ xstrdup.c xstrerror.c .if defined(BOOTSTRAPPING) SRCS+= basename.c .endif CFLAGS+= -DHAVE_CONFIG_H -NOPROFILE= true -NOPIC= true INTERNALLIB= true -INTERNALSTATICLIB=true .include Index: stable/4/gnu/usr.bin/binutils/libopcodes/Makefile =================================================================== --- stable/4/gnu/usr.bin/binutils/libopcodes/Makefile (revision 100376) +++ stable/4/gnu/usr.bin/binutils/libopcodes/Makefile (revision 100377) @@ -1,26 +1,23 @@ # # $FreeBSD$ # .include "../Makefile.inc0" .PATH: ${SRCDIR}/opcodes LIB= opcodes SRCS+= dis-buf.c disassemble.c CFLAGS+= -I${SRCDIR}/opcodes -I${SRCDIR}/bfd -NOPROFILE= true -NOPIC= true INTERNALLIB= true -INTERNALSTATICLIB=true # If set, BINUTILSDISTDIR is the path to a directory containing the full GNU # binutils release. FreeBSD only distributes the bits that are required to # build native architectures. BINUTILSDISTDIR is needed to build cross tools. .if defined(BINUTILSDISTDIR) && exists(${BINUTILSDISTDIR}) .PATH: ${BINUTILSDISTDIR}/bfd ${BINUTILSDISTDIR}/opcodes CFLAGS+= -I${BINUTILSDISTDIR}/opcodes -I${BINUTILSDISTDIR}/bfd CFLAGS+= -I${BINUTILSDISTDIR}/include .endif .include Index: stable/4/gnu/usr.bin/cc/cc_drv/Makefile =================================================================== --- stable/4/gnu/usr.bin/cc/cc_drv/Makefile (revision 100376) +++ stable/4/gnu/usr.bin/cc/cc_drv/Makefile (revision 100377) @@ -1,20 +1,16 @@ # $FreeBSD$ .include "../Makefile.inc" .PATH: ../cc_tools ${GCCDIR} LIB= cc_drv -NOPROFILE= YES -NOPIC= YES +INTERNALLIB= YES SRCS= multilib.h choose-temp.c obstack.c prefix.c pexecute.c version.c CFLAGS+= -DIN_GCC - -install: - @true ${OUT_OBJ}.o ${OUT_OBJ}.so: ${OUT_FILE} .include Index: stable/4/gnu/usr.bin/cc/cc_fbsd/Makefile =================================================================== --- stable/4/gnu/usr.bin/cc/cc_fbsd/Makefile (revision 100376) +++ stable/4/gnu/usr.bin/cc/cc_fbsd/Makefile (revision 100377) @@ -1,18 +1,14 @@ # $FreeBSD$ LIBCDIR= ${.CURDIR}/../../../../lib/libc .PATH: ${LIBCDIR}/gen ${LIBCDIR}/stdio LIB= cc_fbsd -NOPROFILE= YES -NOPIC= YES +INTERNALLIB= YES SRCS= getobjformat.c mktemp.c CFLAGS+= -D_open=open - -install: - @true .include Index: stable/4/gnu/usr.bin/cc/cc_int/Makefile =================================================================== --- stable/4/gnu/usr.bin/cc/cc_int/Makefile (revision 100376) +++ stable/4/gnu/usr.bin/cc/cc_int/Makefile (revision 100377) @@ -1,51 +1,47 @@ # $FreeBSD$ .include "../Makefile.inc" .PATH: ../cc_tools ${GCCDIR}/config/${TARGET_ARCH} ${GCCDIR} LIB= cc_int -NOPROFILE= YES -NOPIC= YES +INTERNALLIB= YES SRCS= c-aux-info.c c-common.c c-convert.c c-iterate.c \ c-pragma.c c-typeck.c \ caller-save.c calls.c combine.c convert.c cse.c \ dbxout.c dwarfout.c emit-rtl.c explow.c expmed.c expr.c \ final.c flow.c fold-const.c function.c getpwd.c global.c graph.c \ hash.c \ integrate.c jump.c lcm.c local-alloc.c loop.c optabs.c \ print-rtl.c print-tree.c real.c recog.c reg-stack.c regclass.c \ reload.c reload1.c reorg.c rtl.c rtlanal.c \ sbitmap.c sdbout.c stmt.c stor-layout.c stupid.c \ toplev.c tree.c unroll.c varasm.c version.c xcoffout.c \ alias.c bitmap.c dwarf2out.c dyn-string.c except.c \ gcse.c genrtl.c profile.c regmove.c varray.c \ ${TARGET_ARCH}.c .if defined(USE_EGCS_HAIFA) && ${USE_EGCS_HAIFA} == 1 SRCS+= haifa-sched.c .else SRCS+= sched.c .endif # insn-* gunk -- headers are built in cc_tools, as they are used by the # "build-tools" .for F in attrtab emit extract opinit output peep recog SRCS+= insn-$F.c CLEANFILES+= insn-$F.c insn-$F.c: ${.OBJDIR}/../cc_tools/gen$F ${MD_FILE} ${.OBJDIR}/../cc_tools/gen$F ${MD_FILE} > insn-$F.c .endfor # shared between the drivers SRCS+= multilib.h choose-temp.c obstack.c prefix.c pexecute.c version.c # stuff that makes libiberty now required (2.95) and shouldn't be... SRCS+= obstack.c splay-tree.c CFLAGS+= -DTARGET_NAME=\"${target}\" -DIN_GCC - -install: - @true .include Index: stable/4/gnu/usr.bin/cvs/lib/Makefile =================================================================== --- stable/4/gnu/usr.bin/cvs/lib/Makefile (revision 100376) +++ stable/4/gnu/usr.bin/cvs/lib/Makefile (revision 100377) @@ -1,27 +1,22 @@ # $FreeBSD$ MAINTAINER= peter@FreeBSD.org .include "${.CURDIR}/../Makefile.inc" .PATH: ${CVSDIR}/src .PATH: ${CVSDIR}/lib .PATH: ${CVSDIR}/man LIB= cvs +INTERNALLIB= YES -NOPROFILE= yes -NOPIC= yes - CFLAGS+= -I${.CURDIR} -I${CVSDIR}/src -DHAVE_CONFIG_H YFLAGS= SRCS= argmatch.c getdate.y getline.c \ getopt.c getopt1.c savecwd.c \ sighandle.c stripslash.c \ xgetwd.c yesno.c - -install: - @echo -n .include Index: stable/4/gnu/usr.bin/cvs/libdiff/Makefile =================================================================== --- stable/4/gnu/usr.bin/cvs/libdiff/Makefile (revision 100376) +++ stable/4/gnu/usr.bin/cvs/libdiff/Makefile (revision 100377) @@ -1,22 +1,17 @@ # $FreeBSD$ MAINTAINER= peter@FreeBSD.org .include "${.CURDIR}/../Makefile.inc" .PATH: ${CVSDIR}/diff LIB= diff +INTERNALLIB= YES -NOPROFILE= yes -NOPIC= yes - CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../lib -I${CVSDIR}/lib -DHAVE_CONFIG_H SRCS = diff.c diff3.c analyze.c cmpbuf.c cmpbuf.h io.c context.c ed.c \ normal.c ifdef.c util.c dir.c version.c diff.h side.c - -install: - @echo -n .include Index: stable/4/gnu/usr.bin/groff/src/libs/libbib/Makefile =================================================================== --- stable/4/gnu/usr.bin/groff/src/libs/libbib/Makefile (revision 100376) +++ stable/4/gnu/usr.bin/groff/src/libs/libbib/Makefile (revision 100377) @@ -1,8 +1,7 @@ # $FreeBSD$ LIB= bib INTERNALLIB= YES -INTERNALSTATICLIB=YES SRCS= common.cc index.cc linear.cc search.cc map.c .include Index: stable/4/gnu/usr.bin/groff/src/libs/libdriver/Makefile =================================================================== --- stable/4/gnu/usr.bin/groff/src/libs/libdriver/Makefile (revision 100376) +++ stable/4/gnu/usr.bin/groff/src/libs/libdriver/Makefile (revision 100377) @@ -1,8 +1,7 @@ # $FreeBSD$ LIB= driver INTERNALLIB= YES -INTERNALSTATICLIB=YES SRCS= input.cc printer.cc .include Index: stable/4/gnu/usr.bin/groff/src/libs/libgroff/Makefile =================================================================== --- stable/4/gnu/usr.bin/groff/src/libs/libgroff/Makefile (revision 100376) +++ stable/4/gnu/usr.bin/groff/src/libs/libgroff/Makefile (revision 100377) @@ -1,22 +1,21 @@ # $FreeBSD$ LIB= groff INTERNALLIB= YES -INTERNALSTATICLIB=YES SRCS= assert.cc change_lf.cc cmap.cc cset.cc device.cc errarg.cc\ error.cc fatal.cc filename.cc font.cc fontfile.cc\ htmlindicate.cc lf.cc lineno.cc macropath.cc\ maxfilename.cc nametoindex.cc new.cc prime.cc\ progname.cc ptable.cc searchpath.cc string.cc strsave.cc\ tmpfile.cc illegal.cc version.cc SRCS+= getopt.c getopt1.c iftoa.c itoa.c matherr.c CLEANFILES= version.cc .include version.cc: ${GROFF_DIST}/VERSION ${GROFF_DIST}/REVISION @${ECHO} Making version.cc @echo const char \*version_string = \"`cat ${GROFF_DIST}/VERSION`\"\; >$@ @echo const char \*revision_string = \"`cat ${GROFF_DIST}/REVISION`\"\; >>$@ @echo extern \"C\" const char \*Version_string = \"`cat ${GROFF_DIST}/VERSION`.`cat ${GROFF_DIST}/REVISION`\"\; | \ sed -e 's/\.0\"/\"/' >>$@ Index: stable/4/gnu/usr.bin/man/lib/Makefile =================================================================== --- stable/4/gnu/usr.bin/man/lib/Makefile (revision 100376) +++ stable/4/gnu/usr.bin/man/lib/Makefile (revision 100377) @@ -1,26 +1,27 @@ +# $FreeBSD$ + LIB= man INTERNALLIB= true -INTERNALSTATICLIB= true CFLAGS+= -DSTDC_HEADERS CLEANFILES+= config.h SRCS= gripes.c util.c # Kludge to create config.h for other modules. The library itself doesn't # depend on config.h. SRCS+= config.h config.h: ${.CURDIR}/config.h_dist ${.CURDIR}/../Makefile.inc sed -e 's,%apropos%,${apropos},' -e 's,%whatis%,${whatis},' \ -e 's,%pager%,${pager},' -e 's,%troff%,${troff},' \ -e 's,%nroff%,${nroff},' -e 's,%tbl%,${tbl},' \ -e 's,%col%,${col},' -e 's,%pic%,${pic},' \ -e 's,%eqn%,${eqn},' -e 's,%neqn%,${neqn},' \ -e 's,%vgrind%,${vgrind},' -e 's,%refer%,${refer},' \ -e 's,%grap%,${grap},' -e 's,%zcat%,${zcat},' \ -e 's,%manpath_config_file%,${manpath_config_file},' \ -e 's,%compress%,${compress},' \ -e 's,%compext%,${compext},' \ ${.CURDIR}/config.h_dist > ${.TARGET} .include Index: stable/4/gnu/usr.bin/rcs/lib/Makefile =================================================================== --- stable/4/gnu/usr.bin/rcs/lib/Makefile (revision 100376) +++ stable/4/gnu/usr.bin/rcs/lib/Makefile (revision 100377) @@ -1,14 +1,14 @@ +# $FreeBSD$ + # Define FSYNC_ALL to get slower but safer writes in case of crashes in # the middle of CVS/RCS changes #CFLAGS += -DFSYNC_ALL LIB = rcs SRCS = maketime.c partime.c rcsedit.c rcsfcmp.c rcsfnms.c rcsgen.c \ rcskeep.c rcskeys.c rcslex.c rcsmap.c rcsrev.c rcssyn.c rcstime.c \ rcsutil.c merger.c version.c -NOPROFILE= noprofile INTERNALLIB= true -INTERNALSTATICLIB= true .include Index: stable/4/gnu/usr.bin/texinfo/libtxi/Makefile =================================================================== --- stable/4/gnu/usr.bin/texinfo/libtxi/Makefile (revision 100376) +++ stable/4/gnu/usr.bin/texinfo/libtxi/Makefile (revision 100377) @@ -1,11 +1,10 @@ # $FreeBSD$ LIB= txi INTERNALLIB= true -INTERNALSTATICLIB= true SRCS= getopt.c getopt1.c substring.c xexit.c xmalloc.c xstrdup.c .include .PATH: ${TXIDIR}/lib Index: stable/4/kerberos5/lib/libkrb5/Makefile =================================================================== --- stable/4/kerberos5/lib/libkrb5/Makefile (revision 100376) +++ stable/4/kerberos5/lib/libkrb5/Makefile (revision 100377) @@ -1,157 +1,157 @@ # $FreeBSD$ LIB= krb5 CFLAGS+=-I${KRB5DIR}/lib/krb5 \ -I${KRB5DIR}/lib/asn1 \ -I${KRB5DIR}/lib/des \ -I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/include \ -I${KRB5OBJDIR} \ -I${ASN1OBJDIR} .if defined(MAKE_KERBEROS4) && \ (${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes") CFLAGS+=-I${KRB4DIR}/include .endif SRCS= \ acl.c \ add_et_list.c \ addr_families.c \ aname_to_localname.c \ appdefault.c \ asn1_glue.c \ auth_context.c \ build_ap_req.c \ build_auth.c \ cache.c \ changepw.c \ codec.c \ config_file.c \ config_file_netinfo.c \ convert_creds.c \ constants.c \ context.c \ copy_host_realm.c \ crc.c \ creds.c \ crypto.c \ data.c \ eai_to_heim_errno.c \ error_string.c \ expand_hostname.c \ fcache.c \ free.c \ free_host_realm.c \ generate_seq_number.c \ generate_subkey.c \ get_addrs.c \ get_cred.c \ get_default_principal.c \ get_default_realm.c \ get_for_creds.c \ get_host_realm.c \ get_in_tkt.c \ get_in_tkt_pw.c \ get_in_tkt_with_keytab.c \ get_in_tkt_with_skey.c \ get_port.c \ init_creds.c \ init_creds_pw.c \ keyblock.c \ keytab.c \ keytab_any.c \ keytab_file.c \ keytab_memory.c \ keytab_keyfile.c \ keytab_krb4.c \ krbhst.c \ kuserok.c \ log.c \ mcache.c \ misc.c \ mk_error.c \ mk_priv.c \ mk_rep.c \ mk_req.c \ mk_req_ext.c \ mk_safe.c \ net_read.c \ net_write.c \ n-fold.c \ padata.c \ principal.c \ prog_setup.c \ prompter_posix.c \ rd_cred.c \ rd_error.c \ rd_priv.c \ rd_rep.c \ rd_req.c \ rd_safe.c \ read_message.c \ recvauth.c \ replay.c \ send_to_kdc.c \ sendauth.c \ set_default_realm.c \ sock_principal.c \ store.c \ store_emem.c \ store_fd.c \ store_mem.c \ ticket.c \ time.c \ transited.c \ verify_init.c \ verify_user.c \ version.c \ warn.c \ write_message.c \ krb5_err.c \ k524_err.c \ k524_err.h \ 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 -MAN3= \ +MAN= \ krb5.3 \ krb5_425_conv_principal.3 \ krb5_appdefault.3 \ krb5_auth_context.3 \ krb5_build_principal.3 \ krb5_config.3 \ krb5_context.3 \ krb5_create_checksum.3 \ krb5_crypto_init.3 \ krb5_encrypt.3 \ krb5_free_addresses.3 \ krb5_free_principal.3 \ krb5_get_all_client_addrs.3 \ krb5_get_krbhst.3 \ krb5_init_context.3 \ krb5_keytab.3 \ krb5_krbhst_init.3 \ krb5_openlog.3 \ krb5_parse_name.3 \ krb5_principal_get_realm.3 \ krb5_sname_to_principal.3 \ krb5_timeofday.3 \ krb5_unparse_name.3 \ krb5_verify_user.3 \ krb5_warn.3 -MAN5= \ +MAN+= \ krb5.conf.5 -MAN8= \ +MAN+= \ kerberos.8 \ verify_krb5_conf.8 .include .PATH: ${KRB5DIR}/lib/krb5 .PATH: ${KRB5DIR}/lib/des beforedepend all: asn1_err.h krb5_err.h k524_err.h Index: stable/4/kerberos5/lib/libsl/Makefile =================================================================== --- stable/4/kerberos5/lib/libsl/Makefile (revision 100376) +++ stable/4/kerberos5/lib/libsl/Makefile (revision 100377) @@ -1,20 +1,16 @@ # $FreeBSD$ LIB= sl CFLAGS+=-I${KRB5DIR}/lib/sl \ -I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/include \ -I${.OBJDIR} SRCS= sl.c roken.h -NOPIC= yes - -install: - -beforeinstall: +INTERNALLIB= yes .include .PATH: ${KRB5DIR}/lib/sl build-tools: make-roken Index: stable/4/kerberos5/lib/libtelnet/Makefile =================================================================== --- stable/4/kerberos5/lib/libtelnet/Makefile (revision 100376) +++ stable/4/kerberos5/lib/libtelnet/Makefile (revision 100377) @@ -1,39 +1,37 @@ # $FreeBSD$ LIB= telnet INTERNALLIB= yes -INTERNALSTATICLIB=yes -NOPIC= yes SRCS= genget.c getent.c misc.c encrypt.c auth.c \ enc_des.c sra.c pk.c .if defined(MAKE_KERBEROS4) SRCS+= kerberos.c CFLAGS+= -DKRB4 -I${KRB4DIR}/lib/krb .endif SRCS+= kerberos5.c #WARNS?= 2 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 .include .PATH: ${TELNETDIR}/libtelnet # # Remove obsolete shared libraries, if any. We don't bother moving them # to /usr/lib/compat, since they were only used by telnet, telnetd and # tn3270. # beforeinstall: __remove-stale-libs __remove-stale-libs: .PHONY .if exists(${DESTDIR}${SHLIBDIR}/lib${LIB}.so.2.0) -chflags noschg ${DESTDIR}${SHLIBDIR}/lib${LIB}.so.2.0 rm -f ${DESTDIR}${SHLIBDIR}/lib${LIB}.so.2.0 .endif Index: stable/4/kerberos5/lib/libvers/Makefile =================================================================== --- stable/4/kerberos5/lib/libvers/Makefile (revision 100376) +++ stable/4/kerberos5/lib/libvers/Makefile (revision 100377) @@ -1,34 +1,27 @@ # $FreeBSD$ LIB= vers +INTERNALLIB= YES CFLAGS+= -I${KRB5DIR}/include \ -I${ROKENOBJDIR} \ -I${KRB5DIR}/lib/roken \ -I${.OBJDIR} SRCS= \ print_version.c \ print_version.h -install: - -__initialized__: - -.include "../../Makefile.inc" - .include - -beforedepend all: print_version.h .PATH: ${KRB5DIR}/lib/vers build-tools: make-print-version print_version.h: make-print-version ./make-print-version print_version.h make-print-version: make-print-version.c ${CC} ${CFLAGS} -static -o ${.TARGET} ${.OODATE} CLEANFILES+= make-print-version print_version.h Index: stable/4/kerberosIV/lib/libroken/Makefile =================================================================== --- stable/4/kerberosIV/lib/libroken/Makefile (revision 100376) +++ stable/4/kerberosIV/lib/libroken/Makefile (revision 100377) @@ -1,32 +1,30 @@ # $FreeBSD$ LIB= roken +INTERNALLIB= YES CFLAGS+= -I${KRB4DIR}/include \ -I${INCLUDEOBJDIR} \ -I${KRB4DIR}/lib/roken \ -I${.OBJDIR} SRCS= base64.c concat.c emalloc.c eread.c erealloc.c estrdup.c \ ewrite.c get_default_username.c get_window_size.c getarg.c \ inaddr2str.c issuid.c k_getpwnam.c k_getpwuid.c mini_inetd.c \ net_read.c net_write.c parse_time.c parse_units.c \ print_version.c resolve.c roken_gethostby.c signal.c \ simple_exec.c snprintf.c socket.c strcollect.c tm2time.c \ verify.c warnerr.c copyhostent.c strlwr.c strndup.c \ strnlen.c strupr.c print_version.h -NOPIC= yes - -install: .include .PATH: ${KRB4DIR}/lib/roken build-tools: make-print-version print_version.h: make-print-version ./make-print-version print_version.h make-print-version: make-print-version.c ${CC} ${CFLAGS} -o ${.TARGET} ${.OODATE} CLEANFILES+= make-print-version print_version.h Index: stable/4/kerberosIV/lib/libsl/Makefile =================================================================== --- stable/4/kerberosIV/lib/libsl/Makefile (revision 100376) +++ stable/4/kerberosIV/lib/libsl/Makefile (revision 100377) @@ -1,16 +1,14 @@ # $FreeBSD$ LIB= sl +INTERNALLIB= YES CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/lib/sl \ -I${KRB4DIR}/lib/roken \ -I${INCLUDEOBJDIR} SRCS= sl.c ss.c strtok_r.c -NOPIC= yes - -install: .include .PATH: ${KRB4DIR}/lib/sl .PATH: ${KRB4DIR}/lib/roken Index: stable/4/kerberosIV/lib/libtelnet/Makefile =================================================================== --- stable/4/kerberosIV/lib/libtelnet/Makefile (revision 100376) +++ stable/4/kerberosIV/lib/libtelnet/Makefile (revision 100377) @@ -1,35 +1,33 @@ # $FreeBSD$ LIB= telnet INTERNALLIB= yes -INTERNALSTATICLIB=yes -NOPIC= yes SRCS= genget.c getent.c misc.c encrypt.c auth.c \ enc_des.c sra.c pk.c SRCS+= kerberos.c CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DSRA -I${TELNETDIR} CFLAGS+= -DKRB4 -I${KRB4DIR}/lib/krb WARNS?= 2 INCS= ${TELNETDIR}/arpa/telnet.h INCDIR= /usr/include/arpa .include .PATH: ${TELNETDIR}/libtelnet # # Remove obsolete shared libraries, if any. We don't bother moving them # to /usr/lib/compat, since they were only used by telnet, telnetd and # tn3270. # beforeinstall: __remove-stale-libs __remove-stale-libs: .PHONY .if exists(${DESTDIR}${SHLIBDIR}/lib${LIB}.so.2.0) -chflags noschg ${DESTDIR}${SHLIBDIR}/lib${LIB}.so.2.0 rm -f ${DESTDIR}${SHLIBDIR}/lib${LIB}.so.2.0 .endif Index: stable/4/lib/csu/alpha/Makefile =================================================================== --- stable/4/lib/csu/alpha/Makefile (revision 100376) +++ stable/4/lib/csu/alpha/Makefile (revision 100377) @@ -1,28 +1,24 @@ # # $FreeBSD$ # SRCS= crt1.c crti.S crtn.S OBJS= ${SRCS:N*.h:R:S/$/.o/g} OBJS+= gcrt1.o CFLAGS+= -Wall -Wno-unused \ -I${.CURDIR}/../common -NOMAN= true -NOPIC= true -NOPROFILE= true -INTERNALLIB= true .PATH: ${.CURDIR}/../common -all: ${OBJS} ${SOBJS} +all: ${OBJS} +CLEANFILES= ${OBJS} + gcrt1.o: crt1.c ${CC} ${CFLAGS} -DGCRT -c -o gcrt1.o ${.ALLSRC} realinstall: -.for file in ${OBJS} ${SOBJS} ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${file} ${DESTDIR}${LIBDIR}/${file:S/.So$/S.o/} -.endfor + ${OBJS} ${DESTDIR}${LIBDIR} .include Index: stable/4/lib/csu/i386-elf/Makefile =================================================================== --- stable/4/lib/csu/i386-elf/Makefile (revision 100376) +++ stable/4/lib/csu/i386-elf/Makefile (revision 100377) @@ -1,29 +1,27 @@ # # $FreeBSD$ # SRCS= crt1.c crti.S crtn.S OBJS= ${SRCS:N*.h:R:S/$/.o/g} OBJS+= gcrt1.o CFLAGS+= -elf -Wall -fkeep-inline-functions \ -I${.CURDIR}/../common LDFLAGS+= -elf -NOMAN= true -NOPIC= true -NOPROFILE= true -INTERNALLIB= true .PATH: ${.CURDIR}/../common -all: ${OBJS} ${SOBJS} +all: ${OBJS} +CLEANFILES= ${OBJS} + gcrt1.o: crt1.c ${CC} ${CFLAGS} -DGCRT -c -o gcrt1.o ${.CURDIR}/crt1.c realinstall: -.for file in ${OBJS} ${SOBJS} +.for file in ${OBJS} ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${file} ${DESTDIR}${LIBDIR}/${file:S/.So$/S.o/} + ${OBJS} ${DESTDIR}${LIBDIR} .endfor .include Index: stable/4/lib/libbind/Makefile =================================================================== --- stable/4/lib/libbind/Makefile (revision 100376) +++ stable/4/lib/libbind/Makefile (revision 100377) @@ -1,88 +1,86 @@ # $FreeBSD$ BIND_DIR=${.CURDIR}/../../contrib/bind LIB= bind WANT_IRS= for now # This may or may not work yet. It's not compatable with the core # system components since it overrides the master.passwd handling etc. .if defined(WANT_IRS) .PATH: ${BIND_DIR}/lib/irs SRCS+= dns.c dns_gr.c dns_ho.c dns_nw.c dns_pr.c dns_pw.c \ dns_sv.c gai_strerror.c gen.c gen_gr.c gen_ho.c \ gen_ng.c gen_nw.c gen_pr.c gen_pw.c gen_sv.c \ getaddrinfo.c getgrent.c getgrent_r.c gethostent.c \ gethostent_r.c getnameinfo.c getnetent.c getnetent_r.c \ getnetgrent.c getnetgrent_r.c getprotoent.c \ getprotoent_r.c getpwent.c getpwent_r.c getservent.c \ getservent_r.c hesiod.c irs_data.c \ irp.c irp_gr.c irp_ho.c irp_ng.c irp_nw.c \ irp_pr.c irp_pw.c irp_sv.c irpmarshall.c \ lcl.c lcl_gr.c \ lcl_ho.c lcl_ng.c lcl_nw.c lcl_pr.c lcl_pw.c \ lcl_sv.c nis.c nis_gr.c nis_ho.c nis_ng.c nis_nw.c \ nis_pr.c nis_pw.c nis_sv.c nul_ng.c util.c .PATH: ${BIND_DIR}/lib/nameser SRCS+= ns_parse.c ns_print.c ns_netint.c ns_ttl.c ns_name.c \ ns_sign.c ns_verify.c ns_date.c ns_samedomain.c .PATH: ${BIND_DIR}/lib/resolv SRCS+= herror.c res_debug.c res_data.c res_comp.c res_init.c \ res_mkquery.c res_query.c res_send.c res_sendsigned.c \ res_mkupdate.c res_update.c res_findzonecut.c .endif .if defined(WANT_CYLINK) && exists(${BIND_DIR}/lib/cylink) .PATH: ${BIND_DIR}/lib/cylink CFLAGS+=-DCYLINK_DSS -I${BIND_DIR}/lib/cylink SRCS+= bn.c bn00.c lbn00.c lbnmem.c legal.c \ bits.c dss.c math.c ctk_prime.c rand.c sha.c swap.c .endif .if defined(WANT_DNSSAFE) && exists(${BIND_DIR}/lib/dnssafe) .PATH: ${BIND_DIR}/lib/dnssafe CFLAGS+=-DDNSSAFE -I${BIND_DIR}/lib/dnssafe SRCS+= bgclrbit.c bgmdmpyx.c bgmdsqx.c bgmodexp.c \ bgpegcd.c big2exp.c bigabs.c bigacc.c bigarith.c \ bigcmp.c bigconst.c biginv.c biglen.c bigmodx.c \ bigmpy.c bigpdiv.c bigpmpy.c bigpmpyh.c bigpmpyl.c \ bigpsq.c bigqrx.c bigsmod.c bigtocan.c bigu.c \ bigunexp.c cantobig.c crt2.c \ digrand.c intbits.c md5.c md5rand.c prime.c \ rsa.c rsakeygn.c seccbcd.c seccbce.c surrendr.c \ ahchdig.c ahchencr.c ahchgen.c ahchrand.c ahdigest.c \ ahencryp.c ahgen.c ahrandom.c ahrsaenc.c ahrsaepr.c \ ahrsaepu.c aichdig.c aichenc8.c aichencn.c aichencr.c \ aichgen.c aichrand.c aimd5.c \ aimd5ran.c ainfotyp.c ainull.c airsaepr.c airsaepu.c \ airsakgn.c airsaprv.c airsapub.c algchoic.c algobj.c \ amcrte.c ammd5.c ammd5r.c \ amrkg.c amrsae.c balg.c binfocsh.c bkey.c bmempool.c \ digest.c encrypt.c generate.c intitem.c \ keyobj.c ki8byte.c kiitem.c kinfotyp.c \ kifulprv.c kipkcrpr.c kirsacrt.c kirsapub.c random.c .endif .PATH: ${BIND_DIR}/lib/dst CFLAGS+=-DHMAC_MD5 -DUSE_MD5 SRCS+= dst_api.c prandom.c rsaref_link.c support.c bsafe_link.c \ cylink_link.c hmac_link.c md5_dgst.c eay_dss_link.c .PATH: ${BIND_DIR}/lib/isc SRCS+= tree.c bitncmp.c assertions.c \ memcluster.c logging.c heap.c \ ctl_p.c ctl_srvr.c ctl_clnt.c \ eventlib.c ev_connects.c ev_files.c \ ev_timers.c ev_streams.c ev_waits.c # base64.c INTERNALLIB= true -NOPIC= true -INTERNALSTATICLIB= true .include # XXX contrib/bind/include/* must not override any real system includes CFLAGS:= -I${BIND_DIR}/port/freebsd/include -I${BIND_DIR}/include ${CFLAGS} Index: stable/4/lib/libdisk/Makefile =================================================================== --- stable/4/lib/libdisk/Makefile (revision 100376) +++ stable/4/lib/libdisk/Makefile (revision 100377) @@ -1,50 +1,49 @@ # $FreeBSD$ LIB= disk SRCS= blocks.c disklabel.c chunk.c disk.c change.c \ create_chunk.c rules.c write_disk.c INCS= libdisk.h # Remove KERN_DISKS_BROKEN when kern.disks sysctl returns disks in sorted order CFLAGS+= -Wall .if ${MACHINE} == "pc98" CFLAGS+= -DPC98 .endif CLEANFILES+= tmp.c tst01 tst01.o NOPROFILE= yes -NOSHARED= yes NOPIC= yes MAN= libdisk.3 MLINKS+= libdisk.3 Open_Disk.3 \ libdisk.3 Clone_Disk.3 \ libdisk.3 Free_Disk.3 \ libdisk.3 Debug_Disk.3 \ libdisk.3 Set_Bios_Geom.3 \ libdisk.3 Delete_Chunk.3 \ libdisk.3 Collapse_Disk.3 \ libdisk.3 Collapse_Chunk.3 \ libdisk.3 Create_Chunk.3 \ libdisk.3 All_FreeBSD.3 \ libdisk.3 CheckRules.3 \ libdisk.3 Disk_Names.3 \ libdisk.3 Set_Boot_Mgr.3 \ libdisk.3 Set_Boot_Blocks.3 \ libdisk.3 Write_Disk.3 \ libdisk.3 Cyl_Aligned.3 \ libdisk.3 Next_Cyl_Aligned.3 \ libdisk.3 Prev_Cyl_Aligned.3 \ libdisk.3 Track_Aligned.3 \ libdisk.3 Next_Track_Aligned.3 \ libdisk.3 Prev_Track_Aligned.3 \ libdisk.3 Create_Chunk_DWIM.3 \ libdisk.3 MakeDev.3 \ libdisk.3 MakeDevDisk.3 \ libdisk.3 ShowChunkFlags.3 \ libdisk.3 ChunkCanBeRoot.3 \ libdisk.3 slice_type_name.3 .include tst01: tst01.o libdisk.a cc ${CFLAGS} -static tst01.o -o tst01 libdisk.a Index: stable/4/lib/libpam/modules/Makefile.inc =================================================================== --- stable/4/lib/libpam/modules/Makefile.inc (revision 100376) +++ stable/4/lib/libpam/modules/Makefile.inc (revision 100377) @@ -1,7 +1,6 @@ # $FreeBSD$ PAMDIR= ${.CURDIR}/../../../../contrib/libpam SHLIB_NAME= ${LIB}.so -INTERNALLIB= yes -INTERNALSTATICLIB=yes - +NOINSTALLLIB= yes +NOPROFILE= yes Index: stable/4/lib/libsm/Makefile =================================================================== --- stable/4/lib/libsm/Makefile (revision 100376) +++ stable/4/lib/libsm/Makefile (revision 100377) @@ -1,37 +1,35 @@ # $FreeBSD$ MAINTAINER= gshapiro@FreeBSD.org SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail .PATH: ${SENDMAIL_DIR}/libsm CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I. CFLAGS+=-DNETINET6 -DNEWDB -DNIS -DMAP_REGEX -DNOT_SENDMAIL # User customizations to the sendmail build environment CFLAGS+=${SENDMAIL_CFLAGS} LIB= sm SRCS+= sm_os.h SRCS+= assert.c debug.c errstring.c exc.c heap.c match.c rpool.c \ strdup.c strerror.c strl.c clrerr.c fclose.c feof.c ferror.c \ fflush.c fget.c fpos.c findfp.c flags.c fopen.c fprintf.c \ fpurge.c fput.c fread.c fscanf.c fseek.c fvwrite.c fwalk.c \ fwrite.c get.c makebuf.c put.c refill.c rewind.c setvbuf.c \ smstdio.c snprintf.c sscanf.c stdio.c strio.c ungetc.c \ vasprintf.c vfprintf.c vfscanf.c vprintf.c vsnprintf.c \ vsprintf.c vsscanf.c wbuf.c wsetup.c string.c stringf.c \ xtrap.c strto.c test.c path.c strcasecmp.c strrevcmp.c \ signal.c clock.c config.c shm.c mbdb.c strexit.c cf.c ldap.c \ niprop.c mpeix.c CLEANFILES+=sm_os.h INTERNALLIB= true -NOPIC= true -INTERNALSTATICLIB= true sm_os.h: ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h .include Index: stable/4/lib/libsmdb/Makefile =================================================================== --- stable/4/lib/libsmdb/Makefile (revision 100376) +++ stable/4/lib/libsmdb/Makefile (revision 100377) @@ -1,27 +1,25 @@ # $FreeBSD$ MAINTAINER= gshapiro@FreeBSD.org SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail .PATH: ${SENDMAIL_DIR}/libsmdb CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I. CFLAGS+=-DNEWDB -DNOT_SENDMAIL # User customizations to the sendmail build environment CFLAGS+=${SENDMAIL_CFLAGS} LIB= smdb SRCS+= sm_os.h SRCS+= smdb.c smdb1.c smdb2.c smndbm.c CLEANFILES+=sm_os.h INTERNALLIB= true -NOPIC= true -INTERNALSTATICLIB= true sm_os.h: ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h .include Index: stable/4/lib/libsmutil/Makefile =================================================================== --- stable/4/lib/libsmutil/Makefile (revision 100376) +++ stable/4/lib/libsmutil/Makefile (revision 100377) @@ -1,27 +1,25 @@ # $FreeBSD$ MAINTAINER= gshapiro@FreeBSD.org SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail .PATH: ${SENDMAIL_DIR}/libsmutil CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I. CFLAGS+=-DNEWDB -DNIS -DMAP_REGEX -DNOT_SENDMAIL # User customizations to the sendmail build environment CFLAGS+=${SENDMAIL_CFLAGS} LIB= smutil SRCS+= sm_os.h SRCS+= debug.c err.c lockfile.c safefile.c snprintf.c cf.c CLEANFILES+=sm_os.h INTERNALLIB= true -NOPIC= true -INTERNALSTATICLIB= true sm_os.h: ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h .include Index: stable/4/lib/libtelnet/Makefile =================================================================== --- stable/4/lib/libtelnet/Makefile (revision 100376) +++ stable/4/lib/libtelnet/Makefile (revision 100377) @@ -1,35 +1,33 @@ # From: @(#)Makefile 8.2 (Berkeley) 12/15/93 # $FreeBSD$ LIB= telnet INTERNALLIB= yes -INTERNALSTATICLIB=yes -NOPIC= yes SRCS= genget.c getent.c misc.c WARNS?= 2 unifdef: -cd ${.CURDIR} ; \ ( for i in *.[ch] ; do \ unifdef -UAUTHENTICATION -UENCRYPTION \ ${.CURDIR}/../../crypto/telnet/libtelnet/$$i \ > ${.CURDIR}/$$i ; \ echo $$i ; \ done ) .include # # Remove obsolete shared libraries, if any. We don't bother moving them # to /usr/lib/compat, since they were only used by telnet, telnetd and # tn3270. # beforeinstall: __remove-stale-libs __remove-stale-libs: .PHONY .if exists(${DESTDIR}${SHLIBDIR}/lib${LIB}.so.2.0) -chflags noschg ${DESTDIR}${SHLIBDIR}/lib${LIB}.so.2.0 rm -f ${DESTDIR}${SHLIBDIR}/lib${LIB}.so.2.0 .endif Index: stable/4/sbin/dhclient/common/Makefile =================================================================== --- stable/4/sbin/dhclient/common/Makefile (revision 100376) +++ stable/4/sbin/dhclient/common/Makefile (revision 100377) @@ -1,21 +1,20 @@ # common # $FreeBSD$ DIST_DIR= ${.CURDIR}/../../../contrib/isc-dhcp .PATH: ${DIST_DIR}/common LIB= dhcp INTERNALLIB= true -INTERNALSTATICLIB= true SRCS= alloc.c bpf.c comapi.c conflex.c ctrace.c discover.c dispatch.c \ dlpi.c dns.c ethernet.c execute.c fddi.c icmp.c inet.c lpf.c \ memory.c nit.c options.c packet.c parse.c print.c raw.c resolv.c \ socket.c tables.c tr.c tree.c upf.c CFLAGS+= -I${DIST_DIR} MAN= dhcp-eval.5 dhcp-options.5 .include Index: stable/4/sbin/dhclient/dst/Makefile =================================================================== --- stable/4/sbin/dhclient/dst/Makefile (revision 100376) +++ stable/4/sbin/dhclient/dst/Makefile (revision 100377) @@ -1,18 +1,15 @@ # dst # $FreeBSD$ DIST_DIR= ${.CURDIR}/../../../contrib/isc-dhcp .PATH: ${DIST_DIR}/dst LIB= dst INTERNALLIB= true -INTERNALSTATICLIB= true SRCS= base64.c dst_api.c dst_support.c hmac_link.c md5_dgst.c prandom.c CFLAGS+= -DHMAC_MD5 -DMINIRES_LIB - -NOMAN= true .include Index: stable/4/sbin/dhclient/minires/Makefile =================================================================== --- stable/4/sbin/dhclient/minires/Makefile (revision 100376) +++ stable/4/sbin/dhclient/minires/Makefile (revision 100377) @@ -1,28 +1,25 @@ # minires # $FreeBSD$ DIST_DIR= ${.CURDIR}/../../../contrib/isc-dhcp .PATH: ${DIST_DIR}/minires LIB= res INTERNALLIB= true -INTERNALSTATICLIB= true SRCS= ns_date.c ns_name.c ns_parse%FIXED.c ns_samedomain.c ns_sign.c ns_verify.c \ res_comp.c res_findzonecut.c res_init.c res_mkquery.c res_mkupdate.c \ res_query%FIXED.c res_send.c res_sendsigned.c res_update.c CFLAGS+= -DHMAC_MD5 -DMINIRES_LIB - -NOMAN= true CLEANFILES+= ns_parse%FIXED.c res_query%FIXED.c ns_parse%FIXED.c: ns_parse.c sed 's/struct _ns_flagdata _ns_flagdata/struct _ns_flagdata _ns_flagdata_DONT/' \ ${.ALLSRC} > ${.TARGET} res_query%FIXED.c: res_query.c sed -e 's/RES_SET_H_ERRNO(\(.*\),\(.*\))/(h_errno = (\1)->res_h_errno = (\2))/' \ ${.ALLSRC} > ${.TARGET} .include Index: stable/4/sbin/dhclient/omapip/Makefile =================================================================== --- stable/4/sbin/dhclient/omapip/Makefile (revision 100376) +++ stable/4/sbin/dhclient/omapip/Makefile (revision 100377) @@ -1,19 +1,18 @@ # omapip # $FreeBSD$ DIST_DIR= ${.CURDIR}/../../../contrib/isc-dhcp .PATH: ${DIST_DIR}/omapip LIB= omapi INTERNALLIB= true -INTERNALSTATICLIB= true SRCS= alloc.c array.c auth.c buffer.c connection.c convert.c dispatch.c \ errwarn.c generic.c handle.c hash.c inet_addr.c listener.c \ message.c mrtrace.c protocol.c result.c support.c toisc.c trace.c MAN= omapi.3 NOMAN= true .include Index: stable/4/secure/lib/libcipher/Makefile =================================================================== --- stable/4/secure/lib/libcipher/Makefile (revision 100376) +++ stable/4/secure/lib/libcipher/Makefile (revision 100377) @@ -1,16 +1,16 @@ # # $FreeBSD$ # LIB= cipher SRCS= crypt.c PRECIOUSLIB= yes #NOPROFILE= yes -MAN3= cipher.3 +MAN= cipher.3 MLINKS= cipher.3 encrypt.3 cipher.3 setkey.3 MLINKS+=cipher.3 des_cipher.3 cipher.3 des_setkey.3 #SUBDIR= test .include Index: stable/4/secure/lib/libtelnet/Makefile =================================================================== --- stable/4/secure/lib/libtelnet/Makefile (revision 100376) +++ stable/4/secure/lib/libtelnet/Makefile (revision 100377) @@ -1,34 +1,32 @@ # $FreeBSD$ LIB= telnet INTERNALLIB= yes -INTERNALSTATICLIB=yes -NOPIC= yes SRCS= genget.c getent.c misc.c encrypt.c auth.c \ enc_des.c sra.c pk.c CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DSRA \ -I${TELNETDIR} -I${TELNETDIR}/libtelnet WARNS?= 2 INCS= ${TELNETDIR}/arpa/telnet.h INCDIR= /usr/include/arpa .include .PATH: ${TELNETDIR}/libtelnet # # Remove obsolete shared libraries, if any. We don't bother moving them # to /usr/lib/compat, since they were only used by telnet, telnetd and # tn3270. # beforeinstall: __remove-stale-libs __remove-stale-libs: .PHONY .if exists(${DESTDIR}${SHLIBDIR}/lib${LIB}.so.2.0) -chflags noschg ${DESTDIR}${SHLIBDIR}/lib${LIB}.so.2.0 rm -f ${DESTDIR}${SHLIBDIR}/lib${LIB}.so.2.0 .endif Index: stable/4/share/mk/bsd.lib.mk =================================================================== --- stable/4/share/mk/bsd.lib.mk (revision 100376) +++ stable/4/share/mk/bsd.lib.mk (revision 100377) @@ -1,324 +1,349 @@ # from: @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91 # $FreeBSD$ # .include -.if exists(${.CURDIR}/shlib_version) -SHLIB_MAJOR != . ${.CURDIR}/shlib_version ; echo $$major -.if ${OBJFORMAT} == aout -SHLIB_MINOR != . ${.CURDIR}/shlib_version ; echo $$minor -.endif -.endif - # Set up the variables controlling shared libraries. After this section, # SHLIB_NAME will be defined only if we are to create a shared library. # SHLIB_LINK will be defined only if we are to create a link to it. # INSTALL_PIC_ARCHIVE will be defined only if we are to create a PIC archive. .if defined(NOPIC) .undef SHLIB_NAME .undef INSTALL_PIC_ARCHIVE .else .if ${OBJFORMAT} == elf -.if !defined(SHLIB_NAME) && defined(SHLIB_MAJOR) +.if !defined(SHLIB_NAME) && defined(LIB) && defined(SHLIB_MAJOR) SHLIB_NAME= lib${LIB}.so.${SHLIB_MAJOR} -SHLIB_LINK?= lib${LIB}.so .endif +.if defined(SHLIB_NAME) && ${SHLIB_NAME:M*.so.*} +SHLIB_LINK?= ${SHLIB_NAME:R} +.endif SONAME?= ${SHLIB_NAME} .else .if defined(SHLIB_MAJOR) && defined(SHLIB_MINOR) SHLIB_NAME?= lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} .endif .endif .endif .if defined(DEBUG_FLAGS) CFLAGS+= ${DEBUG_FLAGS} .endif .if !defined(DEBUG_FLAGS) STRIP?= -s .endif .if ${OBJFORMAT} != aout || make(checkdpadd) || defined(NEED_LIBNAMES) .include .endif # prefer .s to a .c, add .po, remove stuff not used in the BSD libraries # .So used for PIC object files .SUFFIXES: -.SUFFIXES: .out .o .po .So .s .S .c .cc .cpp .cxx .m .C .f .y .l +.SUFFIXES: .out .o .po .So .S .s .c .cc .cpp .cxx .m .C .f .y .l +.if !defined(PICFLAG) +PICFLAG=-fpic +.endif + .c.o: ${CC} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} @${LD} -o ${.TARGET}.tmp -x -r ${.TARGET} @mv ${.TARGET}.tmp ${.TARGET} .c.po: ${CC} -pg ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} @${LD} -o ${.TARGET}.tmp -X -r ${.TARGET} @mv ${.TARGET}.tmp ${.TARGET} .c.So: ${CC} ${PICFLAG} -DPIC ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} - @${LD} -o ${.TARGET}.tmp -x -r ${.TARGET} + @${LD} ${LDFLAGS} -o ${.TARGET}.tmp -x -r ${.TARGET} @mv ${.TARGET}.tmp ${.TARGET} .cc.o .C.o .cpp.o .cxx.o: ${CXX} ${CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET} @${LD} -o ${.TARGET}.tmp -x -r ${.TARGET} @mv ${.TARGET}.tmp ${.TARGET} .cc.po .C.po .cpp.po .cxx.po: ${CXX} -pg ${CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET} @${LD} -o ${.TARGET}.tmp -X -r ${.TARGET} @mv ${.TARGET}.tmp ${.TARGET} .cc.So .C.So .cpp.So .cxx.So: ${CXX} ${PICFLAG} -DPIC ${CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET} - @${LD} -o ${.TARGET}.tmp -x -r ${.TARGET} + @${LD} ${LDFLAGS} -o ${.TARGET}.tmp -x -r ${.TARGET} @mv ${.TARGET}.tmp ${.TARGET} .f.o: ${FC} ${FFLAGS} -o ${.TARGET} -c ${.IMPSRC} @${LD} -o ${.TARGET}.tmp -x -r ${.TARGET} @mv ${.TARGET}.tmp ${.TARGET} .f.po: ${FC} -pg ${FFLAGS} -o ${.TARGET} -c ${.IMPSRC} @${LD} -o ${.TARGET}.tmp -X -r ${.TARGET} @mv ${.TARGET}.tmp ${.TARGET} .f.So: ${FC} ${PICFLAG} -DPIC ${FFLAGS} -o ${.TARGET} -c ${.IMPSRC} - @${LD} -o ${.TARGET}.tmp -x -r ${.TARGET} + @${LD} ${LDFLAGS} -o ${.TARGET}.tmp -x -r ${.TARGET} @mv ${.TARGET}.tmp ${.TARGET} .m.o: ${OBJC} ${OBJCFLAGS} -c ${.IMPSRC} -o ${.TARGET} @${LD} -o ${.TARGET}.tmp -x -r ${.TARGET} @mv ${.TARGET}.tmp ${.TARGET} .m.po: ${OBJC} ${OBJCFLAGS} -pg -c ${.IMPSRC} -o ${.TARGET} @${LD} -o ${.TARGET}.tmp -X -r ${.TARGET} @mv ${.TARGET}.tmp ${.TARGET} .m.So: ${OBJC} ${PICFLAG} -DPIC ${OBJCFLAGS} -c ${.IMPSRC} -o ${.TARGET} - @${LD} -o ${.TARGET}.tmp -x -r ${.TARGET} + @${LD} ${LDFLAGS} -o ${.TARGET}.tmp -x -r ${.TARGET} @mv ${.TARGET}.tmp ${.TARGET} .s.o: - ${CC} -x assembler-with-cpp ${CFLAGS:M-[BID]*} ${AINC} -c \ + ${CC} -x assembler-with-cpp ${CFLAGS} ${AINC} -c \ ${.IMPSRC} -o ${.TARGET} - @${LD} -o ${.TARGET}.tmp -x -r ${.TARGET} + @${LD} ${LDFLAGS} -o ${.TARGET}.tmp -x -r ${.TARGET} @mv ${.TARGET}.tmp ${.TARGET} .s.po: - ${CC} -x assembler-with-cpp -DPROF ${CFLAGS:M-[BID]*} ${AINC} -c \ + ${CC} -x assembler-with-cpp -DPROF ${CFLAGS} ${AINC} -c \ ${.IMPSRC} -o ${.TARGET} - @${LD} -o ${.TARGET}.tmp -X -r ${.TARGET} + @${LD} ${LDFLAGS} -o ${.TARGET}.tmp -X -r ${.TARGET} @mv ${.TARGET}.tmp ${.TARGET} .s.So: - ${CC} -x assembler-with-cpp -fpic -DPIC ${CFLAGS:M-[BID]*} ${AINC} -c \ - ${.IMPSRC} -o ${.TARGET} + ${CC} -x assembler-with-cpp ${PICFLAG} -DPIC ${CFLAGS} \ + ${AINC} -c ${.IMPSRC} -o ${.TARGET} @${LD} -o ${.TARGET}.tmp -x -r ${.TARGET} @mv ${.TARGET}.tmp ${.TARGET} .S.o: - ${CC} ${CFLAGS:M-[BID]*} ${AINC} -c ${.IMPSRC} -o ${.TARGET} - @${LD} -o ${.TARGET}.tmp -x -r ${.TARGET} + ${CC} ${CFLAGS} ${AINC} -c ${.IMPSRC} -o ${.TARGET} + @${LD} ${LDFLAGS} -o ${.TARGET}.tmp -x -r ${.TARGET} @mv ${.TARGET}.tmp ${.TARGET} .S.po: - ${CC} -DPROF ${CFLAGS:M-[BID]*} ${AINC} -c ${.IMPSRC} -o ${.TARGET} - @${LD} -o ${.TARGET}.tmp -X -r ${.TARGET} + ${CC} -DPROF ${CFLAGS} ${AINC} -c ${.IMPSRC} -o ${.TARGET} + @${LD} ${LDFLAGS} -o ${.TARGET}.tmp -X -r ${.TARGET} @mv ${.TARGET}.tmp ${.TARGET} .S.So: - ${CC} -fpic -DPIC ${CFLAGS:M-[BID]*} ${AINC} -c ${.IMPSRC} -o ${.TARGET} + ${CC} ${PICFLAG} -DPIC ${CFLAGS} ${AINC} -c ${.IMPSRC} \ + -o ${.TARGET} @${LD} -o ${.TARGET}.tmp -x -r ${.TARGET} @mv ${.TARGET}.tmp ${.TARGET} -.if !defined(INTERNALLIB) || defined(INTERNALSTATICLIB) -.if !defined(NOPROFILE) && !defined(INTERNALLIB) -_LIBS=lib${LIB}.a lib${LIB}_p.a -.else -_LIBS=lib${LIB}.a -.endif -.endif +all: objwarn -.if defined(SHLIB_NAME) -_LIBS+=${SHLIB_NAME} +.if defined(LIB) && !empty(LIB) || defined(SHLIB_NAME) +OBJS+= ${SRCS:N*.h:R:S/$/.o/} .endif -.if defined(INSTALL_PIC_ARCHIVE) -_LIBS+=lib${LIB}_pic.a -.endif -.if !defined(PICFLAG) -PICFLAG=-fpic -.endif +.if defined(LIB) && !empty(LIB) +_LIBS= lib${LIB}.a -all: objwarn ${_LIBS} - -.if !defined(NOMAN) -all: _manpages +lib${LIB}.a: ${OBJS} ${STATICOBJS} + @${ECHO} building static ${LIB} library + @rm -f ${.TARGET} + @${AR} cq ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD} + ${RANLIB} ${.TARGET} .endif -OBJS+= ${SRCS:N*.h:R:S/$/.o/g} +.if !defined(INTERNALLIB) -lib${LIB}.a:: ${OBJS} ${STATICOBJS} - @${ECHO} building static ${LIB} library - @rm -f lib${LIB}.a - @${AR} cq lib${LIB}.a `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD} - ${RANLIB} lib${LIB}.a +.if !defined(NOPROFILE) && defined(LIB) && !empty(LIB) +_LIBS+= lib${LIB}_p.a +POBJS+= ${OBJS:.o=.po} ${STATICOBJS:.o=.po} -POBJS+= ${OBJS:.o=.po} ${STATICOBJS:.o=.po} -.if !defined(NOPROFILE) -lib${LIB}_p.a:: ${POBJS} +lib${LIB}_p.a: ${POBJS} @${ECHO} building profiled ${LIB} library - @rm -f lib${LIB}_p.a - @${AR} cq lib${LIB}_p.a `lorder ${POBJS} | tsort -q` ${ARADD} - ${RANLIB} lib${LIB}_p.a + @rm -f ${.TARGET} + @${AR} cq ${.TARGET} `lorder ${POBJS} | tsort -q` ${ARADD} + ${RANLIB} ${.TARGET} .endif -SOBJS+= ${OBJS:.o=.So} +.if defined(SHLIB_NAME) || \ + defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) +SOBJS+= ${OBJS:.o=.So} +.endif .if defined(SHLIB_NAME) +_LIBS+= ${SHLIB_NAME} + ${SHLIB_NAME}: ${SOBJS} @${ECHO} building shared library ${SHLIB_NAME} - @rm -f ${SHLIB_NAME} ${SHLIB_LINK} + @rm -f ${.TARGET} ${SHLIB_LINK} .if defined(SHLIB_LINK) - @ln -sf ${SHLIB_NAME} ${SHLIB_LINK} + @ln -fs ${.TARGET} ${SHLIB_LINK} .endif .if ${OBJFORMAT} == aout @${CC} -shared -Wl,-x,-assert,pure-text \ - -o ${SHLIB_NAME} \ + -o ${.TARGET} \ `lorder ${SOBJS} | tsort -q` ${LDADD} .else - @${CC} -shared -Wl,-x \ - -o ${SHLIB_NAME} -Wl,-soname,${SONAME} \ + @${CC} ${LDFLAGS} -shared -Wl,-x \ + -o ${.TARGET} -Wl,-soname,${SONAME} \ `lorder ${SOBJS} | tsort -q` ${LDADD} .endif .endif -.if defined(INSTALL_PIC_ARCHIVE) -lib${LIB}_pic.a:: ${SOBJS} +.if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) +_LIBS+= lib${LIB}_pic.a + +lib${LIB}_pic.a: ${SOBJS} @${ECHO} building special pic ${LIB} library - @rm -f lib${LIB}_pic.a - @${AR} cq lib${LIB}_pic.a ${SOBJS} ${ARADD} - ${RANLIB} lib${LIB}_pic.a + @rm -f ${.TARGET} + @${AR} cq ${.TARGET} ${SOBJS} ${ARADD} + ${RANLIB} ${.TARGET} .endif -llib-l${LIB}.ln: ${SRCS} - ${LINT} -C${LIB} ${CFLAGS} ${.ALLSRC:M*.c} +.endif !defined(INTERNALLIB) +all: ${_LIBS} + +.if !defined(NOMAN) +all: _manpages +.endif + .if !target(clean) clean: - rm -f a.out ${OBJS} ${STATICOBJS} ${OBJS:S/$/.tmp/} ${CLEANFILES} - rm -f lib${LIB}.a # llib-l${LIB}.ln - rm -f ${POBJS} ${POBJS:S/$/.tmp/} lib${LIB}_p.a - rm -f ${SOBJS} ${SOBJS:.So=.so} ${SOBJS:S/$/.tmp/} \ - ${SHLIB_NAME} ${SHLIB_LINK} \ - lib${LIB}.so.* lib${LIB}.so lib${LIB}_pic.a +.if defined(CLEANFILES) && !empty(CLEANFILES) + rm -f ${CLEANFILES} +.endif +.if defined(LIB) && !empty(LIB) + rm -f a.out ${OBJS} ${OBJS:S/$/.tmp/} ${STATICOBJS} +.endif +.if !defined(INTERNALLIB) +.if !defined(NOPROFILE) && defined(LIB) && !empty(LIB) + rm -f ${POBJS} ${POBJS:S/$/.tmp/} +.endif +.if defined(SHLIB_NAME) || \ + defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) + rm -f ${SOBJS} ${SOBJS:.So=.so} ${SOBJS:S/$/.tmp/} +.endif +.if defined(SHLIB_NAME) +.if defined(SHLIB_LINK) + rm -f ${SHLIB_LINK} +.endif +.if defined(LIB) && !empty(LIB) + rm -f lib${LIB}.so.* lib${LIB}.so +.endif +.endif +.endif !defined(INTERNALLIB) +.if defined(_LIBS) && !empty(_LIBS) + rm -f ${_LIBS} +.endif .if defined(CLEANDIRS) && !empty(CLEANDIRS) rm -rf ${CLEANDIRS} .endif .endif _EXTRADEPEND: @TMP=_depend$$$$; \ sed -e 's/^\([^\.]*\).o[ ]*:/\1.o \1.po \1.So:/' < ${DEPENDFILE} \ > $$TMP; \ mv $$TMP ${DEPENDFILE} .if !defined(NOEXTRADEPEND) && defined(SHLIB_NAME) .if ${OBJFORMAT} == aout echo ${SHLIB_NAME}: \ `${CC} -shared -Wl,-f ${LDADD}` \ >> ${DEPENDFILE} .else .if defined(DPADD) && !empty(DPADD) echo ${SHLIB_NAME}: ${DPADD} >> ${DEPENDFILE} .endif .endif .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 .endif _INSTALLFLAGS:= ${INSTALLFLAGS} .for ie in ${INSTALLFLAGS_EDIT} _INSTALLFLAGS:= ${_INSTALLFLAGS${ie}} .endfor _SHLINSTALLFLAGS:= ${SHLINSTALLFLAGS} .for ie in ${INSTALLFLAGS_EDIT} _SHLINSTALLFLAGS:= ${_SHLINSTALLFLAGS${ie}} .endfor +.if !defined(INTERNALLIB) realinstall: _libinstall +.ORDER: beforeinstall _libinstall _libinstall: -.if !defined(INTERNALLIB) - ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ +.if defined(LIB) && !empty(LIB) && !defined(NOINSTALLLIB) + ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR} -.if !defined(NOPROFILE) - ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ +.endif +.if !defined(NOPROFILE) && defined(LIB) && !empty(LIB) + ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${LIBDIR} .endif -.endif .if defined(SHLIB_NAME) ${INSTALL} ${COPY} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \ ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR} .if defined(SHLIB_LINK) - ln -sf ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR}/${SHLIB_LINK} + ln -fs ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR}/${SHLIB_LINK} .endif .endif -.if defined(INSTALL_PIC_ARCHIVE) +.if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${LIBDIR} .endif +.endif !defined(INTERNALLIB) .include + +.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 + .include .if !defined(NOMAN) realinstall: _maninstall +.ORDER: beforeinstall _maninstall .endif .endif -.if !target(lint) -lint: -.endif - .if !defined(NOMAN) .include .endif .include .if !exists(${.OBJDIR}/${DEPENDFILE}) -${OBJS} ${STATICOBJS} ${POBJS} ${SOBJS}: ${SRCS:M*.h} +.if defined(LIB) && !empty(LIB) +${OBJS} ${STATICOBJS} ${POBJS}: ${SRCS:M*.h} +.endif +.if defined(SHLIB_NAME) || \ + defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) +${SOBJS}: ${SRCS:M*.h} +.endif .endif .include .include Index: stable/4/sys/boot/alpha/libalpha/Makefile =================================================================== --- stable/4/sys/boot/alpha/libalpha/Makefile (revision 100376) +++ stable/4/sys/boot/alpha/libalpha/Makefile (revision 100377) @@ -1,32 +1,28 @@ # $FreeBSD$ LIB= alpha -NOPIC= true -NOPROFILE= true INTERNALLIB= true +#CFLAGS+= -DDISK_DEBUG +#CPPFLAGS+= -DNO_DISKLABEL +#CPPFLAGS+= -DSAVE_MEMORY + # XXX hack to pick up stand.h LIBSTANDDIR= ${.CURDIR}/../../../../lib/libstand -CFLAGS= -I${LIBSTANDDIR} CFLAGS+= -DDEBUG +CFLAGS+= -I${LIBSTANDDIR} # Pick up the bootstrap header for some interface items CFLAGS+= -I${.CURDIR}/../../common -mno-fp-regs \ -I${.CURDIR}/../../.. -I. -#CFLAGS+= -DDISK_DEBUG -#CPPFLAGS+= -DNO_DISKLABEL -#CPPFLAGS+= -DSAVE_MEMORY - SRCS= OSFpal.c elf_freebsd.c prom.c prom_disp.S prom_swpal.S \ pal.S reboot.c delay.c time.c alpha_module.c devicename.c \ srmdisk.c srmnet.c getsecs.c alpha_copy.c bootinfo.c - -all: libalpha.a machine: ln -sf ${.CURDIR}/../../../alpha/include machine .include beforedepend ${OBJS}: machine Index: stable/4/sys/boot/arc/lib/Makefile =================================================================== --- stable/4/sys/boot/arc/lib/Makefile (revision 100376) +++ stable/4/sys/boot/arc/lib/Makefile (revision 100377) @@ -1,38 +1,34 @@ # $FreeBSD$ LIB= arc -NOPIC= true -NOPROFILE= true INTERNALLIB= true .PATH: ${.CURDIR}/arch/${MACHINE_ARCH} # XXX hack to pick up stand.h LIBSTANDDIR= ${.CURDIR}/../../../../lib/libstand -CFLAGS= -I${LIBSTANDDIR} +CFLAGS+= -I${LIBSTANDDIR} CFLAGS+= -DDEBUG # Pick up the bootstrap header for some interface items CFLAGS+= -I${.CURDIR}/../../common -mno-fp-regs \ -I${.CURDIR}/../../.. -I${.CURDIR}/../include #CFLAGS+= -DDISK_DEBUG #CPPFLAGS+= -DNO_DISKLABEL #CPPFLAGS+= -DSAVE_MEMORY SRCS= delay.c time.c abort.c setjmperr.c copy.c devicename.c module.c \ arcconsole.c arcdisk.c elf_freebsd.c bootinfo.c .if ${MACHINE_ARCH} == "alpha" SRCS+= rpb.c .endif - -all: libarc.a CLEANFILES+= machine machine: ln -sf ${.CURDIR}/../../../alpha/include machine .include beforedepend ${OBJS}: machine Index: stable/4/sys/boot/ficl/Makefile =================================================================== --- stable/4/sys/boot/ficl/Makefile (revision 100376) +++ stable/4/sys/boot/ficl/Makefile (revision 100377) @@ -1,40 +1,38 @@ # $FreeBSD$ # .PATH: ${.CURDIR}/${MACHINE_ARCH} BASE_SRCS= dict.c ficl.c math64.c stack.c vm.c words.c SRCS= ${BASE_SRCS} sysdep.c softcore.c CLEANFILES= softcore.c testmain testmain.o .if ${MACHINE_ARCH} == "alpha" CFLAGS+= -mno-fp-regs .endif .if ${MACHINE_ARCH} == "i386" CFLAGS+= -mpreferred-stack-boundary=2 .endif .ifmake testmain CFLAGS+= -DTESTMAIN -D_TESTMAIN SRCS+= testmain.c PROG= testmain .include .else LIB= ficl INTERNALLIB= yes -INTERNALSTATICLIB= yes -NOPROFILE= yes SRCS+= loader.c .include .endif # Standard softwords SOFTWORDS= softcore.fr jhlocal.fr marker.fr freebsd.fr ficllocal.fr \ ifbrack.fr # Optional OO extension softwords #SOFTWORDS+= oo.fr classes.fr .PATH: ${.CURDIR}/softwords CFLAGS+= -I${.CURDIR} -I${.CURDIR}/${MACHINE_ARCH} -I${.CURDIR}/../common -DFICL_TRACE softcore.c: ${SOFTWORDS} softcore.awk (cd ${.CURDIR}/softwords; cat ${SOFTWORDS} \ | awk -f softcore.awk -v datestamp="`LC_ALL=C date`") > ${.TARGET} Index: stable/4/sys/boot/i386/btx/lib/Makefile =================================================================== --- stable/4/sys/boot/i386/btx/lib/Makefile (revision 100376) +++ stable/4/sys/boot/i386/btx/lib/Makefile (revision 100377) @@ -1,20 +1,16 @@ # $FreeBSD$ OBJS= btxcsu.o btxsys.o btxv86.o AFLAGS+= -elf LDFLAGS+= -elf -CLEANFILES+= crt0.o -INTERNALLIB= true -NOMAN= true -NOPIC= true -NOPROFILE= true +CLEANFILES+= crt0.o ${OBJS} all: crt0.o crt0.o: ${OBJS} ${LD} ${LDFLAGS} -i -o ${.TARGET} ${OBJS} .include .s.o: ${AS} ${AFLAGS} -o ${.TARGET} ${.IMPSRC} Index: stable/4/sys/boot/i386/libi386/Makefile =================================================================== --- stable/4/sys/boot/i386/libi386/Makefile (revision 100376) +++ stable/4/sys/boot/i386/libi386/Makefile (revision 100377) @@ -1,49 +1,46 @@ # $FreeBSD$ # LIB= i386 -NOPIC= -NOPROFILE= INTERNALLIB= true -INTERNALSTATICLIB= true SRCS= aout_freebsd.c bioscd.c biosdisk.c biosmem.c biospnp.c biospci.c \ bootinfo.c comconsole.c devicename.c elf_freebsd.c gatea20.c \ i386_copy.c i386_module.c nullconsole.c pxe.c pxetramp.s \ time.c vidconsole.c CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../btx/lib \ -I${.CURDIR}/../../.. -I. BOOT_COMCONSOLE_PORT?= 0x3f8 CFLAGS+= -DCOMPORT=${BOOT_COMCONSOLE_PORT} BOOT_COMCONSOLE_SPEED?= 9600 CFLAGS+= -DCOMSPEED=${BOOT_COMCONSOLE_SPEED} # the location of libstand CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ .ifdef(BOOT_BIOSDISK_DEBUG) # Make the disk code more talkative CFLAGS+= -DDISK_DEBUG .endif # Include simple terminal emulation (cons25-compatible) CFLAGS+= -DTERM_EMU # Make "machine" required for all objects # (based on the more complete case in sys/i386/boot/Makefile.inc) ${SRCS:M*.c:R:S/$/.o/g}: machine # If it's not there, don't consider it a target .if exists(${.CURDIR}/../../../i386/include) beforedepend ${OBJS}: machine machine: ln -sf ${.CURDIR}/../../../i386/include machine .endif CLEANFILES+= machine .include Index: stable/4/sys/boot/pc98/btx/lib/Makefile =================================================================== --- stable/4/sys/boot/pc98/btx/lib/Makefile (revision 100376) +++ stable/4/sys/boot/pc98/btx/lib/Makefile (revision 100377) @@ -1,20 +1,16 @@ # $FreeBSD$ OBJS= btxcsu.o btxsys.o btxv86.o AFLAGS+= -elf LDFLAGS+= -elf -CLEANFILES+= crt0.o -INTERNALLIB= true -NOMAN= true -NOPIC= true -NOPROFILE= true +CLEANFILES+= crt0.o ${OBJS} all: crt0.o crt0.o: ${OBJS} ${LD} ${LDFLAGS} -i -o ${.TARGET} ${OBJS} .include .s.o: ${AS} ${AFLAGS} -o ${.TARGET} ${.IMPSRC} Index: stable/4/sys/boot/pc98/libpc98/Makefile =================================================================== --- stable/4/sys/boot/pc98/libpc98/Makefile (revision 100376) +++ stable/4/sys/boot/pc98/libpc98/Makefile (revision 100377) @@ -1,53 +1,50 @@ # $FreeBSD$ # LIB= pc98 -NOPIC= -NOPROFILE= INTERNALLIB= true -INTERNALSTATICLIB= true SRCS= aout_freebsd.c bioscd.c biosdisk.c biosmem.c biospnp.c biospci.c \ bootinfo.c comconsole.c devicename.c elf_freebsd.c gatea20.c \ i386_copy.c i386_module.c nullconsole.c pxe.c pxetramp.s \ time.c vidconsole.c .PATH: ${.CURDIR}/../../i386/libi386 CFLAGS+= -DPC98 CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../btx/lib \ -I${.CURDIR}/../../.. -I. -I${.CURDIR}/../../i386/libi386 BOOT_COMCONSOLE_PORT?= 0x238 CFLAGS+= -DCOMPORT=${BOOT_COMCONSOLE_PORT} BOOT_COMCONSOLE_SPEED?= 9600 CFLAGS+= -DCOMSPEED=${BOOT_COMCONSOLE_SPEED} # the location of libstand CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ .ifdef(BOOT_BIOSDISK_DEBUG) # Make the disk code more talkative CFLAGS+= -DDISK_DEBUG .endif # Include simple terminal emulation (cons25-compatible) CFLAGS+= -DTERM_EMU # Make "machine" required for all objects # (based on the more complete case in sys/i386/boot/Makefile.inc) ${SRCS:M*.c:R:S/$/.o/g}: machine # If it's not there, don't consider it a target .if exists(${.CURDIR}/../../../i386/include) beforedepend ${OBJS}: machine machine: ln -sf ${.CURDIR}/../../../i386/include machine .endif CLEANFILES+= machine .include Index: stable/4/usr.bin/tip/libacu/Makefile =================================================================== --- stable/4/usr.bin/tip/libacu/Makefile (revision 100376) +++ stable/4/usr.bin/tip/libacu/Makefile (revision 100377) @@ -1,12 +1,11 @@ +# $FreeBSD$ + LIB= acu +INTERNALLIB= YES CFLAGS+= -I${.CURDIR}/../tip SRCS= acucommon.c biz22.c courier.c df.c dn11.c hayes.c \ multitech.c t3000.c tod.c unidialer.c v3451.c v831.c ventel.c -NOPROFILE= yes $(OBJS): ${.CURDIR}/../tip/tipconf.h - -install: - @echo -n .include Index: stable/4/usr.sbin/amd/libamu/Makefile =================================================================== --- stable/4/usr.sbin/amd/libamu/Makefile (revision 100376) +++ stable/4/usr.sbin/amd/libamu/Makefile (revision 100377) @@ -1,34 +1,31 @@ # ex:ts=8 # # Makefile for amd # This file is under a "BSD" copyright (c) by David O'Brien 1998 # # $FreeBSD$ .PATH: ${.CURDIR}/../../../contrib/amd/libamu \ ${.CURDIR}/../../../contrib/amd/conf/transp \ ${.CURDIR}/../../../contrib/amd/conf/mtab \ ${.CURDIR}/../../../contrib/amd/conf/umount LIB= amu +INTERNALLIB= YES SRCS= hasmntopt.c misc_rpc.c mount_fs.c mtab.c nfs_prot_xdr.c \ util.c wire.c xutil.c # These would be links created by the GNU-style configure SRCS+= transp_sockets.c mtab_bsd.c umount_bsd44.c CFLAGS+= -I${.CURDIR}/../../../contrib/amd/libamu -NOMAN= noman - # Generated at compile time (replaces supplied xdr_func.c) SRCS+= nfs_prot_x.c CLEANFILES+= nfs_prot_x.c nfs_prot_x.c: ${NFS_PROT_X} ${RPCCOM} -c -DWANT_NFS3 ${NFS_PROT_X} -o ${.TARGET} - -install: .include Index: stable/4/usr.sbin/cron/lib/Makefile =================================================================== --- stable/4/usr.sbin/cron/lib/Makefile (revision 100376) +++ stable/4/usr.sbin/cron/lib/Makefile (revision 100377) @@ -1,12 +1,9 @@ -LIB= cron +# $FreeBSD$ +LIB= cron +INTERNALLIB= YES SRCS= entry.c env.c misc.c CFLAGS+=-I${.CURDIR}/../cron CFLAGS+=-DLOGIN_CAP -NOPIC= yes -NOPROFILE= yes - -install: - @echo -n .include Index: stable/4/usr.sbin/lpr/common_source/Makefile =================================================================== --- stable/4/usr.sbin/lpr/common_source/Makefile (revision 100376) +++ stable/4/usr.sbin/lpr/common_source/Makefile (revision 100377) @@ -1,17 +1,13 @@ # $FreeBSD$ # # Library of internal routines for the print spooler suite. # Originally these were compiled separately into each program, # but the library makes it much easier to modularize them. # LIB= lpr -NOPROFILE= noprofile -NOPIC= nopic -NOMAN= noman +INTERNALLIB= YES SRCS= common.c ctlinfo.c displayq.c net.c printcap.c request.c \ rmjob.c startdaemon.c - -install: .include Index: stable/4/usr.sbin/mrouted/common/Makefile =================================================================== --- stable/4/usr.sbin/mrouted/common/Makefile (revision 100376) +++ stable/4/usr.sbin/mrouted/common/Makefile (revision 100377) @@ -1,17 +1,12 @@ # $FreeBSD$ LIB= mrouted -NOPROFILE= yes -NOPIC= yes +INTERNALLIB= YES S= ${.CURDIR}/.. .PATH: $S CFLAGS+= -I$S SRCS= igmp.c inet.c kern.c -NOMAN= - -# nothing to install -install: .include Index: stable/4/usr.sbin/ntp/libntp/Makefile =================================================================== --- stable/4/usr.sbin/ntp/libntp/Makefile (revision 100376) +++ stable/4/usr.sbin/ntp/libntp/Makefile (revision 100377) @@ -1,32 +1,28 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../../contrib/ntp/libntp LIB= ntp -NOPROFILE= true INTERNALLIB= true -NOPIC= true -INTERNALSTATICLIB= true -NOMAN= true SRCS= a_md5encrypt.c adjtime.c atoint.c atolfp.c \ atouint.c audio.c authencrypt.c authkeys.c \ authparity.c authreadkeys.c authusekey.c binio.c \ buftvtots.c caljulian.c calleapwhen.c caltontp.c \ calyearstart.c clocktime.c clocktypes.c decodenetnum.c \ dofptoa.c dolfptoa.c emalloc.c findconfig.c \ fptoa.c fptoms.c getopt.c gpstolfp.c \ hextoint.c hextolfp.c humandate.c icom.c \ ieee754io.c inttoa.c iosignal.c lib_strbuf.c \ machines.c md5c.c memmove.c mfp_mul.c \ mfptoa.c mfptoms.c modetoa.c mstolfp.c \ msutotsf.c msyslog.c netof.c numtoa.c \ numtohost.c octtoint.c prettydate.c ranny.c \ recvbuff.c refnumtoa.c statestr.c syssignal.c \ systime.c tsftomsu.c tstotv.c tvtoa.c \ tvtots.c uglydate.c uinttoa.c utvtoa.c \ ymd2yd.c CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ .include Index: stable/4/usr.sbin/ntp/libparse/Makefile =================================================================== --- stable/4/usr.sbin/ntp/libparse/Makefile (revision 100376) +++ stable/4/usr.sbin/ntp/libparse/Makefile (revision 100377) @@ -1,19 +1,15 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../../contrib/ntp/libparse LIB= parse -NOPROFILE= true -NOPIC= true INTERNALLIB= true -INTERNALSTATICLIB= true -NOMAN= true SRCS= clk_computime.c clk_dcf7000.c clk_hopf6021.c clk_meinberg.c \ clk_rawdcf.c clk_rcc8000.c clk_schmid.c clk_trimtaip.c \ clk_trimtsip.c clk_varitext.c clk_wharton.c data_mbg.c \ info_trimble.c parse.c parse_conf.c trim_info.c CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ .include Index: stable/4/usr.sbin/pkg_install/lib/Makefile =================================================================== --- stable/4/usr.sbin/pkg_install/lib/Makefile (revision 100376) +++ stable/4/usr.sbin/pkg_install/lib/Makefile (revision 100377) @@ -1,16 +1,12 @@ # $FreeBSD$ LIB= install +INTERNALLIB= YES SRCS= file.c msg.c plist.c str.c exec.c global.c pen.c match.c \ deps.c version.c -NOPROFILE= yes -NOPIC= yes CFLAGS+= ${DEBUG} WARNS?= 2 - -install: - @echo -n .include