summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2007-09-17 11:43:13 +0000
committerMarc Espie <espie@cvs.openbsd.org>2007-09-17 11:43:13 +0000
commited1cb8f2270fb7814dc9993c9e3d17401088c8bd (patch)
tree64f69948b0405577876bfa362c9a5b13db54dc5c /usr.bin
parent9a9e407d3c80603e4fc0347ff0096e226518578b (diff)
remove prototypes that now live in engine.h, adjust suff.c accordingly
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/make/job.h6
-rw-r--r--usr.bin/make/make.h6
-rw-r--r--usr.bin/make/suff.c4
3 files changed, 4 insertions, 12 deletions
diff --git a/usr.bin/make/job.h b/usr.bin/make/job.h
index 15052fedddf..40004e05f2d 100644
--- a/usr.bin/make/job.h
+++ b/usr.bin/make/job.h
@@ -2,7 +2,7 @@
#define _JOB_H_
/* $OpenPackages$ */
-/* $OpenBSD: job.h,v 1.15 2004/04/07 13:11:36 espie Exp $ */
+/* $OpenBSD: job.h,v 1.16 2007/09/17 11:43:12 espie Exp $ */
/* $NetBSD: job.h,v 1.5 1996/11/06 17:59:10 christos Exp $ */
/*
@@ -46,16 +46,12 @@
* Definitions pertaining to the running of jobs in parallel mode.
*/
-extern void Job_Touch(GNode *, bool);
-extern bool Job_CheckCommands(GNode *,
- void (*abortProc )(char *, ...));
extern void Job_CatchChildren(bool);
extern void Job_CatchOutput(void);
extern void Job_Make(GNode *);
extern void Job_Init(int, int);
extern bool Job_Full(void);
extern bool Job_Empty(void);
-extern bool Job_ParseShell(const char *);
extern int Job_Finish(void);
#ifdef CLEANUP
extern void Job_End(void);
diff --git a/usr.bin/make/make.h b/usr.bin/make/make.h
index 61a72b2ee06..2b214fe2595 100644
--- a/usr.bin/make/make.h
+++ b/usr.bin/make/make.h
@@ -2,7 +2,7 @@
#define _MAKE_H_
/* $OpenPackages$ */
-/* $OpenBSD: make.h,v 1.33 2003/06/03 02:56:12 millert Exp $ */
+/* $OpenBSD: make.h,v 1.34 2007/09/17 11:43:12 espie Exp $ */
/* $NetBSD: make.h,v 1.15 1997/03/10 21:20:00 christos Exp $ */
/*
@@ -41,11 +41,7 @@
* from: @(#)make.h 8.3 (Berkeley) 6/13/95
*/
-extern void Make_TimeStamp(GNode *, GNode *);
-extern bool Make_OODate(GNode *);
-extern void Make_HandleUse(GNode *, GNode *);
extern void Make_Update(GNode *);
-extern void Make_DoAllVar(GNode *);
extern bool Make_Run(Lst);
#endif /* _MAKE_H_ */
diff --git a/usr.bin/make/suff.c b/usr.bin/make/suff.c
index 6fff700945e..c362329ee11 100644
--- a/usr.bin/make/suff.c
+++ b/usr.bin/make/suff.c
@@ -1,5 +1,5 @@
/* $OpenPackages$ */
-/* $OpenBSD: suff.c,v 1.68 2007/09/17 10:12:35 espie Exp $ */
+/* $OpenBSD: suff.c,v 1.69 2007/09/17 11:43:12 espie Exp $ */
/* $NetBSD: suff.c,v 1.13 1996/11/06 17:59:25 christos Exp $ */
/*
@@ -104,8 +104,8 @@
#include "lst.h"
#include "memory.h"
#include "gnode.h"
-#include "make.h"
#include "stats.h"
+#include "engine.h"
static LIST sufflist; /* Lst of suffixes */
#ifdef CLEANUP