From 3eb3f2935df168e82ed9808d3ebeb8ffdfc95e88 Mon Sep 17 00:00:00 2001
From: zack <zack@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sat, 5 Jun 2004 20:58:06 +0000
Subject: libcpp: 	* Makefile.am: Add makedepend. 	* Makefile.in,
 aclocal.m4: Regenerate. 	* charset.c: Insert a space to avoid a
 warning. 	* directives.c: Include mkdeps.h. 
 (_cpp_handle_directive): Reenable macro expander if appropriate. 
 (undefine_macros): Inline body of _cpp_free_definition for speed. 	Do not
 call undef callback or _cpp_warn_if_unused_macro. 	(cpp_get_deps): New
 interface. 	* files.c (search_cache): Add pfile argument.  Check for file 
 that would be found by "" or <> search here... 	(_cpp_find_file):
 ...not here.  Correct recorded start_dir of 	files found by
 directory-of-current-file search that would be 	found by "" or <>
 search. 	* init.c (cpp_add_dependency_target): Delete. 	* internal.h
 (struct lexer_state): Add discarding_output flag. 	* lex.c
 (lex_identifier): Compute hash function while scanning. 	* macro.c
 (cpp_scan_nooutput): Disable macro expansion outside 	directives. 	*
 makedepend.c: New file. 	* mkdeps.c (struct deps): Add vpath vector. 
 (apply_vpath, deps_add_vpath): New function. 	(deps_free): Free vpath
 vector. 	(deps_add_dep, deps_add_target): Use apply_vpath. 	*
 symtab.c (calc_hash): Use HT_HASHSTEP and HT_FINISH. 	(ht_lookup_with_hash):
 New function. 	* cpplib.h, mkdeps.h: Update prototypes. 	* symtab.h:
 Update prototypes. 	(HT_HASHSTEP, HT_FINISH): New macros.

gcc:
	* Makefile.in (MKDEPS_H): New shorthand.
	(c-opts.o): Update dependencies.
	* c-opts.c: Include mkdeps.h.
	(handle_deferred_opts): Use cpp_get_deps and deps_add_target,
	not cpp_add_dependency_target.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@82654 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libcpp/Makefile.in | 60 ++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 38 insertions(+), 22 deletions(-)

(limited to 'libcpp/Makefile.in')

diff --git a/libcpp/Makefile.in b/libcpp/Makefile.in
index 5df4f3e2f1b..3820a1b02ac 100644
--- a/libcpp/Makefile.in
+++ b/libcpp/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.8.4 from Makefile.am.
+# Makefile.in generated by automake 1.8.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -15,7 +15,8 @@
 @SET_MAKE@
 
 
-SOURCES = $(libcpp_a_SOURCES)
+
+SOURCES = $(libcpp_a_SOURCES) makedepend.c
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -40,6 +41,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
+noinst_PROGRAMS = makedepend$(EXEEXT)
 DIST_COMMON = $(am__configure_deps) $(noinst_HEADERS) \
 	$(srcdir)/../config.guess $(srcdir)/../config.sub \
 	$(srcdir)/../depcomp $(srcdir)/../install-sh \
@@ -57,9 +59,9 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
 AR = ar
 ARFLAGS = cru
-LIBRARIES = $(noinst_LIBRARIES)
 libcpp_a_AR = $(AR) $(ARFLAGS)
 libcpp_a_LIBADD =
 am_libcpp_a_OBJECTS = charset.$(OBJEXT) directives.$(OBJEXT) \
@@ -68,6 +70,10 @@ am_libcpp_a_OBJECTS = charset.$(OBJEXT) directives.$(OBJEXT) \
 	line-map.$(OBJEXT) macro.$(OBJEXT) mkdeps.$(OBJEXT) \
 	pch.$(OBJEXT) symtab.$(OBJEXT) traditional.$(OBJEXT)
 libcpp_a_OBJECTS = $(am_libcpp_a_OBJECTS)
+PROGRAMS = $(noinst_PROGRAMS)
+makedepend_SOURCES = makedepend.c
+makedepend_OBJECTS = makedepend.$(OBJEXT)
+makedepend_DEPENDENCIES = libcpp.a ../libiberty/libiberty.a
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
 depcomp = $(SHELL) $(top_srcdir)/../depcomp
 am__depfiles_maybe = depfiles
