Thu May 21 13:14:25 1998 John Metzler <jmetzler@cygnus.com>

[deliverable/binutils-gdb.git] / gdb / Makefile.in

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 40b290f3a1873ca371509c4a9d80d8fabed849e0..ef43888776bf78eaf618613def7ecc65234def80 100644 (file)
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -138,6 +138,7 @@ LIB_RUNTIME_DIR = $(libdir)
 TCL = @TCL_LD_SEARCH_FLAGS@ @TCL_BUILD_LIB_SPEC@
 TCL_CFLAGS = @TCLHDIR@
 TCL_DEPS =
+GDBTKLIBS = @GDBTKLIBS@
 
 # Where is the TK library?  Typically in ../tk.
 TK = @TK_BUILD_LIB_SPEC@
@@ -245,10 +246,10 @@ REGEX1 = gnu-regex.o
 # If you have the Cygnus libraries installed,
 # you can use 'CLIBS=$(INSTALLED_LIBS)' 'CDEPS='
 INSTALLED_LIBS=-lbfd -lreadline -lopcodes -liberty \
-       $(TERMCAP) $(XM_CLIBS) $(TM_CLIBS) $(NAT_CLIBS) @LIBS@ \
+       $(TERMCAP) $(XM_CLIBS) $(TM_CLIBS) $(NAT_CLIBS) $(GDBTKLIBS) @LIBS@ \
        -lmmalloc -lintl -liberty
 CLIBS = $(SIM) $(BFD) $(READLINE) $(OPCODES) $(INTL) $(LIBIBERTY) \
-       $(TERMCAP) $(XM_CLIBS) $(TM_CLIBS) $(NAT_CLIBS) @LIBS@ \
+       $(TERMCAP) $(XM_CLIBS) $(TM_CLIBS) $(NAT_CLIBS) $(GDBTKLIBS) @LIBS@ \
        $(MMALLOC) $(LIBIBERTY) $(WIN32LIBS)
 CDEPS = $(XM_CDEPS) $(TM_CDEPS) $(NAT_CDEPS) $(SIM) $(BFD) $(READLINE) \
        $(OPCODES) $(MMALLOC) $(INTL_DEPS) $(LIBIBERTY) @CONFIG_DEPS@
@@ -604,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 ;
@@ -725,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
@@ -798,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