Tue May 12 13:29:20 1998 Jeff Holcomb <jeffh@cygnus.com>

	* Makefile.in (install-only): Add images/icons.txt and
	images2/icons.txt to files that need to be installed.

2 files changed, 14 insertions, 19 deletions

diff --git a/gdb/ChangeLog-gdbtk b/gdb/ChangeLog-gdbtk
index 99daca6..c30aa98 100644
--- a/gdb/ChangeLog-gdbtk
+++ b/gdb/ChangeLog-gdbtk
@@ -1,3 +1,8 @@
+Tue May 12 13:29:20 1998  Jeff Holcomb  <jeffh@cygnus.com>
+
+	* Makefile.in (install-only): Add images/icons.txt and
+	images2/icons.txt to files that need to be installed.
+
 Tue May  5 09:30:25 1998  Christopher Faylor <cgf@cygnus.com>
 
 	* gdbtk.c (_initialize_gdbtk): Use correct device names in
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 819dd3a..ef43888 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -605,7 +605,7 @@ install-only:
 	$(SHELL) $(srcdir)/../mkinstalldirs $(datadir)/gdbtcl/help \
 		$(datadir)/gdbtcl/help/images; \
 	cd $(srcdir)/gdbtcl2 ; \
-	for i in *.tcl images/*.gif images2/*.gif tclIndex help/*.html help/index.toc help/images/*.gif; \
+	for i in *.tcl images/*.gif images2/*.gif images/icons.txt images2/icons.txt tclIndex help/*.html help/index.toc help/images/*.gif; \
 	  do \
 		$(INSTALL_DATA) $$i $(datadir)/gdbtcl/$$i ; \
 	  done ;
@@ -726,22 +726,6 @@ gdb1$(EXEEXT): gdb$(EXEEXT)
 	rm -f gdb1$(EXEEXT)
 	cp gdb$(EXEEXT) gdb1$(EXEEXT)
 
-### fixme - this can't be right.
-# This checks the configure.in file versus the config/ directory.
-config-check: config-check-hosts config-check-targets
-config-check-hosts:
-	grep gdb_host= $(srcdir)/configure.in | \
-		sed -e 's/.*gdb_host=//' -e 's/ ;;$$/.mh/' | sort -u >HOSTconf.o
-	(cd $(srcdir)/config; ls *.mh) >HOSTdir.o
-	diff -u HOSTconf.o HOSTdir.o
-
-### fixme - nor can this.
-config-check-targets:
-	grep gdb_target= $(srcdir)/configure.in | \
-		sed -e 's/.*gdb_target=//' -e 's/ ;;$$/.mh/' | sort -u >TARGconf.o
-	(cd $(srcdir)/config; ls *.mt) >TARGdir.o
-	diff -u HOSTconf.o HOSTdir.o
-
 # FIXME. These are not generated by "make depend" because they only are there
 # for some machines.
 # But these rules don't do what we want; we want to hack the foo.o: tm.h
@@ -799,15 +783,21 @@ distclean: clean
 	rm -f config.log config.cache
 	rm -f Makefile
 
-maintainer-clean realclean: distclean clean
+maintainer-clean: local-maintainer-clean do-maintainer-clean distclean
+realclean: maintainer-clean
+
+local-maintainer-clean:
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
-	@$(MAKE) $(FLAGS_TO_PASS) DO=maintainer-clean "DODIRS=$(SUBDIRS)" subdir_do
 	rm -f c-exp.tab.c jv-exp.tab.c f-exp.tab.c m2-exp.tab.c
 	rm -f TAGS $(INFOFILES)
 	rm -f $(YYFILES)
 	rm -f nm.h tm.h xm.h config.status
 
+do-maintainer-clean:
+	@$(MAKE) $(FLAGS_TO_PASS) DO=maintainer-clean "DODIRS=$(SUBDIRS)" \
+		subdir_do
+
 diststuff: $(DISTSTUFF)
 	cd doc; $(MAKE) $(MFLAGS) all-doc