@@ -76,15 +82,15 @@ am__depfiles_maybe = depfiles
 @AMDEP_TRUE@	./$(DEPDIR)/expr.Po ./$(DEPDIR)/files.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/identifiers.Po ./$(DEPDIR)/init.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/lex.Po ./$(DEPDIR)/line-map.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/macro.Po ./$(DEPDIR)/mkdeps.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/pch.Po ./$(DEPDIR)/symtab.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/traditional.Po
+@AMDEP_TRUE@	./$(DEPDIR)/macro.Po ./$(DEPDIR)/makedepend.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/mkdeps.Po ./$(DEPDIR)/pch.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/symtab.Po ./$(DEPDIR)/traditional.Po
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libcpp_a_SOURCES)
-DIST_SOURCES = $(libcpp_a_SOURCES)
+SOURCES = $(libcpp_a_SOURCES) makedepend.c
+DIST_SOURCES = $(libcpp_a_SOURCES) makedepend.c
 HEADERS = $(noinst_HEADERS)
 ETAGS = etags
 CTAGS = ctags
@@ -213,6 +219,7 @@ noinst_HEADERS = \
 	include/cpplib.h include/line-map.h include/mkdeps.h \
 	include/symtab.h internal.h system.h ucnid.h
 
+makedepend_LDADD = libcpp.a ../libiberty/libiberty.a
 MSGMERGE = msgmerge
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -277,6 +284,12 @@ libcpp.a: $(libcpp_a_OBJECTS) $(libcpp_a_DEPENDENCIES)
 	$(libcpp_a_AR) libcpp.a $(libcpp_a_OBJECTS) $(libcpp_a_LIBADD)
 	$(RANLIB) libcpp.a
 
+clean-noinstPROGRAMS:
+	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
+makedepend$(EXEEXT): $(makedepend_OBJECTS) $(makedepend_DEPENDENCIES) 
+	@rm -f makedepend$(EXEEXT)
+	$(LINK) $(makedepend_LDFLAGS) $(makedepend_OBJECTS) $(makedepend_LDADD) $(LIBS)
+
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
 
@@ -293,6 +306,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lex.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/line-map.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/macro.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/makedepend.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkdeps.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pch.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/symtab.Po@am__quote@
@@ -336,7 +350,7 @@ TAGS:  $(HEADERS) $(SOURCES) config.in $(TAGS_DEPENDENCIES) \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -z "$$unique" && unique=$$empty_fix; \
+	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	    $$tags $$unique; \
 	fi
@@ -492,7 +506,7 @@ distcleancheck: distclean
 	       exit 1; } >&2
 check-am: all-am
 check: check-am
-all-am: Makefile $(LIBRARIES) $(HEADERS) config.h
+all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(HEADERS) config.h
 installdirs:
 install: install-am
 install-exec: install-exec-am
@@ -520,7 +534,8 @@ maintainer-clean-generic:
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
+clean-am: clean-generic clean-noinstLIBRARIES clean-noinstPROGRAMS \
+	mostlyclean-am
 
 distclean: distclean-am
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
@@ -571,17 +586,18 @@ ps-am:
 uninstall-am: uninstall-info-am
 
 .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
-	clean-generic clean-noinstLIBRARIES ctags dist dist-all \
-	dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip distcheck \
-	distclean distclean-compile distclean-generic distclean-hdr \
-	distclean-tags distcleancheck distdir distuninstallcheck dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-data-local install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am
+	clean-generic clean-noinstLIBRARIES clean-noinstPROGRAMS ctags \
+	dist dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ \
+	dist-zip distcheck distclean distclean-compile \
+	distclean-generic distclean-hdr distclean-tags distcleancheck \
+	distdir distuninstallcheck dvi dvi-am html html-am info \
+	info-am install install-am install-data install-data-am \
+	install-data-local install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-info-am
 
 
 @ENABLE_NLS_TRUE@build-po: $(CATALOGS)
-- 
cgit v1.2.1