From 696d5a5b8440861f2e53015652b37388ef6d4283 Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Thu, 9 Jan 2003 18:50:28 +0000 Subject: [PATCH] * Makefile.in (ALL_SUBDIRS): New variable. (subdirs, clean, distclean): Use it. * gdb.arch/Makefile.in: Clean up Makefile. Remove rules for regenerating Makefile, since it is generated from the top level. * gdb.asm/Makefile.in: Likewise. * gdb.base/Makefile.in: Likewise. * gdb.c++/Makefile.in: Likewise. * gdb.disasm/Makefile.in: Likewise. * gdb.java/Makefile.in: Likewise. * gdb.mi/Makefile.in: Likewise. * gdb.threads/Makefile.in: Likewise. * gdb.trace/Makefile.in: Likewise. --- gdb/testsuite/ChangeLog | 15 +++++++++++++++ gdb/testsuite/Makefile.in | 12 +++++++----- gdb/testsuite/gdb.arch/Makefile.in | 15 ++------------- gdb/testsuite/gdb.asm/Makefile.in | 27 +++++---------------------- gdb/testsuite/gdb.base/Makefile.in | 15 ++------------- gdb/testsuite/gdb.c++/Makefile.in | 15 ++------------- gdb/testsuite/gdb.disasm/Makefile.in | 9 ++------- gdb/testsuite/gdb.java/Makefile.in | 9 ++------- gdb/testsuite/gdb.mi/Makefile.in | 13 ++----------- gdb/testsuite/gdb.threads/Makefile.in | 22 ++-------------------- gdb/testsuite/gdb.trace/Makefile.in | 11 ++--------- 11 files changed, 43 insertions(+), 120 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 47e8f765573..cd3c27c4e4c 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,18 @@ +2003-01-09 Daniel Jacobowitz + + * Makefile.in (ALL_SUBDIRS): New variable. + (subdirs, clean, distclean): Use it. + * gdb.arch/Makefile.in: Clean up Makefile. Remove rules for + regenerating Makefile, since it is generated from the top level. + * gdb.asm/Makefile.in: Likewise. + * gdb.base/Makefile.in: Likewise. + * gdb.c++/Makefile.in: Likewise. + * gdb.disasm/Makefile.in: Likewise. + * gdb.java/Makefile.in: Likewise. + * gdb.mi/Makefile.in: Likewise. + * gdb.threads/Makefile.in: Likewise. + * gdb.trace/Makefile.in: Likewise. + 2003-01-09 David Carlton * gdb.c++/annota2.exp: KFAIL "watch triggered on a.x". diff --git a/gdb/testsuite/Makefile.in b/gdb/testsuite/Makefile.in index f7f610ae1f5..29079d4b84f 100644 --- a/gdb/testsuite/Makefile.in +++ b/gdb/testsuite/Makefile.in @@ -35,6 +35,8 @@ SHELL = @SHELL@ EXEEXT = @EXEEXT@ SUBDIRS = @subdirs@ RPATH_ENVVAR = @RPATH_ENVVAR@ +ALL_SUBDIRS = gdb.arch gdb.asm gdb.base gdb.c++ gdb.disasm gdb.java gdb.mi \ + gdb.threads gdb.trace $(SUBDIRS) EXPECT = `if [ -f $${rootme}/../../expect/expect ] ; then \ echo $${rootme}/../../expect/expect ; \ @@ -145,7 +147,7 @@ subdir_do: force force:; subdirs: - for dir in ${SUBDIRS} ; \ + for dir in ${ALL_SUBDIRS} ; \ do \ echo "$$dir:" ; \ if [ -d $$dir ] ; then \ @@ -157,8 +159,8 @@ subdirs: clean mostlyclean: -rm -f *~ core *.o a.out xgdb *.x *.grt - if [ x"${SUBDIRS}" != x ] ; then \ - for dir in ${SUBDIRS}; \ + if [ x"${ALL_SUBDIRS}" != x ] ; then \ + for dir in ${ALL_SUBDIRS}; \ do \ echo "$$dir:"; \ if [ -d $$dir ]; then \ @@ -171,8 +173,8 @@ distclean maintainer-clean realclean: clean -rm -f *~ core -rm -f Makefile config.status *-init.exp -rm -fr *.log summary detail *.plog *.sum *.psum site.* - if [ x"${SUBDIRS}" != x ] ; then \ - for dir in ${SUBDIRS}; \ + if [ x"${ALL_SUBDIRS}" != x ] ; then \ + for dir in ${ALL_SUBDIRS}; \ do \ echo "$$dir:"; \ if [ -d $$dir ]; then \ diff --git a/gdb/testsuite/gdb.arch/Makefile.in b/gdb/testsuite/gdb.arch/Makefile.in index f2dc1a930ab..2b6f494158c 100644 --- a/gdb/testsuite/gdb.arch/Makefile.in +++ b/gdb/testsuite/gdb.arch/Makefile.in @@ -5,16 +5,8 @@ EXECUTABLES = altivec-abi altivec-regs MISCELLANEOUS = -all: - @echo "Nothing to be done for all..." - -info: -install-info: -dvi: -install: -uninstall: force -installcheck: -check: +all info install-info dvi install uninstall installcheck check: + @echo "Nothing to be done for $@..." clean mostlyclean: -rm -f *~ *.o a.out *.x *.ci *.tmp @@ -26,6 +18,3 @@ distclean maintainer-clean realclean: clean -rm -f Makefile config.status config.log -rm -f *-init.exp -rm -fr *.log summary detail *.plog *.sum *.psum site.* - -Makefile : $(srcdir)/Makefile.in $(srcdir)/configure.in - $(SHELL) ./config.status --recheck diff --git a/gdb/testsuite/gdb.asm/Makefile.in b/gdb/testsuite/gdb.asm/Makefile.in index 05ed656a387..d1c71b434da 100644 --- a/gdb/testsuite/gdb.asm/Makefile.in +++ b/gdb/testsuite/gdb.asm/Makefile.in @@ -2,35 +2,18 @@ VPATH = @srcdir@ srcdir = @srcdir@ EXECUTABLES = +MISCELLANEOUS = arch.inc -# uuencoded format to avoid SCCS/RCS problems with binary files. -CROSS_EXECUTABLES = - -all: - @echo "Nothing to be done for all..." - -info: -install-info: -dvi: -install: -uninstall: force -installcheck: -check: +all info install-info dvi install uninstall installcheck check: + @echo "Nothing to be done for $@..." clean mostlyclean: - -rm -f *~ *.o a.out xgdb *.x $(CROSS_EXECUTABLES) *.ci *.tmp + -rm -f *~ *.o a.out *.x *.ci *.tmp -rm -f core core.coremaker coremaker.core corefile $(EXECUTABLES) - -rm -f twice-tmp.c + -rm -f $(MISCELLANEOUS) distclean maintainer-clean realclean: clean -rm -f *~ core -rm -f Makefile config.status config.log - -rm -f arch.inc -rm -f *-init.exp -rm -fr *.log summary detail *.plog *.sum *.psum site.* - -Makefile : $(srcdir)/Makefile.in config.status - $(SHELL) ./config.status - -config.status: $(srcdir)/configure - $(SHELL) ./config.status --recheck diff --git a/gdb/testsuite/gdb.base/Makefile.in b/gdb/testsuite/gdb.base/Makefile.in index c878f15de7c..e59f57b6639 100644 --- a/gdb/testsuite/gdb.base/Makefile.in +++ b/gdb/testsuite/gdb.base/Makefile.in @@ -17,16 +17,8 @@ EXECUTABLES = all-types annota1 bitfields break \ MISCELLANEOUS = coremmap.data ../foobar.baz \ shr1.sl shr2.sl solib_sl.sl solib1.sl solib2.sl -all: - @echo "Nothing to be done for all..." - -info: -install-info: -dvi: -install: -uninstall: force -installcheck: -check: +all info install-info dvi install uninstall installcheck check: + @echo "Nothing to be done for $@..." clean mostlyclean: -rm -f *~ *.o a.out xgdb *.x *.ci *.tmp @@ -38,6 +30,3 @@ distclean maintainer-clean realclean: clean -rm -f Makefile config.status config.log -rm -f *-init.exp -rm -fr *.log summary detail *.plog *.sum *.psum site.* - -Makefile : $(srcdir)/Makefile.in $(srcdir)/configure.in - $(SHELL) ./config.status --recheck diff --git a/gdb/testsuite/gdb.c++/Makefile.in b/gdb/testsuite/gdb.c++/Makefile.in index 82672598750..8f4a90e2bb2 100644 --- a/gdb/testsuite/gdb.c++/Makefile.in +++ b/gdb/testsuite/gdb.c++/Makefile.in @@ -5,16 +5,8 @@ EXECUTABLES = ambiguous annota2 anon-union cplusfuncs cttiadd \ derivation inherit local member-ptr method misc \ overload ovldbreak ref-typ ref-typ2 templates userdef virtfunc namespace ref-types -all: - @echo "Nothing to be done for all..." - -info: -install-info: -dvi: -install: -uninstall: force -installcheck: -check: +all info install-info dvi install uninstall installcheck check: + @echo "Nothing to be done for $@..." clean mostlyclean: -rm -f *~ *.o *.ci @@ -22,6 +14,3 @@ clean mostlyclean: distclean maintainer-clean realclean: clean -rm -f Makefile config.status config.log - -Makefile: $(srcdir)/Makefile.in $(srcdir)/configure.in - $(SHELL) ./config.status --recheck diff --git a/gdb/testsuite/gdb.disasm/Makefile.in b/gdb/testsuite/gdb.disasm/Makefile.in index 7bb5eef69c4..7cb1b1e2a8e 100644 --- a/gdb/testsuite/gdb.disasm/Makefile.in +++ b/gdb/testsuite/gdb.disasm/Makefile.in @@ -1,18 +1,13 @@ -#### host, target, and site specific Makefile frags come in here. - VPATH = @srcdir@ srcdir = @srcdir@ .PHONY: all clean mostlyclean distclean realclean -all: - @echo "Nothing to be done for all..." +all info install-info dvi install uninstall installcheck check: + @echo "Nothing to be done for $@..." clean mostlyclean: -rm -f *.o *.diff *~ *.bad core h8300s hppa mn10200 mn10300 sh3 distclean maintainer-clean realclean: clean -rm -f Makefile config.status config.log - -Makefile: $(srcdir)/Makefile.in $(srcdir)/configure.in - $(SHELL) ./config.status --recheck diff --git a/gdb/testsuite/gdb.java/Makefile.in b/gdb/testsuite/gdb.java/Makefile.in index 0954369c092..5072ee19a6a 100644 --- a/gdb/testsuite/gdb.java/Makefile.in +++ b/gdb/testsuite/gdb.java/Makefile.in @@ -1,10 +1,8 @@ srcdir = @srcdir@ VPATH = @srcdir@ -all: - @echo "Nothing to be done for all..." - -#### host, target, and site specific Makefile frags come in here. +all info install-info dvi install uninstall installcheck check: + @echo "Nothing to be done for $@..." .SUFFIXES: .java .class .o .exe .exp .check @@ -21,6 +19,3 @@ clean mostlyclean: distclean maintainer-clean realclean: clean -rm -f Makefile config.status config.log - -Makefile: $(srcdir)/Makefile.in $(srcdir)/configure.in - $(SHELL) ./config.status --recheck diff --git a/gdb/testsuite/gdb.mi/Makefile.in b/gdb/testsuite/gdb.mi/Makefile.in index 67a0f5d39b5..7bd9d5aa2d3 100644 --- a/gdb/testsuite/gdb.mi/Makefile.in +++ b/gdb/testsuite/gdb.mi/Makefile.in @@ -5,20 +5,11 @@ PROGS = basics c_variable cpp_variable var-cmd MISCELLANEOUS = testcmds -all: - @echo "Nothing to be done for all..." - -#### host, target, and site specific Makefile frags come in here. +all info install-info dvi install uninstall installcheck check: + @echo "Nothing to be done for $@..." clean mostlyclean: -rm -f *.ci *.o $(OBJS) $(PROGS) *~ core distclean maintainer-clean realclean: clean -rm -f Makefile config.status config.log - -Makefile: $(srcdir)/Makefile.in $(srcdir)/configure.in - $(SHELL) ./config.status --recheck - -# Local variables: -# change-log-default-name: "ChangeLog-mi" -# End: diff --git a/gdb/testsuite/gdb.threads/Makefile.in b/gdb/testsuite/gdb.threads/Makefile.in index 34f22b53bb3..6bd7279e536 100644 --- a/gdb/testsuite/gdb.threads/Makefile.in +++ b/gdb/testsuite/gdb.threads/Makefile.in @@ -3,29 +3,11 @@ srcdir = @srcdir@ EXECUTABLES = pthreads -all: - @echo "Nothing to be done for all..." - -info: -install-info: -dvi: -install: -uninstall: force -installcheck: -check: +all info install-info dvi install uninstall installcheck check: + @echo "Nothing to be done for $@..." clean mostlyclean: -rm -f *~ *.o a.out xgdb *.x *.ci *.tmp core* $(EXECUTABLES) distclean maintainer-clean realclean: clean -rm -f Makefile config.status config.log config.h - -Makefile : $(srcdir)/Makefile.in $(srcdir)/configure.in - $(SHELL) ./config.status --recheck - -config.h: stamp-h ; @true -stamp-h: config.in config.status - CONFIG_HEADERS=config.h:config.in $(SHELL) config.status - -config.status: configure - $(SHELL) config.status --recheck diff --git a/gdb/testsuite/gdb.trace/Makefile.in b/gdb/testsuite/gdb.trace/Makefile.in index 601c9e17ff9..b416c3b8d16 100644 --- a/gdb/testsuite/gdb.trace/Makefile.in +++ b/gdb/testsuite/gdb.trace/Makefile.in @@ -1,12 +1,10 @@ -#### host, target, and site specific Makefile frags come in here. - VPATH = @srcdir@ srcdir = @srcdir@ .PHONY: all clean mostlyclean distclean realclean -all: - @echo "Nothing to be done for all..." +all info install-info dvi install uninstall installcheck check: + @echo "Nothing to be done for $@..." clean mostlyclean: -rm -f actions circ collection limits @@ -14,8 +12,3 @@ clean mostlyclean: distclean maintainer-clean realclean: clean -rm -f Makefile config.status config.log - -Makefile: $(srcdir)/Makefile.in $(srcdir)/configure.in - $(SHELL) ./config.status --recheck - - -- 2.30.2