From ec331e1c244e72aad5917cfe07ba3ff84f2671b6 Mon Sep 17 00:00:00 2001
From: Bjoern Michaelsen <b_michaelsen@openoffice.org>
Date: Fri, 7 May 2010 17:23:27 +0200
Subject: CWS gnumake2: dependencies for windows
---
soltools/mkdepend/def.h | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
(limited to 'soltools')
diff --git a/soltools/mkdepend/def.h b/soltools/mkdepend/def.h
index 9da82495f024..eaa1f506e263 100644
--- a/soltools/mkdepend/def.h
+++ b/soltools/mkdepend/def.h
@@ -60,8 +60,9 @@ in this Software without prior written authorization from the X Consortium.
#endif
#define MAXDEFINES 512
-#define MAXFILES 2048 /* Increased from 512. -mcafee */
- /* Increased from 1024. -mh */
+#define MAXFILES 1<<16 /* Increased from 512. -mcafee */
+ /* Increased from 1024. -mh */
+ /* Increased from 2048. -b_michaelsen */
#define MAXDIRS 64
#define SYMHASHSEED 131 /* 131 1313 13131 ... */
#define SYMHASHMEMBERS 64 /* must be 2^x to work right */
--
cgit
From ad41732f4a707be8b2b3f622574176958ac4039f Mon Sep 17 00:00:00 2001
From: Bjoern Michaelsen <b_michaelsen@openoffice.org>
Date: Mon, 10 May 2010 14:30:37 +0200
Subject: CWS gnumake2: fixing mkdepend fix for gcc, thanks ause
---
soltools/mkdepend/def.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'soltools')
diff --git a/soltools/mkdepend/def.h b/soltools/mkdepend/def.h
index eaa1f506e263..943e81dc0915 100644
--- a/soltools/mkdepend/def.h
+++ b/soltools/mkdepend/def.h
@@ -60,9 +60,9 @@ in this Software without prior written authorization from the X Consortium.
#endif
#define MAXDEFINES 512
-#define MAXFILES 1<<16 /* Increased from 512. -mcafee */
- /* Increased from 1024. -mh */
- /* Increased from 2048. -b_michaelsen */
+#define MAXFILES ( 1<<16 ) /* Increased from 512. -mcafee */
+ /* Increased from 1024. -mh */
+ /* Increased from 2048. -b_michaelsen */
#define MAXDIRS 64
#define SYMHASHSEED 131 /* 131 1313 13131 ... */
#define SYMHASHMEMBERS 64 /* must be 2^x to work right */
--
cgit
From e09da93efa3046dea97be4490f30942cae5f16bc Mon Sep 17 00:00:00 2001
From: Bjoern Michaelsen <b_michaelsen@openoffice.org>
Date: Mon, 13 Dec 2010 18:21:24 +0100
Subject: gnumake2: fixing broken makedepend behaviour
---
soltools/mkdepend/include.c | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
(limited to 'soltools')
diff --git a/soltools/mkdepend/include.c b/soltools/mkdepend/include.c
index 45d0730393a3..4446489ba259 100644
--- a/soltools/mkdepend/include.c
+++ b/soltools/mkdepend/include.c
@@ -71,15 +71,18 @@ struct inclist *inc_path(file, include, dot, incCollection)
* If the path was surrounded by "" or is an absolute path,
* then check the exact path provided.
*/
- if (!found && (dot || *include == '/')) {
-
- if ((exists_path(incCollection, include)) && stat(include, &st) == 0 && !( st.st_mode & S_IFDIR)) {
- ip = newinclude(include, include);
- found = TRUE;
- }
- else if (show_where_not)
- warning1("\tnot in %s\n", include);
- }
+// FIXME: creates duplicates in the dependency files if absolute paths are
+// given, which certainly is not the intended behavior. Also it slows down
+// makedepend performance considerably.
+// if (!found && (dot || *include == '/')) {
+//
+// if ((exists_path(incCollection, include)) && stat(include, &st) == 0 && !( st.st_mode & S_IFDIR)) {
+// ip = newinclude(include, include);
+// found = TRUE;
+// }
+// else if (show_where_not)
+// warning1("\tnot in %s\n", include);
+// }
/*
* See if this include file is in the directory of the
--
cgit