diff options
| author | Zack Weinberg <zack@wolery.cumb.org> | 2000-03-04 19:42:04 +0000 |
|---|---|---|
| committer | Zack Weinberg <zack@gcc.gnu.org> | 2000-03-04 19:42:04 +0000 |
| commit | 49e6c08e21b3138382ca5eaca0c757930eea4b60 (patch) | |
| tree | b5fe0ea6f7acb88432c113e0e8949eba769d06b3 /gcc/cpplib.c | |
| parent | 4a7f193558e80da380ec023d225ca3eefb9a0e8f (diff) | |
| download | gcc-49e6c08e21b3138382ca5eaca0c757930eea4b60.zip gcc-49e6c08e21b3138382ca5eaca0c757930eea4b60.tar.gz gcc-49e6c08e21b3138382ca5eaca0c757930eea4b60.tar.bz2 | |
mkdeps.c, mkdeps.h: New files.
* mkdeps.c, mkdeps.h: New files.
* po/POTFILES.in: Add them.
* Makefile.in (LIBCPP_OBJS): Add mkdeps.o.
(cpplib.o, cppinit.o): Depend on mkdeps.h.
(mkdeps.o): New target.
* cppfiles.c: Delete deps_output.
* cppinit.c: Include mkdeps.h. Delete known_suffixes,
OBJECT_SUFFIX, and base_name.
(cpp_cleanup): Use deps_free. Free ihash->name when clearing
the include hash.
(initialize_dependency_output): Use deps_init,
deps_add_target, deps_calc_target, and deps_add_dep. Remove
all the unnecessary string bashing.
(cpp_finish): Use deps_write. Remove an unnecessary nesting
level.
* cpplib.c (do_include): Use deps_add_dep.
* cpplib.h (struct cpp_reader): Replace deps_buffer,
deps_allocated_size, deps_size, deps_column members with
single pointer to a struct deps. Delete prototype of
deps_output.
From-SVN: r32329
Diffstat (limited to 'gcc/cpplib.c')
| -rw-r--r-- | gcc/cpplib.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gcc/cpplib.c b/gcc/cpplib.c index 2d89745..567f940 100644 --- a/gcc/cpplib.c +++ b/gcc/cpplib.c @@ -25,6 +25,7 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "cpplib.h" #include "cpphash.h" #include "intl.h" +#include "mkdeps.h" #define SKIP_WHITE_SPACE(p) do { while (is_hspace(*p)) p++; } while (0) @@ -1212,7 +1213,7 @@ do_include (pfile, keyword) (pfile->system_include_depth > 0))) { if (!angle_brackets) - deps_output (pfile, ftok, ' '); + deps_add_dep (pfile->deps, ftok); else { char *p; @@ -1232,7 +1233,7 @@ do_include (pfile, keyword) strcat (p, "/"); } strcat (p, ftok); - deps_output (pfile, p, ' '); + deps_add_dep (pfile->deps, p); } } /* If -M was specified, and this header file won't be added to @@ -1254,7 +1255,7 @@ do_include (pfile, keyword) /* For -M, add the file to the dependencies on its first inclusion. */ if (!before && (CPP_PRINT_DEPS (pfile) > (angle_brackets || (pfile->system_include_depth > 0)))) - deps_output (pfile, ihash->name, ' '); + deps_add_dep (pfile->deps, ihash->name); /* Handle -H option. */ if (CPP_OPTIONS(pfile)->print_include_names) |