Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix building bsd/.. after using make obj #127

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
*.o
dma
dma-mbox-create
aliases_parse.c
aliases_parse.h
aliases_scan.c
# Omit binaries.
./dma
./dma-mbox-create
./aliases_parse.c
./aliases_parse.h
./aliases_scan.c
# BSD-related...
# - Omit files created on FreeBSD as part of bsd.prog.mk.
*.depend
*.debug
*.full
# - Omit files created in bsd if `make obj` isn't called first.
bsd/dma/dma*
bsd/dma-mbox-create/dma-mbox-create*
6 changes: 4 additions & 2 deletions bsd/dma-mbox-create/Makefile
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
#

version!= sh ../../get-version.sh ../../VERSION
DMA_SRCTOP= ${.CURDIR:H:H}

.include "../version.mk"

CFLAGS+= -I${.CURDIR}/../..
CFLAGS+= -DHAVE_REALLOCF -DHAVE_STRLCPY -DHAVE_GETPROGNAME
CFLAGS+= -DLIBEXEC_PATH='"${LIBEXEC}"' -DDMA_VERSION='"${version}"'
CFLAGS+= -DCONF_PATH='"${CONFDIR}"'

PROG= dma-mbox-create
.PATH: ${.CURDIR}/../..
.PATH: ${DMA_SRCTOP}
SRCS+= dma-mbox-create.c
NOMAN=
MK_MAN= no
Expand Down
6 changes: 4 additions & 2 deletions bsd/dma/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
# $DragonFly: src/libexec/dma/Makefile,v 1.5 2008/09/19 00:36:57 corecode Exp $
#

version!= sh ../../get-version.sh ../../VERSION
DMA_SRCTOP= ${.CURDIR:H:H}

.include "../version.mk"

CFLAGS+= -I${.CURDIR}/../..
CFLAGS+= -DHAVE_REALLOCF -DHAVE_STRLCPY -DHAVE_GETPROGNAME
Expand All @@ -12,7 +14,7 @@ DPADD= ${LIBSSL} ${LIBCRYPTO}
LDADD= -lssl -lcrypto

PROG= dma
.PATH: ${.CURDIR}/../..
.PATH: ${DMA_SRCTOP}
SRCS= aliases_parse.y aliases_scan.l base64.c conf.c crypto.c
SRCS+= dma.c dns.c local.c mail.c net.c spool.c util.c
MAN= dma.8
Expand Down
3 changes: 3 additions & 0 deletions bsd/version.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
SHELL?= /bin/sh

version!= ${SHELL} ${DMA_SRCTOP}/get-version.sh ${DMA_SRCTOP}/VERSION