Re: gdb.c++ vs dos names

Daniel Jacobowitz
2003-01-09T18:50:12Z

On Thu, Jan 09, 2003 at 01:23:23PM -0500, Daniel Jacobowitz wrote:
> On Thu, Jan 09, 2003 at 11:52:13AM -0600, Michael Elizabeth Chastain wrote:
> > Michael C lies:
> > > Well, the snapshot tarball has testsuite/gdb.*/Makefile files in it,
> > > thus there are 8.3 conflicts in every testsuite directory.
> >
> > Whoops, that is a lie, I was sloppy. David C has a very good point
> > about gdb.hp/gdb.stabs.
> >
> > In the snapshot tarball gdb/testsuite has these subdirectories:
> >
> > gdb.arch gdb.asm gdb.base gdb.c++ gdb.disasm gdb.hp gdb.java gdb.mi
> > gdb.stabs gdb.threads gdb.trace
> >
> > These subdirectories have 'Makefile' files:
> >
> > gdb.arch gdb.asm gdb.base gdb.c++ gdb.disasm gdb.java gdb.mi gdb.threads
> > gdb.trace
> >
> > The difference is gdb.hp and gdb.stabs. configure.in handles these
> > as conditionally set 'configdirs'. All the other testsuite/gdb.*/Makefile
> > files are produced by an AC_OUTPUT line.
>
> Once spotted, easily corrected. Thanks for all the digging. A couple
> of other things in here need to be fixed up to; give me a couple of
> minutes.

Fixed, as so. We could eliminate a lot of these Makefiles; I'll keep
that in mind for a rainy day.

--
Daniel Jacobowitz
MontaVista Software Debian GNU/Linux Developer

2003-01-09 Daniel Jacobowitz <drow@mvista.com>

* 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.

Index: Makefile.in
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/Makefile.in,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile.in
--- Makefile.in 1 Aug 2002 17:18:35 -0000 1.4
+++ Makefile.in 9 Jan 2003 17:59:14 -0000
@@ -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: cl
-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 \
Index: gdb.arch/Makefile.in
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.arch/Makefile.in,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile.in
--- gdb.arch/Makefile.in 14 May 2002 17:09:13 -0000 1.1
+++ gdb.arch/Makefile.in 9 Jan 2003 18:37:27 -0000
@@ -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: cl
-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
Index: gdb.asm/Makefile.in
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.asm/Makefile.in,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile.in
--- gdb.asm/Makefile.in 5 Apr 2002 02:48:23 -0000 1.2
+++ gdb.asm/Makefile.in 9 Jan 2003 18:37:27 -0000
@@ -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
Index: gdb.base/Makefile.in
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/Makefile.in,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile.in
--- gdb.base/Makefile.in 27 Mar 2001 01:32:45 -0000 1.2
+++ gdb.base/Makefile.in 9 Jan 2003 18:37:27 -0000
@@ -17,16 +17,8 @@ EXECUTABLES = all-types annota1 bitfield
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: cl
-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
Index: gdb.c++/Makefile.in
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.c++/Makefile.in,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile.in
--- gdb.c++/Makefile.in 12 Jun 2000 01:31:41 -0000 1.3
+++ gdb.c++/Makefile.in 9 Jan 2003 18:37:27 -0000
@@ -5,16 +5,8 @@ EXECUTABLES = ambiguous annota2 anon-uni
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
Index: gdb.disasm/Makefile.in
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.disasm/Makefile.in,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile.in
--- gdb.disasm/Makefile.in 28 Jun 2001 22:01:22 -0000 1.2
+++ gdb.disasm/Makefile.in 9 Jan 2003 18:37:27 -0000
@@ -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
Index: gdb.java/Makefile.in
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.java/Makefile.in,v
retrieving revision 1.1
diff -u -p -r1.1 Makefile.in
--- gdb.java/Makefile.in 24 Jul 2000 04:34:52 -0000 1.1
+++ gdb.java/Makefile.in 9 Jan 2003 18:37:27 -0000
@@ -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
Index: gdb.mi/Makefile.in
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/Makefile.in,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile.in
--- gdb.mi/Makefile.in 18 Apr 2000 08:03:40 -0000 1.3
+++ gdb.mi/Makefile.in 9 Jan 2003 18:37:27 -0000
@@ -5,20 +5,11 @@ PROGS = basics c_variable cpp_variable v

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:
Index: gdb.threads/Makefile.in
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.threads/Makefile.in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile.in
--- gdb.threads/Makefile.in 16 Apr 1999 01:34:36 -0000 1.1.1.1
+++ gdb.threads/Makefile.in 9 Jan 2003 18:37:27 -0000
@@ -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
Index: gdb.trace/Makefile.in
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.trace/Makefile.in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile.in
--- gdb.trace/Makefile.in 16 Apr 1999 01:34:36 -0000 1.1.1.1
+++ gdb.trace/Makefile.in 9 Jan 2003 18:37:27 -0000
@@ -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
-
-