more dead code: we always define LIBRARIES and INCLUDES

3 files changed, 3 insertions, 23 deletions

diff --git a/usr.bin/make/arch.c b/usr.bin/make/arch.c
index 86a5396b37f..7617dc10803 100644
--- a/usr.bin/make/arch.c
+++ b/usr.bin/make/arch.c
@@ -1,5 +1,5 @@
 /*	$OpenPackages$ */
-/*	$OpenBSD: arch.c,v 1.61 2007/09/16 09:46:14 espie Exp $ */
+/*	$OpenBSD: arch.c,v 1.62 2007/09/16 09:49:24 espie Exp $ */
 /*	$NetBSD: arch.c,v 1.17 1996/11/06 17:58:59 christos Exp $	*/
 
 /*
@@ -963,11 +963,7 @@ Arch_FindLib(GNode *gn, Lst path)
 
     free(libName);
 
-#ifdef LIBRARIES
     Varq_Set(TARGET_INDEX, gn->name, gn);
-#else
-    Varq_Set(TARGET_INDEX, gn->path == NULL ? gn->name : gn->path, gn);
-#endif /* LIBRARIES */
 }
 
 /*-
diff --git a/usr.bin/make/config.h b/usr.bin/make/config.h
index 47b959d545b..4bde350f9ea 100644
--- a/usr.bin/make/config.h
+++ b/usr.bin/make/config.h
@@ -2,7 +2,7 @@
 #define CONFIG_H
 
 /*	$OpenPackages$ */
-/*	$OpenBSD: config.h,v 1.15 2007/09/16 09:46:14 espie Exp $	*/
+/*	$OpenBSD: config.h,v 1.16 2007/09/16 09:49:24 espie Exp $	*/
 /*	$NetBSD: config.h,v 1.7 1996/11/06 17:59:03 christos Exp $	*/
 
 /*
@@ -56,18 +56,6 @@
 #define DEFMAXLOCAL	1
 
 /*
- * INCLUDES
- * LIBRARIES
- *	These control the handling of the .INCLUDES and .LIBS variables.
- *	If INCLUDES is defined, the .INCLUDES variable will be filled
- *	from the search paths of those suffixes which are marked by
- *	.INCLUDES dependency lines. Similarly for LIBRARIES and .LIBS
- *	See suff.c for more details.
- */
-#define INCLUDES
-#define LIBRARIES
-
-/*
  * LIBSUFF
  *	Is the suffix used to denote libraries and is used by the Suff module
  *	to find the search path on which to seek any -l<xx> targets.
diff --git a/usr.bin/make/suff.c b/usr.bin/make/suff.c
index 35c273b1e71..2b43ed72aa2 100644
--- a/usr.bin/make/suff.c
+++ b/usr.bin/make/suff.c
@@ -1,5 +1,5 @@
 /*	$OpenPackages$ */
-/*	$OpenBSD: suff.c,v 1.61 2007/09/16 09:46:14 espie Exp $ */
+/*	$OpenBSD: suff.c,v 1.62 2007/09/16 09:49:24 espie Exp $ */
 /*	$NetBSD: suff.c,v 1.13 1996/11/06 17:59:25 christos Exp $	*/
 
 /*
@@ -777,16 +777,12 @@ Suff_DoPaths(void)
     for (ln = Lst_First(&sufflist); ln != NULL; ln = Lst_Adv(ln)) {
 	s = (Suff *)Lst_Datum(ln);
 	if (!Lst_IsEmpty(&s->searchPath)) {
-#ifdef INCLUDES
 	    if (s->flags & SUFF_INCLUDE) {
 		Dir_Concat(&inIncludes, &s->searchPath);
 	    }
-#endif /* INCLUDES */
-#ifdef LIBRARIES
 	    if (s->flags & SUFF_LIBRARY) {
 		Dir_Concat(&inLibs, &s->searchPath);
 	    }
-#endif /* LIBRARIES */
 	    Dir_Concat(&s->searchPath, dirSearchPath);
 	} else
 	    Lst_Clone(&s->searchPath, dirSearchPath, Dir_CopyDir);