summaryrefslogtreecommitdiff
path: root/soltools
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2011-03-08 22:31:15 -0600
committerNorbert Thiebaud <nthiebaud@gmail.com>2011-03-08 22:31:15 -0600
commit589f7ed2b46f7a3b292029bf5d9df2269dbabd41 (patch)
treef85465068f4e1963b49116ed51209a21ffcc3976 /soltools
parentf0e5895d5baa04826d1884fc4720c6180f2eda04 (diff)
parentb608b4df11d30f4ed968a44602b9fd438b896d47 (diff)
Merge remote branch 'origin/feature/gnumake2.1' into integration/dev300_m101
* origin/feature/gnumake2.1: (202 commits) Revert "starmath need to have _DLL_ defined, even on MacOS" tweak library name on MacOS starmath need to have _DLL_ defined, even on MacOS add helper to set-up the libraries env, to run executable during build the startmath module in Module_ooo must use the name of the directory add starmath libraries to Repository.mk make linkoo scan the solver too, for Norbert's gnumake work -Wunitialized is not compatible with -DDEBUG rename gb_HIRESTIME to gb_LOWRESTIME. Assume highres precision by default add missing library for sc. Massage the delivered libraries name. support USE_GMAKE=1 envvar to build with gmake the modules that can be. add sc in the list of gmake-Modules support for an alternate gbuild.lst to support gmake build add a few comment to balance quotes, to make the editor less confused add all the sub-directory of the RESLOCATION to search for resource add calc related library to the Repository tweak MacOs platform specific include to build on Macos fixing variable exports for windows compiler (thanks ause) fixing variable exports for windows compiler (thanks ause) also accept debug=t ... Conflicts: Makefile.in Module_ooo.mk Repository.mk RepositoryFixes.mk configure.in solenv/bin/build.pl solenv/bin/modules/RepositoryHelper.pm solenv/bin/packmodule solenv/doc/gbuild/doxygen.cfg solenv/doc/gbuild/solenv/gbuild/types.mk solenv/gbuild/AllLangResTarget.mk solenv/gbuild/BuildDirs.mk solenv/gbuild/ComponentTarget.mk solenv/gbuild/Deliver.mk solenv/gbuild/Executable.mk solenv/gbuild/Helper.mk solenv/gbuild/Library.mk solenv/gbuild/LinkTarget.mk solenv/gbuild/Module.mk solenv/gbuild/Output.mk solenv/gbuild/Package.mk solenv/gbuild/PrecompiledHeaders.mk solenv/gbuild/SdiTarget.mk solenv/gbuild/StaticLibrary.mk solenv/gbuild/TargetLocations.mk solenv/gbuild/gbuild.mk solenv/gbuild/platform/linux.mk solenv/gbuild/platform/macosx.mk solenv/gbuild/platform/solaris.mk solenv/gbuild/platform/windows.mk solenv/gbuild/processdelivered.awk solenv/gbuild/processdeps.awk solenv/inc/unxgcc.mk soltools/mkdepend/def.h soltools/mkdepend/include.c
Diffstat (limited to 'soltools')
-rw-r--r--soltools/mkdepend/def.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/soltools/mkdepend/def.h b/soltools/mkdepend/def.h
index cafa0b759be0..6a3086df7bf0 100644
--- a/soltools/mkdepend/def.h
+++ b/soltools/mkdepend/def.h
@@ -61,9 +61,8 @@ 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 65536
+
#define MAXDIRS 64
#define SYMHASHSEED 131 /* 131 1313 13131 ... */
#define SYMHASHMEMBERS 64 /* must be 2^x to work right */