diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile | 10 | ||||
| -rw-r--r-- | lib/libbind/Makefile | 86 | ||||
| -rw-r--r-- | lib/libisc/Makefile | 140 |
3 files changed, 5 insertions, 231 deletions
diff --git a/lib/Makefile b/lib/Makefile index 043963702db8..f364621a3d59 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -24,15 +24,15 @@ SUBDIR= ${_csu} libcom_err libcrypt libkvm msun libmd libncurses \ libnetgraph libradius librpcsvc libsbuf libtacplus libutil \ - ${_libypclnt} ${_compat} libalias libarchive ${_libatm} ${_libbind} \ - ${_libbluetooth} libbsnmp libbz2 libc ${_libc_r} \ + ${_libypclnt} ${_compat} libalias libarchive ${_libatm} \ + libbegemot ${_libbluetooth} libbsnmp libbz2 libc ${_libc_r} \ libcalendar libcam libcompat libdevinfo libdevstat ${_libdisk} \ libedit libexpat libfetch libform libftpio libgeom ${_libio} libipsec \ - libipx libisc libkiconv libmagic libmenu ${_libmilter} ${_libmp} \ + libipx libkiconv libmagic libmenu ${_libmilter} ${_libmp} \ ${_libncp} ${_libngatm} libopie libpam libpanel libpcap \ ${_libpthread} ${_libsdp} ${_libsm} ${_libsmb} ${_libsmdb} \ ${_libsmutil} libstand libtelnet ${_libthr} ${_libthread_db} libufs \ - libugidfw ${_libusbhid} ${_libvgl} libwrap libxpg4 liby libz + libugidfw ${_libusbhid} ${_libvgl} libwrap libxpg4 liby libz ${_bind} .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf) _csu=csu/${MACHINE_ARCH}-elf @@ -48,7 +48,7 @@ _libngatm= libngatm .endif .if !defined(NO_BIND) -_libbind= libbind +_bind= bind .endif .if !defined(NO_BLUETOOTH) diff --git a/lib/libbind/Makefile b/lib/libbind/Makefile deleted file mode 100644 index fcbddf345ffd..000000000000 --- a/lib/libbind/Makefile +++ /dev/null @@ -1,86 +0,0 @@ -# $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 - -.include <bsd.lib.mk> - -# XXX contrib/bind/include/* must not override any real system includes -CFLAGS:= -I${BIND_DIR}/port/freebsd/include -I${BIND_DIR}/include ${CFLAGS} diff --git a/lib/libisc/Makefile b/lib/libisc/Makefile deleted file mode 100644 index ca4d267502be..000000000000 --- a/lib/libisc/Makefile +++ /dev/null @@ -1,140 +0,0 @@ -# $FreeBSD$ - -BIND_DIR= ${.CURDIR}/../../contrib/bind - -LIB= isc -SHLIB_MAJOR= 1 - -.PATH: ${BIND_DIR}/lib/isc -SRCS= assertions.c ev_connects.c ev_files.c ev_streams.c \ - ev_timers.c ev_waits.c eventlib.c heap.c hex.c tree.c \ - logging.c memcluster.c bitncmp.c ctl_clnt.c ctl_p.c \ - ctl_srvr.c movefile.c - -# contrib/bind/include/* must not override any real system includes -CFLAGS+= -I${BIND_DIR}/port/freebsd/include -I${BIND_DIR}/include -CFLAGS+= -Wall -Wmissing-prototypes - -INCS= ${BIND_DIR}/include/isc/assertions.h \ - ${BIND_DIR}/include/isc/ctl.h \ - ${BIND_DIR}/include/isc/dst.h \ - ${BIND_DIR}/include/isc/eventlib.h \ - ${BIND_DIR}/include/isc/heap.h \ - ${BIND_DIR}/include/isc/irpmarshall.h \ - ${BIND_DIR}/include/isc/list.h \ - ${BIND_DIR}/include/isc/logging.h \ - ${BIND_DIR}/include/isc/memcluster.h \ - ${BIND_DIR}/include/isc/misc.h \ - ${BIND_DIR}/include/isc/tree.h -INCSDIR= ${INCLUDEDIR}/isc - -MAN= assertions.3 bitncmp.3 eventlib.3 heap.3 \ - logging.3 memcluster.3 tree.3 -CLEANFILES+= ${MAN} - -MLINKS+= assertions.3 ENSURE.3 \ - assertions.3 ENSURE_ERR.3 \ - assertions.3 INSIST.3 \ - assertions.3 INSIST_ERR.3 \ - assertions.3 INVARIANT.3 \ - assertions.3 INVARIANT_ERR.3 \ - assertions.3 REQUIRE.3 \ - assertions.3 REQUIRE_ERR.3 \ - assertions.3 assertion_type_to_text.3 \ - assertions.3 set_assertion_failure_callback.3 \ - eventlib.3 evAddTime.3 \ - eventlib.3 evCancelConn.3 \ - eventlib.3 evCancelRW.3 \ - eventlib.3 evClearIdleTimer.3 \ - eventlib.3 evClearTimer.3 \ - eventlib.3 evCmpTime.3 \ - eventlib.3 evConnFunc.3 \ - eventlib.3 evConnect.3 \ - eventlib.3 evConsIovec.3 \ - eventlib.3 evConsTime.3 \ - eventlib.3 evCreate.3 \ - eventlib.3 evDefer.3 \ - eventlib.3 evDeselectFD.3 \ - eventlib.3 evDestroy.3 \ - eventlib.3 evDispatch.3 \ - eventlib.3 evDo.3 \ - eventlib.3 evDrop.3 \ - eventlib.3 evFileFunc.3 \ - eventlib.3 evGetNext.3 \ - eventlib.3 evHold.3 \ - eventlib.3 evInitID.3 \ - eventlib.3 evLastEventTime.3 \ - eventlib.3 evListen.3 \ - eventlib.3 evMainLoop.3 \ - eventlib.3 evNowTime.3 \ - eventlib.3 evPrintf.3 \ - eventlib.3 evRead.3 \ - eventlib.3 evResetTimer.3 \ - eventlib.3 evSelectFD.3 \ - eventlib.3 evSetDebug.3 \ - eventlib.3 evSetIdleTimer.3 \ - eventlib.3 evSetTimer.3 \ - eventlib.3 evStreamFunc.3 \ - eventlib.3 evSubTime.3 \ - eventlib.3 evTestID.3 \ - eventlib.3 evTimeRW.3 \ - eventlib.3 evTimeSpec.3 \ - eventlib.3 evTimeVal.3 \ - eventlib.3 evTimerFunc.3 \ - eventlib.3 evTouchIdleTimer.3 \ - eventlib.3 evTryAccept.3 \ - eventlib.3 evUnhold.3 \ - eventlib.3 evUntimeRW.3 \ - eventlib.3 evUnwait.3 \ - eventlib.3 evWaitFor.3 \ - eventlib.3 evWaitFunc.3 \ - eventlib.3 evWrite.3 \ - heap.3 heap_decreased.3 \ - heap.3 heap_delete.3 \ - heap.3 heap_element.3 \ - heap.3 heap_for_each.3 \ - heap.3 heap_free.3 \ - heap.3 heap_increased.3 \ - heap.3 heap_insert.3 \ - heap.3 heap_new.3 \ - logging.3 log_add_channel.3 \ - logging.3 log_category_is_active.3 \ - logging.3 log_close_stream.3 \ - logging.3 log_dec_references.3 \ - logging.3 log_free_channel.3 \ - logging.3 log_free_context.3 \ - logging.3 log_get_filename.3 \ - logging.3 log_get_stream.3 \ - logging.3 log_inc_references.3 \ - logging.3 log_new_context.3 \ - logging.3 log_new_file_channel.3 \ - logging.3 log_new_null_channel.3 \ - logging.3 log_new_syslog_channel.3 \ - logging.3 log_open_stream.3 \ - logging.3 log_option.3 \ - logging.3 log_remove_channel.3 \ - logging.3 log_set_file_owner.3 \ - logging.3 log_vwrite.3 \ - logging.3 log_write.3 \ - memcluster.3 memget.3 \ - memcluster.3 memput.3 \ - memcluster.3 memstats.3 \ - tree.3 tree_add.3 \ - tree.3 tree_delete.3 \ - tree.3 tree_init.3 \ - tree.3 tree_mung.3 \ - tree.3 tree_srch.3 \ - tree.3 tree_trav.3 - -.include <bsd.lib.mk> - -# This has to come after the .include <bsd.lib.mk>. Not sure why. - -.SUFFIXES: .mdoc .3 -.mdoc.3: - sed -e 's/@INDOT@//g' \ - -e 's/@SYSCALL_EXT@/2/g' \ - -e 's/@SYS_OPS_EXT@/8/g' \ - -e 's/^.Fd #include .*heap.h.*/.Fd #include <isc\/heap.h>/' \ - < ${.ALLSRC} > ${.TARGET} - |