diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2010-12-17 12:43:22 +0100 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2010-12-17 12:43:22 +0100 |
| commit | 10f546f9a45f826b0ea48a629e4885635e93863d (patch) | |
| tree | 259672db68bf3aad34b4ea047fef26d2201e6074 /soltools/mkdepend | |
| parent | 491d808492fc31c5d2e6cc28447c8815af9d3806 (diff) | |
| parent | fee2eef97c1e329d27e69244258e5bde5ec06679 (diff) | |
CWS-TOOLING: integrate CWS gnumake2
Diffstat (limited to 'soltools/mkdepend')
| -rw-r--r-- | soltools/mkdepend/def.h | 5 | ||||
| -rw-r--r-- | soltools/mkdepend/include.c | 21 |
2 files changed, 15 insertions, 11 deletions
diff --git a/soltools/mkdepend/def.h b/soltools/mkdepend/def.h index ac04357212e2..4133326ddb70 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 */ 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 |