From 095dae9d7a615448609268e249bc2d9c380dd200 Mon Sep 17 00:00:00 2001 From: Gregory Neil Shapiro Date: Sun, 17 Feb 2002 22:05:07 +0000 Subject: [PATCH] Update build infrastructure for sendmail 8.12. --- bin/rmail/Makefile | 20 +++++++++++++------- lib/libsmdb/Makefile | 7 ++++++- lib/libsmutil/Makefile | 9 +++++++-- libexec/mail.local/Makefile | 20 +++++++++++++------- libexec/smrsh/Makefile | 20 +++++++++++++------- usr.bin/vacation/Makefile | 20 +++++++++++++++++--- usr.sbin/mailstats/Makefile | 21 ++++++++++++++++++--- usr.sbin/makemap/Makefile | 20 +++++++++++++++++--- usr.sbin/praliases/Makefile | 20 +++++++++++++++++--- 9 files changed, 121 insertions(+), 36 deletions(-) diff --git a/bin/rmail/Makefile b/bin/rmail/Makefile index 2571512af9f7..485d153d6af3 100644 --- a/bin/rmail/Makefile +++ b/bin/rmail/Makefile @@ -9,19 +9,22 @@ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail PROG= rmail SRCS= rmail.c MAN= rmail.8 -CFLAGS+=-I${SENDMAIL_DIR}/include +CFLAGS+=-I${SENDMAIL_DIR}/include -I. WARNS= 0 WFORMAT=0 -.if exists(${.OBJDIR}/../../lib/libsmutil) -LIBSMUTILDIR:= ${.OBJDIR}/../../lib/libsmutil +.if exists(${.OBJDIR}/../../lib/libsm) +LIBSMDIR:= ${.OBJDIR}/../../lib/libsm .else -LIBSMUTILDIR!= cd ${.CURDIR}/../../lib/libsmutil; make -V .OBJDIR +LIBSMDIR!= cd ${.CURDIR}/../../lib/libsm; make -V .OBJDIR .endif -LIBSMUTIL:= ${LIBSMUTILDIR}/libsmutil.a +LIBSM:= ${LIBSMDIR}/libsm.a -DPADD= ${LIBSMUTIL} -LDADD= ${LIBSMUTIL} +DPADD= ${LIBSM} +LDADD= ${LIBSM} + +SRCS+= sm_os.h +CLEANFILES+=sm_os.h # User customizations to the sendmail build environment CFLAGS+=${SENDMAIL_CFLAGS} @@ -36,4 +39,7 @@ LDFLAGS+=${SENDMAIL_LDFLAGS} # Not much point this being static. It calls a shared sendmail... NOSHARED?= NO +sm_os.h: + ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h + .include diff --git a/lib/libsmdb/Makefile b/lib/libsmdb/Makefile index 271dc67ad57f..816a1ec3d504 100644 --- a/lib/libsmdb/Makefile +++ b/lib/libsmdb/Makefile @@ -5,7 +5,7 @@ MAINTAINER= gshapiro@FreeBSD.org SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail .PATH: ${SENDMAIL_DIR}/libsmdb -CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include +CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I. CFLAGS+=-DNEWDB -DNOT_SENDMAIL # User customizations to the sendmail build environment @@ -13,10 +13,15 @@ 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 diff --git a/lib/libsmutil/Makefile b/lib/libsmutil/Makefile index 54560b7cc1e8..fe65a06ee7da 100644 --- a/lib/libsmutil/Makefile +++ b/lib/libsmutil/Makefile @@ -5,7 +5,7 @@ MAINTAINER= gshapiro@FreeBSD.org SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail .PATH: ${SENDMAIL_DIR}/libsmutil -CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include +CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I. CFLAGS+=-DNEWDB -DNIS -DMAP_REGEX -DNOT_SENDMAIL # User customizations to the sendmail build environment @@ -13,10 +13,15 @@ CFLAGS+=${SENDMAIL_CFLAGS} LIB= smutil -SRCS+= debug.c errstring.c lockfile.c safefile.c snprintf.c strl.c +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 diff --git a/libexec/mail.local/Makefile b/libexec/mail.local/Makefile index 4746526e41e2..5357d901da21 100644 --- a/libexec/mail.local/Makefile +++ b/libexec/mail.local/Makefile @@ -9,18 +9,21 @@ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail PROG= mail.local SRCS= mail.local.c MAN= mail.local.8 -CFLAGS+=-I${SENDMAIL_DIR}/include +CFLAGS+=-I${SENDMAIL_DIR}/include -I. WFORMAT=0 -.if exists(${.OBJDIR}/../../lib/libsmutil) -LIBSMUTILDIR:= ${.OBJDIR}/../../lib/libsmutil +.if exists(${.OBJDIR}/../../lib/libsm) +LIBSMDIR:= ${.OBJDIR}/../../lib/libsm .else -LIBSMUTILDIR!= cd ${.CURDIR}/../../lib/libsmutil; make -V .OBJDIR +LIBSMDIR!= cd ${.CURDIR}/../../lib/libsm; make -V .OBJDIR .endif -LIBSMUTIL:= ${LIBSMUTILDIR}/libsmutil.a +LIBSM:= ${LIBSMDIR}/libsm.a -DPADD= ${LIBSMUTIL} -LDADD= ${LIBSMUTIL} +DPADD= ${LIBSM} +LDADD= ${LIBSM} + +SRCS+= sm_os.h +CLEANFILES+=sm_os.h # User customizations to the sendmail build environment CFLAGS+=${SENDMAIL_CFLAGS} @@ -28,4 +31,7 @@ DPADD+=${SENDMAIL_DPADD} LDADD+=${SENDMAIL_LDADD} LDFLAGS+=${SENDMAIL_LDFLAGS} +sm_os.h: + ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h + .include diff --git a/libexec/smrsh/Makefile b/libexec/smrsh/Makefile index f34a4cf75806..22f3a78e6852 100644 --- a/libexec/smrsh/Makefile +++ b/libexec/smrsh/Makefile @@ -9,17 +9,20 @@ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail PROG= smrsh SRCS= smrsh.c MAN= smrsh.8 -CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include +CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I. -.if exists(${.OBJDIR}/../../lib/libsmutil) -LIBSMUTILDIR:= ${.OBJDIR}/../../lib/libsmutil +.if exists(${.OBJDIR}/../../lib/libsm) +LIBSMDIR:= ${.OBJDIR}/../../lib/libsm .else -LIBSMUTILDIR!= cd ${.CURDIR}/../../lib/libsmutil; make -V .OBJDIR +LIBSMDIR!= cd ${.CURDIR}/../../lib/libsm; make -V .OBJDIR .endif -LIBSMUTIL:= ${LIBSMUTILDIR}/libsmutil.a +LIBSM:= ${LIBSMDIR}/libsm.a -DPADD= ${LIBSMUTIL} -LDADD= ${LIBSMUTIL} +DPADD= ${LIBSM} +LDADD= ${LIBSM} + +SRCS+= sm_os.h +CLEANFILES+=sm_os.h # User customizations to the sendmail build environment CFLAGS+=${SENDMAIL_CFLAGS} @@ -27,4 +30,7 @@ DPADD+=${SENDMAIL_DPADD} LDADD+=${SENDMAIL_LDADD} LDFLAGS+=${SENDMAIL_LDFLAGS} +sm_os.h: + ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h + .include diff --git a/usr.bin/vacation/Makefile b/usr.bin/vacation/Makefile index 9ac29e06fc8b..fcaf946eb6b4 100644 --- a/usr.bin/vacation/Makefile +++ b/usr.bin/vacation/Makefile @@ -6,10 +6,18 @@ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail .PATH: ${SENDMAIL_DIR}/vacation PROG= vacation -CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include +SRCS= vacation.c +CFLAGS+=-I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I. CFLAGS+=-DNEWDB -DNOT_SENDMAIL CFLAGS+=-D_FFR_LISTDB -D_FFR_DEBUG +.if exists(${.OBJDIR}/../../lib/libsm) +LIBSMDIR:= ${.OBJDIR}/../../lib/libsm +.else +LIBSMDIR!= cd ${.CURDIR}/../../lib/libsm; make -V .OBJDIR +.endif +LIBSM:= ${LIBSMDIR}/libsm.a + .if exists(${.OBJDIR}/../../lib/libsmdb) LIBSMDBDIR:= ${.OBJDIR}/../../lib/libsmdb .else @@ -24,8 +32,11 @@ LIBSMUTILDIR!= cd ${.CURDIR}/../../lib/libsmutil; make -V .OBJDIR .endif LIBSMUTIL:= ${LIBSMUTILDIR}/libsmutil.a -DPADD= ${LIBSMDB} ${LIBSMUTIL} -LDADD= ${LIBSMDB} ${LIBSMUTIL} +DPADD= ${LIBSMDB} ${LIBSMUTIL} ${LIBSM} +LDADD= ${LIBSMDB} ${LIBSMUTIL} ${LIBSM} + +SRCS+= sm_os.h +CLEANFILES+=sm_os.h # User customizations to the sendmail build environment CFLAGS+=${SENDMAIL_CFLAGS} @@ -33,4 +44,7 @@ DPADD+=${SENDMAIL_DPADD} LDADD+=${SENDMAIL_LDADD} LDFLAGS+=${SENDMAIL_LDFLAGS} +sm_os.h: + ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h + .include diff --git a/usr.sbin/mailstats/Makefile b/usr.sbin/mailstats/Makefile index 3cef65b23a86..301691d8895d 100644 --- a/usr.sbin/mailstats/Makefile +++ b/usr.sbin/mailstats/Makefile @@ -7,9 +7,18 @@ SENDMAIL_DIR= ${.CURDIR}/../../contrib/sendmail .PATH: ${SENDMAIL_DIR}/mailstats PROG= mailstats +SRCS= mailstats.c MAN= mailstats.8 -CFLAGS+= -I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -DNOT_SENDMAIL +CFLAGS+= -I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I. +CFLAGS+= -DNOT_SENDMAIL + +.if exists(${.OBJDIR}/../../lib/libsm) +LIBSMDIR:= ${.OBJDIR}/../../lib/libsm +.else +LIBSMDIR!= cd ${.CURDIR}/../../lib/libsm; make -V .OBJDIR +.endif +LIBSM:= ${LIBSMDIR}/libsm.a .if exists(${.OBJDIR}/../../lib/libsmutil) LIBSMUTILDIR:= ${.OBJDIR}/../../lib/libsmutil @@ -18,8 +27,11 @@ LIBSMUTILDIR!= cd ${.CURDIR}/../../lib/libsmutil; make -V .OBJDIR .endif LIBSMUTIL:= ${LIBSMUTILDIR}/libsmutil.a -DPADD= ${LIBSMUTIL} -LDADD= ${LIBSMUTIL} +DPADD= ${LIBSMUTIL} ${LIBSM} +LDADD= ${LIBSMUTIL} ${LIBSM} + +SRCS+= sm_os.h +CLEANFILES+=sm_os.h # User customizations to the sendmail build environment CFLAGS+= ${SENDMAIL_CFLAGS} @@ -27,4 +39,7 @@ DPADD+= ${SENDMAIL_DPADD} LDADD+= ${SENDMAIL_LDADD} LDFLAGS+= ${SENDMAIL_LDFLAGS} +sm_os.h: + ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h + .include diff --git a/usr.sbin/makemap/Makefile b/usr.sbin/makemap/Makefile index b14ef27e7f78..15219fd45110 100644 --- a/usr.sbin/makemap/Makefile +++ b/usr.sbin/makemap/Makefile @@ -7,11 +7,19 @@ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail .PATH: ${SENDMAIL_DIR}/makemap PROG= makemap +SRCS= makemap.c MAN= makemap.8 -CFLAGS+= -I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include +CFLAGS+= -I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I. CFLAGS+= -DNEWDB -DNOT_SENDMAIL +.if exists(${.OBJDIR}/../../lib/libsm) +LIBSMDIR:= ${.OBJDIR}/../../lib/libsm +.else +LIBSMDIR!= cd ${.CURDIR}/../../lib/libsm; make -V .OBJDIR +.endif +LIBSM:= ${LIBSMDIR}/libsm.a + .if exists(${.OBJDIR}/../../lib/libsmdb) LIBSMDBDIR:= ${.OBJDIR}/../../lib/libsmdb .else @@ -26,8 +34,11 @@ LIBSMUTILDIR!= cd ${.CURDIR}/../../lib/libsmutil; make -V .OBJDIR .endif LIBSMUTIL:= ${LIBSMUTILDIR}/libsmutil.a -DPADD= ${LIBSMDB} ${LIBSMUTIL} -LDADD= ${LIBSMDB} ${LIBSMUTIL} +DPADD= ${LIBSMDB} ${LIBSMUTIL} ${LIBSM} +LDADD= ${LIBSMDB} ${LIBSMUTIL} ${LIBSM} + +SRCS+= sm_os.h +CLEANFILES+=sm_os.h # User customizations to the sendmail build environment CFLAGS+=${SENDMAIL_CFLAGS} @@ -35,4 +46,7 @@ DPADD+=${SENDMAIL_DPADD} LDADD+=${SENDMAIL_LDADD} LDFLAGS+=${SENDMAIL_LDFLAGS} +sm_os.h: + ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h + .include diff --git a/usr.sbin/praliases/Makefile b/usr.sbin/praliases/Makefile index 5ed8869aa6c5..0b99a8e96c30 100644 --- a/usr.sbin/praliases/Makefile +++ b/usr.sbin/praliases/Makefile @@ -7,11 +7,19 @@ SENDMAIL_DIR= ${.CURDIR}/../../contrib/sendmail .PATH: ${SENDMAIL_DIR}/praliases PROG= praliases +SRCS= praliases.c MAN= praliases.8 -CFLAGS+= -I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include +CFLAGS+= -I${SENDMAIL_DIR}/src -I${SENDMAIL_DIR}/include -I. CFLAGS+= -DNEWDB -DNOT_SENDMAIL +.if exists(${.OBJDIR}/../../lib/libsm) +LIBSMDIR:= ${.OBJDIR}/../../lib/libsm +.else +LIBSMDIR!= cd ${.CURDIR}/../../lib/libsm; make -V .OBJDIR +.endif +LIBSM:= ${LIBSMDIR}/libsm.a + .if exists(${.OBJDIR}/../../lib/libsmdb) LIBSMDBDIR:= ${.OBJDIR}/../../lib/libsmdb .else @@ -26,8 +34,11 @@ LIBSMUTILDIR!= cd ${.CURDIR}/../../lib/libsmutil; make -V .OBJDIR .endif LIBSMUTIL:= ${LIBSMUTILDIR}/libsmutil.a -DPADD= ${LIBSMDB} ${LIBSMUTIL} -LDADD= ${LIBSMDB} ${LIBSMUTIL} +DPADD= ${LIBSMDB} ${LIBSMUTIL} ${LIBSM} +LDADD= ${LIBSMDB} ${LIBSMUTIL} ${LIBSM} + +SRCS+= sm_os.h +CLEANFILES+=sm_os.h # User customizations to the sendmail build environment CFLAGS+= ${SENDMAIL_CFLAGS} @@ -35,4 +46,7 @@ LDFLAGS+=${SENDMAIL_LDFLAGS} DPADD+= ${SENDMAIL_DPADD} LDADD+= ${SENDMAIL_LDADD} +sm_os.h: + ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h + .include