* [PATCH] Get make TAGS to work in gdb directory
@ 2005-09-20 22:27 Nick Roberts
2005-09-21 14:36 ` Kris Warkentin
2005-09-26 1:39 ` Daniel Jacobowitz
0 siblings, 2 replies; 7+ messages in thread
From: Nick Roberts @ 2005-09-20 22:27 UTC (permalink / raw)
To: gdb-patches
make TAGS doesn't seem to work in the gdb directory for two reason:
1) minimon.h, symfile-mem.h, amdfbsd-nat.c, irix4-nat.c, m3-nat.c,
mipsm3-nat.c, ns32k-tdep.c, symm-tdep.c and symm-nat.c have been removed.
2) It doesn't find mi-*.c tui-*.c because they are in different
directories.
It's been bust for quite a long time so either people don't use it much,
they have a local patch or there's something wrong with my setup. Assuming
its not the latter, I attach a patch.
Nick
2005-09-21 Nick Roberts <nickrob@snap.net.nz>
* Makefile.in (HFILES_NO_SRCDIR): Remove minimon.h, symfile-mem.h,
amdfbsd-nat.c, irix4-nat.c, m3-nat.c, mipsm3-nat.c, ns32k-tdep.c,
symm-tdep.c and symm-nat.c.
(TAGFILES_NO_SRCDIR): Add SUBDIR_MI_SRCS SUBDIR_TUI_SRCS.
(DEPFILES): Remove CONFIG_OBS and include it explicitly where needed.
*** /home/nickrob/src/gdb/Makefile.in.~1.753.~ 2005-09-16 18:00:51.000000000 +1200
--- /home/nickrob/src/gdb/Makefile.in 2005-09-21 09:44:57.617994472 +1200
***************
*** 852,860 ****
HFILES_NO_SRCDIR = bcache.h buildsym.h call-cmds.h coff-solib.h defs.h \
exceptions.h \
environ.h $(gdbcmd_h) gdb.h gdbcore.h \
! gdb-stabs.h $(inferior_h) language.h minimon.h monitor.h \
objfiles.h parser-defs.h serial.h solib.h \
! symfile.h symfile-mem.h stabsread.h target.h terminal.h typeprint.h \
xcoffsolib.h \
macrotab.h macroexp.h macroscope.h \
ada-lang.h c-lang.h f-lang.h \
--- 852,860 ----
HFILES_NO_SRCDIR = bcache.h buildsym.h call-cmds.h coff-solib.h defs.h \
exceptions.h \
environ.h $(gdbcmd_h) gdb.h gdbcore.h \
! gdb-stabs.h $(inferior_h) language.h monitor.h \
objfiles.h parser-defs.h serial.h solib.h \
! symfile.h stabsread.h target.h terminal.h typeprint.h \
xcoffsolib.h \
macrotab.h macroexp.h macroscope.h \
ada-lang.h c-lang.h f-lang.h \
***************
*** 881,896 ****
# Makefile.in
DEPFILES = $(TDEPFILES) $(SER_HARDWIRE) $(NATDEPFILES) \
! $(REMOTE_OBS) $(SIM_OBS) $(CONFIG_OBS)
SOURCES = $(SFILES) $(ALLDEPFILES) $(YYFILES) $(CONFIG_SRCS)
# Don't include YYFILES (*.c) because we already include *.y in SFILES,
# and it's more useful to see it in the .y file.
TAGFILES_NO_SRCDIR = $(SFILES) $(HFILES_NO_SRCDIR) $(ALLDEPFILES) \
! $(SUBDIR_CLI_SRCS)
TAGFILES_WITH_SRCDIR = $(HFILES_WITH_SRCDIR)
! COMMON_OBS = $(DEPFILES) $(YYOBJ) \
version.o \
annotate.o \
auxv.o \
--- 881,896 ----
# Makefile.in
DEPFILES = $(TDEPFILES) $(SER_HARDWIRE) $(NATDEPFILES) \
! $(REMOTE_OBS) $(SIM_OBS)
SOURCES = $(SFILES) $(ALLDEPFILES) $(YYFILES) $(CONFIG_SRCS)
# Don't include YYFILES (*.c) because we already include *.y in SFILES,
# and it's more useful to see it in the .y file.
TAGFILES_NO_SRCDIR = $(SFILES) $(HFILES_NO_SRCDIR) $(ALLDEPFILES) \
! $(SUBDIR_CLI_SRCS) $(SUBDIR_MI_SRCS) $(SUBDIR_TUI_SRCS)
TAGFILES_WITH_SRCDIR = $(HFILES_WITH_SRCDIR)
! COMMON_OBS = $(DEPFILES) $(CONFIG_OBJS) $(YYOBJ) \
version.o \
annotate.o \
auxv.o \
***************
*** 1232,1238 ****
@etags $(srcdir)/$(DEPRECATED_TM_FILE) \
$(srcdir)/$(XM_FILE) \
$(srcdir)/$(NAT_FILE) \
! `(for i in $(DEPFILES) $(TAGFILES_NO_SRCDIR); do \
echo $(srcdir)/$$i ; \
done ; for i in $(TAGFILES_WITH_SRCDIR); do \
echo $$i ; \
--- 1232,1238 ----
@etags $(srcdir)/$(DEPRECATED_TM_FILE) \
$(srcdir)/$(XM_FILE) \
$(srcdir)/$(NAT_FILE) \
! `(for i in $(TAGFILES_NO_SRCDIR); do \
echo $(srcdir)/$$i ; \
done ; for i in $(TAGFILES_WITH_SRCDIR); do \
echo $$i ; \
***************
*** 1354,1360 ****
lint: $(LINTFILES)
$(LINT) $(INCLUDE_CFLAGS) $(LINTFLAGS) $(LINTFILES) \
! `echo $(DEPFILES) | sed 's/\.o /\.c /g'`
gdb.cxref: $(SFILES)
cxref -I. $(SFILES) >gdb.cxref
--- 1354,1360 ----
lint: $(LINTFILES)
$(LINT) $(INCLUDE_CFLAGS) $(LINTFLAGS) $(LINTFILES) \
! `echo $(DEPFILES) $(CONFIG_OBJS) | sed 's/\.o /\.c /g'`
gdb.cxref: $(SFILES)
cxref -I. $(SFILES) >gdb.cxref
***************
*** 1378,1384 ****
alpha-tdep.c alpha-linux-tdep.c alphabsd-tdep.c alphanbsd-tdep.c \
alpha-osf1-tdep.c alphafbsd-tdep.c alpha-mdebug-tdep.c \
amd64-nat.c amd64-tdep.c \
! amd64bsd-nat.c amdfbsd-nat.c amd64fbsd-tdep.c \
amd64nbsd-nat.c amd64nbsd-tdep.c \
amd64obsd-nat.c amd64obsd-tdep.c \
amd64-linux-nat.c amd64-linux-tdep.c \
--- 1378,1384 ----
alpha-tdep.c alpha-linux-tdep.c alphabsd-tdep.c alphanbsd-tdep.c \
alpha-osf1-tdep.c alphafbsd-tdep.c alpha-mdebug-tdep.c \
amd64-nat.c amd64-tdep.c \
! amd64bsd-nat.c amd64fbsd-tdep.c \
amd64nbsd-nat.c amd64nbsd-tdep.c \
amd64obsd-nat.c amd64obsd-tdep.c \
amd64-linux-nat.c amd64-linux-tdep.c \
***************
*** 1408,1416 ****
i386gnu-nat.c i386gnu-tdep.c \
ia64-linux-nat.c ia64-linux-tdep.c ia64-tdep.c \
inf-ptrace.c inf-ttrace.c \
! infptrace.c inftarg.c irix4-nat.c irix5-nat.c \
libunwind-frame.c \
! lynx-nat.c m3-nat.c \
m68hc11-tdep.c \
m32r-tdep.c \
m32r-linux-nat.c m32r-linux-tdep.c \
--- 1408,1416 ----
i386gnu-nat.c i386gnu-tdep.c \
ia64-linux-nat.c ia64-linux-tdep.c ia64-tdep.c \
inf-ptrace.c inf-ttrace.c \
! infptrace.c inftarg.c irix5-nat.c \
libunwind-frame.c \
! lynx-nat.c \
m68hc11-tdep.c \
m32r-tdep.c \
m32r-linux-nat.c m32r-linux-tdep.c \
***************
*** 1418,1431 ****
m68kbsd-nat.c m68kbsd-tdep.c \
m68klinux-nat.c m68klinux-tdep.c \
m88k-tdep.c m88kbsd-nat.c \
- mcore-tdep.c \
mips-linux-nat.c mips-linux-tdep.c \
mips-irix-tdep.c \
! mips-tdep.c mipsm3-nat.c mipsv4-nat.c \
mipsnbsd-nat.c mipsnbsd-tdep.c \
mips64obsd-nat.c mips64obsd-tdep.c \
nbsd-tdep.c \
! ns32k-tdep.c solib-osf.c \
somread.c solib-som.c $(HPREAD_SOURCE) \
ppc-sysv-tdep.c ppc-linux-nat.c ppc-linux-tdep.c \
ppcnbsd-nat.c ppcnbsd-tdep.c \
--- 1418,1430 ----
m68kbsd-nat.c m68kbsd-tdep.c \
m68klinux-nat.c m68klinux-tdep.c \
m88k-tdep.c m88kbsd-nat.c \
mips-linux-nat.c mips-linux-tdep.c \
mips-irix-tdep.c \
! mips-tdep.c mipsv4-nat.c \
mipsnbsd-nat.c mipsnbsd-tdep.c \
mips64obsd-nat.c mips64obsd-tdep.c \
nbsd-tdep.c \
! solib-osf.c \
somread.c solib-som.c $(HPREAD_SOURCE) \
ppc-sysv-tdep.c ppc-linux-nat.c ppc-linux-tdep.c \
ppcnbsd-nat.c ppcnbsd-tdep.c \
***************
*** 1447,1453 ****
sparc64-tdep.c sparc64fbsd-nat.c sparc64fbsd-tdep.c \
sparc64nbsd-nat.c sparc64nbsd-tdep.c sparc64obsd-tdep.c \
sparcnbsd-nat.c sparcnbsd-tdep.c sparcobsd-tdep.c \
- symm-tdep.c symm-nat.c \
v850-tdep.c \
vax-nat.c vax-tdep.c vaxbsd-nat.c vaxnbsd-tdep.c \
win32-nat.c \
--- 1446,1451 ----
Diff finished. Wed Sep 21 10:01:41 2005
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] Get make TAGS to work in gdb directory
2005-09-20 22:27 [PATCH] Get make TAGS to work in gdb directory Nick Roberts
@ 2005-09-21 14:36 ` Kris Warkentin
2005-09-28 3:23 ` Nick Roberts
2005-09-26 1:39 ` Daniel Jacobowitz
1 sibling, 1 reply; 7+ messages in thread
From: Kris Warkentin @ 2005-09-21 14:36 UTC (permalink / raw)
To: Nick Roberts; +Cc: gdb-patches
Wow! I had no idea that even existed. I always just did ctags `find .
-name "*.[ch]"`. I suppose that the make TAGS is smart enough to only
generate tags for the source files that have been configured for your
target? How handy!
cheers,
Kris
Nick Roberts wrote:
>
> make TAGS doesn't seem to work in the gdb directory for two reason:
>
> 1) minimon.h, symfile-mem.h, amdfbsd-nat.c, irix4-nat.c, m3-nat.c,
> mipsm3-nat.c, ns32k-tdep.c, symm-tdep.c and symm-nat.c have been
> removed.
>
> 2) It doesn't find mi-*.c tui-*.c because they are in different
> directories.
>
>
> It's been bust for quite a long time so either people don't use it much,
> they have a local patch or there's something wrong with my setup.
> Assuming
> its not the latter, I attach a patch.
>
> Nick
>
>
> 2005-09-21 Nick Roberts <nickrob@snap.net.nz>
>
> * Makefile.in (HFILES_NO_SRCDIR): Remove minimon.h,
> symfile-mem.h,
> amdfbsd-nat.c, irix4-nat.c, m3-nat.c, mipsm3-nat.c, ns32k-tdep.c,
> symm-tdep.c and symm-nat.c.
> (TAGFILES_NO_SRCDIR): Add SUBDIR_MI_SRCS SUBDIR_TUI_SRCS.
> (DEPFILES): Remove CONFIG_OBS and include it explicitly where
> needed.
>
>
> *** /home/nickrob/src/gdb/Makefile.in.~1.753.~ 2005-09-16
> 18:00:51.000000000 +1200
> --- /home/nickrob/src/gdb/Makefile.in 2005-09-21 09:44:57.617994472
> +1200
> ***************
> *** 852,860 ****
> HFILES_NO_SRCDIR = bcache.h buildsym.h call-cmds.h coff-solib.h
> defs.h \
> exceptions.h \
> environ.h $(gdbcmd_h) gdb.h gdbcore.h \
> ! gdb-stabs.h $(inferior_h) language.h minimon.h monitor.h \
> objfiles.h parser-defs.h serial.h solib.h \
> ! symfile.h symfile-mem.h stabsread.h target.h terminal.h
> typeprint.h \
> xcoffsolib.h \
> macrotab.h macroexp.h macroscope.h \
> ada-lang.h c-lang.h f-lang.h \
> --- 852,860 ----
> HFILES_NO_SRCDIR = bcache.h buildsym.h call-cmds.h coff-solib.h
> defs.h \
> exceptions.h \
> environ.h $(gdbcmd_h) gdb.h gdbcore.h \
> ! gdb-stabs.h $(inferior_h) language.h monitor.h \
> objfiles.h parser-defs.h serial.h solib.h \
> ! symfile.h stabsread.h target.h terminal.h typeprint.h \
> xcoffsolib.h \
> macrotab.h macroexp.h macroscope.h \
> ada-lang.h c-lang.h f-lang.h \
> ***************
> *** 881,896 ****
> # Makefile.in
>
> DEPFILES = $(TDEPFILES) $(SER_HARDWIRE) $(NATDEPFILES) \
> ! $(REMOTE_OBS) $(SIM_OBS) $(CONFIG_OBS)
>
> SOURCES = $(SFILES) $(ALLDEPFILES) $(YYFILES) $(CONFIG_SRCS)
> # Don't include YYFILES (*.c) because we already include *.y in SFILES,
> # and it's more useful to see it in the .y file.
> TAGFILES_NO_SRCDIR = $(SFILES) $(HFILES_NO_SRCDIR) $(ALLDEPFILES) \
> ! $(SUBDIR_CLI_SRCS)
> TAGFILES_WITH_SRCDIR = $(HFILES_WITH_SRCDIR)
>
> ! COMMON_OBS = $(DEPFILES) $(YYOBJ) \
> version.o \
> annotate.o \
> auxv.o \
> --- 881,896 ----
> # Makefile.in
>
> DEPFILES = $(TDEPFILES) $(SER_HARDWIRE) $(NATDEPFILES) \
> ! $(REMOTE_OBS) $(SIM_OBS)
>
> SOURCES = $(SFILES) $(ALLDEPFILES) $(YYFILES) $(CONFIG_SRCS)
> # Don't include YYFILES (*.c) because we already include *.y in SFILES,
> # and it's more useful to see it in the .y file.
> TAGFILES_NO_SRCDIR = $(SFILES) $(HFILES_NO_SRCDIR) $(ALLDEPFILES) \
> ! $(SUBDIR_CLI_SRCS) $(SUBDIR_MI_SRCS) $(SUBDIR_TUI_SRCS)
> TAGFILES_WITH_SRCDIR = $(HFILES_WITH_SRCDIR)
>
> ! COMMON_OBS = $(DEPFILES) $(CONFIG_OBJS) $(YYOBJ) \
> version.o \
> annotate.o \
> auxv.o \
> ***************
> *** 1232,1238 ****
> @etags $(srcdir)/$(DEPRECATED_TM_FILE) \
> $(srcdir)/$(XM_FILE) \
> $(srcdir)/$(NAT_FILE) \
> ! `(for i in $(DEPFILES) $(TAGFILES_NO_SRCDIR); do \
> echo $(srcdir)/$$i ; \
> done ; for i in $(TAGFILES_WITH_SRCDIR); do \
> echo $$i ; \
> --- 1232,1238 ----
> @etags $(srcdir)/$(DEPRECATED_TM_FILE) \
> $(srcdir)/$(XM_FILE) \
> $(srcdir)/$(NAT_FILE) \
> ! `(for i in $(TAGFILES_NO_SRCDIR); do \
> echo $(srcdir)/$$i ; \
> done ; for i in $(TAGFILES_WITH_SRCDIR); do \
> echo $$i ; \
> ***************
> *** 1354,1360 ****
>
> lint: $(LINTFILES)
> $(LINT) $(INCLUDE_CFLAGS) $(LINTFLAGS) $(LINTFILES) \
> ! `echo $(DEPFILES) | sed 's/\.o /\.c /g'`
>
> gdb.cxref: $(SFILES)
> cxref -I. $(SFILES) >gdb.cxref
> --- 1354,1360 ----
>
> lint: $(LINTFILES)
> $(LINT) $(INCLUDE_CFLAGS) $(LINTFLAGS) $(LINTFILES) \
> ! `echo $(DEPFILES) $(CONFIG_OBJS) | sed 's/\.o /\.c /g'`
>
> gdb.cxref: $(SFILES)
> cxref -I. $(SFILES) >gdb.cxref
> ***************
> *** 1378,1384 ****
> alpha-tdep.c alpha-linux-tdep.c alphabsd-tdep.c
> alphanbsd-tdep.c \
> alpha-osf1-tdep.c alphafbsd-tdep.c alpha-mdebug-tdep.c \
> amd64-nat.c amd64-tdep.c \
> ! amd64bsd-nat.c amdfbsd-nat.c amd64fbsd-tdep.c \
> amd64nbsd-nat.c amd64nbsd-tdep.c \
> amd64obsd-nat.c amd64obsd-tdep.c \
> amd64-linux-nat.c amd64-linux-tdep.c \
> --- 1378,1384 ----
> alpha-tdep.c alpha-linux-tdep.c alphabsd-tdep.c
> alphanbsd-tdep.c \
> alpha-osf1-tdep.c alphafbsd-tdep.c alpha-mdebug-tdep.c \
> amd64-nat.c amd64-tdep.c \
> ! amd64bsd-nat.c amd64fbsd-tdep.c \
> amd64nbsd-nat.c amd64nbsd-tdep.c \
> amd64obsd-nat.c amd64obsd-tdep.c \
> amd64-linux-nat.c amd64-linux-tdep.c \
> ***************
> *** 1408,1416 ****
> i386gnu-nat.c i386gnu-tdep.c \
> ia64-linux-nat.c ia64-linux-tdep.c ia64-tdep.c \
> inf-ptrace.c inf-ttrace.c \
> ! infptrace.c inftarg.c irix4-nat.c irix5-nat.c \
> libunwind-frame.c \
> ! lynx-nat.c m3-nat.c \
> m68hc11-tdep.c \
> m32r-tdep.c \
> m32r-linux-nat.c m32r-linux-tdep.c \
> --- 1408,1416 ----
> i386gnu-nat.c i386gnu-tdep.c \
> ia64-linux-nat.c ia64-linux-tdep.c ia64-tdep.c \
> inf-ptrace.c inf-ttrace.c \
> ! infptrace.c inftarg.c irix5-nat.c \
> libunwind-frame.c \
> ! lynx-nat.c \
> m68hc11-tdep.c \
> m32r-tdep.c \
> m32r-linux-nat.c m32r-linux-tdep.c \
> ***************
> *** 1418,1431 ****
> m68kbsd-nat.c m68kbsd-tdep.c \
> m68klinux-nat.c m68klinux-tdep.c \
> m88k-tdep.c m88kbsd-nat.c \
> - mcore-tdep.c \
> mips-linux-nat.c mips-linux-tdep.c \
> mips-irix-tdep.c \
> ! mips-tdep.c mipsm3-nat.c mipsv4-nat.c \
> mipsnbsd-nat.c mipsnbsd-tdep.c \
> mips64obsd-nat.c mips64obsd-tdep.c \
> nbsd-tdep.c \
> ! ns32k-tdep.c solib-osf.c \
> somread.c solib-som.c $(HPREAD_SOURCE) \
> ppc-sysv-tdep.c ppc-linux-nat.c ppc-linux-tdep.c \
> ppcnbsd-nat.c ppcnbsd-tdep.c \
> --- 1418,1430 ----
> m68kbsd-nat.c m68kbsd-tdep.c \
> m68klinux-nat.c m68klinux-tdep.c \
> m88k-tdep.c m88kbsd-nat.c \
> mips-linux-nat.c mips-linux-tdep.c \
> mips-irix-tdep.c \
> ! mips-tdep.c mipsv4-nat.c \
> mipsnbsd-nat.c mipsnbsd-tdep.c \
> mips64obsd-nat.c mips64obsd-tdep.c \
> nbsd-tdep.c \
> ! solib-osf.c \
> somread.c solib-som.c $(HPREAD_SOURCE) \
> ppc-sysv-tdep.c ppc-linux-nat.c ppc-linux-tdep.c \
> ppcnbsd-nat.c ppcnbsd-tdep.c \
> ***************
> *** 1447,1453 ****
> sparc64-tdep.c sparc64fbsd-nat.c sparc64fbsd-tdep.c \
> sparc64nbsd-nat.c sparc64nbsd-tdep.c sparc64obsd-tdep.c \
> sparcnbsd-nat.c sparcnbsd-tdep.c sparcobsd-tdep.c \
> - symm-tdep.c symm-nat.c \
> v850-tdep.c \
> vax-nat.c vax-tdep.c vaxbsd-nat.c vaxnbsd-tdep.c \
> win32-nat.c \
> --- 1446,1451 ----
>
> Diff finished. Wed Sep 21 10:01:41 2005
>
--
Stay up-to-date on all the QNX news! Register at
http://www.qnx.com/news/forms/newsletter.html to
receive our newsletter.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] Get make TAGS to work in gdb directory
2005-09-21 14:36 ` Kris Warkentin
@ 2005-09-28 3:23 ` Nick Roberts
0 siblings, 0 replies; 7+ messages in thread
From: Nick Roberts @ 2005-09-28 3:23 UTC (permalink / raw)
To: Kris Warkentin; +Cc: gdb-patches
Kris Warkentin writes:
> Wow! I had no idea that even existed. I always just did ctags `find .
> -name "*.[ch]"`. I suppose that the make TAGS is smart enough to only
> generate tags for the source files that have been configured for your
> target? How handy!
Actually, it creates TAGS for files that aren't compiled through ALLDEPFILES.
However it finds the tags for the source files that have been configured
first:
# Put the proper machine-specific files first, so M-. on a machine
# specific routine gets the one for the correct machine. (FIXME: those
# files go in twice; we should be removing them from the main list).
So in my case I find child_wait in linux-nat.c (compiled as part of my gdb)
and then inftarg.c (not compiled).
That comment and this one:
# Header files that need to have srcdir added. Note that in the cases
# where we use a macro like $(gdbcmd_h), things are carefully arranged
# so that each .h file is listed exactly once (M-x tags-search works
# wrong if TAGS has files twice). Because this is tricky to get
# right, it is probably easiest just to list .h files here directly.
seem inaccurate in that etags seems to ignore duplicate file names.
It might make sense just to include files that are configured in that if users
want them all they can just use ctags/etags directly as you have done. In any
case there seem to be other files in COMMON_OBS for which TAGS should be
generated e.g. annotate.c.
How about the patch below?
Nick
*** Makefile.in.~1.755~ 2005-09-28 15:08:01.000000000 +1200
--- Makefile.in 2005-09-28 15:10:07.388706664 +1200
***************
*** 886,897 ****
SOURCES = $(SFILES) $(ALLDEPFILES) $(YYFILES) $(CONFIG_SRCS)
# Don't include YYFILES (*.c) because we already include *.y in SFILES,
# and it's more useful to see it in the .y file.
! TAGFILES_NO_SRCDIR = $(SFILES) $(HFILES_NO_SRCDIR) $(ALLDEPFILES) \
$(CONFIG_SRCS)
TAGFILES_WITH_SRCDIR = $(HFILES_WITH_SRCDIR)
! COMMON_OBS = $(DEPFILES) $(CONFIG_OBS) $(YYOBJ) \
! version.o \
annotate.o \
auxv.o \
bfd-target.o \
--- 886,898 ----
SOURCES = $(SFILES) $(ALLDEPFILES) $(YYFILES) $(CONFIG_SRCS)
# Don't include YYFILES (*.c) because we already include *.y in SFILES,
# and it's more useful to see it in the .y file.
! TAGFILES_NO_SRCDIR = $(SFILES) $(HFILES_NO_SRCDIR) $(OTHER_COMMON_OBS) \
$(CONFIG_SRCS)
TAGFILES_WITH_SRCDIR = $(HFILES_WITH_SRCDIR)
! COMMON_OBS = $(DEPFILES) $(CONFIG_OBS) $(YYOBJ) $(OTHER_COMMON_OBS)
!
! OTHER_COMMON_OBS = version.o \
annotate.o \
auxv.o \
bfd-target.o \
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] Get make TAGS to work in gdb directory
2005-09-20 22:27 [PATCH] Get make TAGS to work in gdb directory Nick Roberts
2005-09-21 14:36 ` Kris Warkentin
@ 2005-09-26 1:39 ` Daniel Jacobowitz
2005-09-26 4:43 ` Nick Roberts
1 sibling, 1 reply; 7+ messages in thread
From: Daniel Jacobowitz @ 2005-09-26 1:39 UTC (permalink / raw)
To: Nick Roberts; +Cc: gdb-patches
On Wed, Sep 21, 2005 at 10:27:18AM +1200, Nick Roberts wrote:
>
> make TAGS doesn't seem to work in the gdb directory for two reason:
>
> 1) minimon.h, symfile-mem.h, amdfbsd-nat.c, irix4-nat.c, m3-nat.c,
> mipsm3-nat.c, ns32k-tdep.c, symm-tdep.c and symm-nat.c have been removed.
>
> 2) It doesn't find mi-*.c tui-*.c because they are in different
> directories.
>
>
> It's been bust for quite a long time so either people don't use it much,
> they have a local patch or there's something wrong with my setup. Assuming
> its not the latter, I attach a patch.
It's the first option, I think. I know I don't use it.
> 2005-09-21 Nick Roberts <nickrob@snap.net.nz>
>
> * Makefile.in (HFILES_NO_SRCDIR): Remove minimon.h, symfile-mem.h,
> amdfbsd-nat.c, irix4-nat.c, m3-nat.c, mipsm3-nat.c, ns32k-tdep.c,
> symm-tdep.c and symm-nat.c.
> (TAGFILES_NO_SRCDIR): Add SUBDIR_MI_SRCS SUBDIR_TUI_SRCS.
> (DEPFILES): Remove CONFIG_OBS and include it explicitly where needed.
This doesn't match what you said above but tipped me off to the
problem; s/amdfbsd-nat.c/amd64fbsd-nat.c/ instead please.
Also, removing CONFIG_OBS doesn't have quite the affect you wanted.
You've also lost anything else that configure can add e.g.
libunwind-frame.c. Would adding CONFIG_SRCS to TAGFILES_NO_SRCDIR
instead work?
--
Daniel Jacobowitz
CodeSourcery, LLC
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] Get make TAGS to work in gdb directory
2005-09-26 1:39 ` Daniel Jacobowitz
@ 2005-09-26 4:43 ` Nick Roberts
2005-09-26 13:25 ` Daniel Jacobowitz
0 siblings, 1 reply; 7+ messages in thread
From: Nick Roberts @ 2005-09-26 4:43 UTC (permalink / raw)
To: Daniel Jacobowitz; +Cc: gdb-patches
Daniel Jacobowitz writes:
> This doesn't match what you said above but tipped me off to the
> problem; s/amdfbsd-nat.c/amd64fbsd-nat.c/ instead please.
OK.
> Also, removing CONFIG_OBS doesn't have quite the affect you wanted.
> You've also lost anything else that configure can add e.g.
> libunwind-frame.c. Would adding CONFIG_SRCS to TAGFILES_NO_SRCDIR
> instead work?
Yes, I think so. I've also corrected my earlier typo (CONFIG_OBJS).
Nick
2005-09-26 Nick Roberts <nickrob@snap.net.nz>
* Makefile.in (HFILES_NO_SRCDIR): Remove minimon.h, symfile-mem.h.
(ALLDEPFILES) Correct typo amdfbsd-nat.c -> amd64fbsd-nat.c.
Remove irix4-nat.c, m3-nat.c, mipsm3-nat.c, ns32k-tdep.c
symm-tdep.c and symm-nat.c.
(TAGFILES_NO_SRCDIR): Add CONFIG_SRCS.
(DEPFILES): Remove CONFIG_OBS and include it explicitly where
needed.
*** Makefile.in 16 Sep 2005 18:00:51 +1200 1.753
--- Makefile.in 26 Sep 2005 16:35:01 +1200
*************** tui_winsource_h = $(srcdir)/tui/tui-wins
*** 852,860 ****
HFILES_NO_SRCDIR = bcache.h buildsym.h call-cmds.h coff-solib.h defs.h \
exceptions.h \
environ.h $(gdbcmd_h) gdb.h gdbcore.h \
! gdb-stabs.h $(inferior_h) language.h minimon.h monitor.h \
objfiles.h parser-defs.h serial.h solib.h \
! symfile.h symfile-mem.h stabsread.h target.h terminal.h typeprint.h \
xcoffsolib.h \
macrotab.h macroexp.h macroscope.h \
ada-lang.h c-lang.h f-lang.h \
--- 852,860 ----
HFILES_NO_SRCDIR = bcache.h buildsym.h call-cmds.h coff-solib.h defs.h \
exceptions.h \
environ.h $(gdbcmd_h) gdb.h gdbcore.h \
! gdb-stabs.h $(inferior_h) language.h monitor.h \
objfiles.h parser-defs.h serial.h solib.h \
! symfile.h stabsread.h target.h terminal.h typeprint.h \
xcoffsolib.h \
macrotab.h macroexp.h macroscope.h \
ada-lang.h c-lang.h f-lang.h \
*************** REMOTE_EXAMPLES = m68k-stub.c i386-stub.
*** 881,896 ****
# Makefile.in
DEPFILES = $(TDEPFILES) $(SER_HARDWIRE) $(NATDEPFILES) \
! $(REMOTE_OBS) $(SIM_OBS) $(CONFIG_OBS)
SOURCES = $(SFILES) $(ALLDEPFILES) $(YYFILES) $(CONFIG_SRCS)
# Don't include YYFILES (*.c) because we already include *.y in SFILES,
# and it's more useful to see it in the .y file.
TAGFILES_NO_SRCDIR = $(SFILES) $(HFILES_NO_SRCDIR) $(ALLDEPFILES) \
! $(SUBDIR_CLI_SRCS)
TAGFILES_WITH_SRCDIR = $(HFILES_WITH_SRCDIR)
! COMMON_OBS = $(DEPFILES) $(YYOBJ) \
version.o \
annotate.o \
auxv.o \
--- 881,896 ----
# Makefile.in
DEPFILES = $(TDEPFILES) $(SER_HARDWIRE) $(NATDEPFILES) \
! $(REMOTE_OBS) $(SIM_OBS)
SOURCES = $(SFILES) $(ALLDEPFILES) $(YYFILES) $(CONFIG_SRCS)
# Don't include YYFILES (*.c) because we already include *.y in SFILES,
# and it's more useful to see it in the .y file.
TAGFILES_NO_SRCDIR = $(SFILES) $(HFILES_NO_SRCDIR) $(ALLDEPFILES) \
! $(CONFIG_SRCS)
TAGFILES_WITH_SRCDIR = $(HFILES_WITH_SRCDIR)
! COMMON_OBS = $(DEPFILES) $(CONFIG_OBS) $(YYOBJ) \
version.o \
annotate.o \
auxv.o \
*************** TAGS: $(TAGFILES_NO_SRCDIR) $(TAGFILES_W
*** 1232,1238 ****
@etags $(srcdir)/$(DEPRECATED_TM_FILE) \
$(srcdir)/$(XM_FILE) \
$(srcdir)/$(NAT_FILE) \
! `(for i in $(DEPFILES) $(TAGFILES_NO_SRCDIR); do \
echo $(srcdir)/$$i ; \
done ; for i in $(TAGFILES_WITH_SRCDIR); do \
echo $$i ; \
--- 1232,1238 ----
@etags $(srcdir)/$(DEPRECATED_TM_FILE) \
$(srcdir)/$(XM_FILE) \
$(srcdir)/$(NAT_FILE) \
! `(for i in $(TAGFILES_NO_SRCDIR); do \
echo $(srcdir)/$$i ; \
done ; for i in $(TAGFILES_WITH_SRCDIR); do \
echo $$i ; \
*************** observer.inc: observer.sh doc/observer.t
*** 1354,1360 ****
lint: $(LINTFILES)
$(LINT) $(INCLUDE_CFLAGS) $(LINTFLAGS) $(LINTFILES) \
! `echo $(DEPFILES) | sed 's/\.o /\.c /g'`
gdb.cxref: $(SFILES)
cxref -I. $(SFILES) >gdb.cxref
--- 1354,1360 ----
lint: $(LINTFILES)
$(LINT) $(INCLUDE_CFLAGS) $(LINTFLAGS) $(LINTFILES) \
! `echo $(DEPFILES) $(CONFIG_OBS) | sed 's/\.o /\.c /g'`
gdb.cxref: $(SFILES)
cxref -I. $(SFILES) >gdb.cxref
*************** ALLDEPFILES = \
*** 1378,1384 ****
alpha-tdep.c alpha-linux-tdep.c alphabsd-tdep.c alphanbsd-tdep.c \
alpha-osf1-tdep.c alphafbsd-tdep.c alpha-mdebug-tdep.c \
amd64-nat.c amd64-tdep.c \
! amd64bsd-nat.c amdfbsd-nat.c amd64fbsd-tdep.c \
amd64nbsd-nat.c amd64nbsd-tdep.c \
amd64obsd-nat.c amd64obsd-tdep.c \
amd64-linux-nat.c amd64-linux-tdep.c \
--- 1378,1384 ----
alpha-tdep.c alpha-linux-tdep.c alphabsd-tdep.c alphanbsd-tdep.c \
alpha-osf1-tdep.c alphafbsd-tdep.c alpha-mdebug-tdep.c \
amd64-nat.c amd64-tdep.c \
! amd64bsd-nat.c amd64fbsd-nat.c amd64fbsd-tdep.c \
amd64nbsd-nat.c amd64nbsd-tdep.c \
amd64obsd-nat.c amd64obsd-tdep.c \
amd64-linux-nat.c amd64-linux-tdep.c \
*************** ALLDEPFILES = \
*** 1408,1416 ****
i386gnu-nat.c i386gnu-tdep.c \
ia64-linux-nat.c ia64-linux-tdep.c ia64-tdep.c \
inf-ptrace.c inf-ttrace.c \
! infptrace.c inftarg.c irix4-nat.c irix5-nat.c \
libunwind-frame.c \
! lynx-nat.c m3-nat.c \
m68hc11-tdep.c \
m32r-tdep.c \
m32r-linux-nat.c m32r-linux-tdep.c \
--- 1408,1416 ----
i386gnu-nat.c i386gnu-tdep.c \
ia64-linux-nat.c ia64-linux-tdep.c ia64-tdep.c \
inf-ptrace.c inf-ttrace.c \
! infptrace.c inftarg.c irix5-nat.c \
libunwind-frame.c \
! lynx-nat.c \
m68hc11-tdep.c \
m32r-tdep.c \
m32r-linux-nat.c m32r-linux-tdep.c \
*************** ALLDEPFILES = \
*** 1418,1431 ****
m68kbsd-nat.c m68kbsd-tdep.c \
m68klinux-nat.c m68klinux-tdep.c \
m88k-tdep.c m88kbsd-nat.c \
- mcore-tdep.c \
mips-linux-nat.c mips-linux-tdep.c \
mips-irix-tdep.c \
! mips-tdep.c mipsm3-nat.c mipsv4-nat.c \
mipsnbsd-nat.c mipsnbsd-tdep.c \
mips64obsd-nat.c mips64obsd-tdep.c \
nbsd-tdep.c \
! ns32k-tdep.c solib-osf.c \
somread.c solib-som.c $(HPREAD_SOURCE) \
ppc-sysv-tdep.c ppc-linux-nat.c ppc-linux-tdep.c \
ppcnbsd-nat.c ppcnbsd-tdep.c \
--- 1418,1430 ----
m68kbsd-nat.c m68kbsd-tdep.c \
m68klinux-nat.c m68klinux-tdep.c \
m88k-tdep.c m88kbsd-nat.c \
mips-linux-nat.c mips-linux-tdep.c \
mips-irix-tdep.c \
! mips-tdep.c mipsv4-nat.c \
mipsnbsd-nat.c mipsnbsd-tdep.c \
mips64obsd-nat.c mips64obsd-tdep.c \
nbsd-tdep.c \
! solib-osf.c \
somread.c solib-som.c $(HPREAD_SOURCE) \
ppc-sysv-tdep.c ppc-linux-nat.c ppc-linux-tdep.c \
ppcnbsd-nat.c ppcnbsd-tdep.c \
*************** ALLDEPFILES = \
*** 1447,1453 ****
sparc64-tdep.c sparc64fbsd-nat.c sparc64fbsd-tdep.c \
sparc64nbsd-nat.c sparc64nbsd-tdep.c sparc64obsd-tdep.c \
sparcnbsd-nat.c sparcnbsd-tdep.c sparcobsd-tdep.c \
- symm-tdep.c symm-nat.c \
v850-tdep.c \
vax-nat.c vax-tdep.c vaxbsd-nat.c vaxnbsd-tdep.c \
win32-nat.c \
--- 1446,1451 ----
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] Get make TAGS to work in gdb directory
2005-09-26 4:43 ` Nick Roberts
@ 2005-09-26 13:25 ` Daniel Jacobowitz
2005-09-28 3:01 ` Nick Roberts
0 siblings, 1 reply; 7+ messages in thread
From: Daniel Jacobowitz @ 2005-09-26 13:25 UTC (permalink / raw)
To: Nick Roberts; +Cc: gdb-patches
On Mon, Sep 26, 2005 at 04:37:15PM +1200, Nick Roberts wrote:
> 2005-09-26 Nick Roberts <nickrob@snap.net.nz>
>
> * Makefile.in (HFILES_NO_SRCDIR): Remove minimon.h, symfile-mem.h.
> (ALLDEPFILES) Correct typo amdfbsd-nat.c -> amd64fbsd-nat.c.
> Remove irix4-nat.c, m3-nat.c, mipsm3-nat.c, ns32k-tdep.c
> symm-tdep.c and symm-nat.c.
> (TAGFILES_NO_SRCDIR): Add CONFIG_SRCS.
> (DEPFILES): Remove CONFIG_OBS and include it explicitly where
> needed.
Thanks, this is OK.
--
Daniel Jacobowitz
CodeSourcery, LLC
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] Get make TAGS to work in gdb directory
2005-09-26 13:25 ` Daniel Jacobowitz
@ 2005-09-28 3:01 ` Nick Roberts
0 siblings, 0 replies; 7+ messages in thread
From: Nick Roberts @ 2005-09-28 3:01 UTC (permalink / raw)
To: Daniel Jacobowitz; +Cc: gdb-patches
Daniel Jacobowitz writes:
> On Mon, Sep 26, 2005 at 04:37:15PM +1200, Nick Roberts wrote:
> > 2005-09-26 Nick Roberts <nickrob@snap.net.nz>
> >
> > * Makefile.in (HFILES_NO_SRCDIR): Remove minimon.h, symfile-mem.h.
> > (ALLDEPFILES) Correct typo amdfbsd-nat.c -> amd64fbsd-nat.c.
> > Remove irix4-nat.c, m3-nat.c, mipsm3-nat.c, ns32k-tdep.c
> > symm-tdep.c and symm-nat.c.
> > (TAGFILES_NO_SRCDIR): Add CONFIG_SRCS.
> > (DEPFILES): Remove CONFIG_OBS and include it explicitly where
> > needed.
>
> Thanks, this is OK.
Committed. I've made a small correction (I've put back DEPFILES, otherwise
there was no point in changing it). I'm hoping that counts as an obvious fix.
Nick
*** Makefile.in.~1.754~ 2005-09-28 15:00:49.133574344 +1200
--- Makefile.in 2005-09-28 14:50:02.000000000 +1200
***************
*** 1227,1238 ****
# TAGS depends on all the files that go into it so you can rebuild TAGS
# with `make TAGS' and not have to say `rm TAGS' first.
! TAGS: $(TAGFILES_NO_SRCDIR) $(TAGFILES_WITH_SRCDIR)
@echo Making TAGS
@etags $(srcdir)/$(DEPRECATED_TM_FILE) \
$(srcdir)/$(XM_FILE) \
$(srcdir)/$(NAT_FILE) \
! `(for i in $(TAGFILES_NO_SRCDIR); do \
echo $(srcdir)/$$i ; \
done ; for i in $(TAGFILES_WITH_SRCDIR); do \
echo $$i ; \
--- 1227,1238 ----
# TAGS depends on all the files that go into it so you can rebuild TAGS
# with `make TAGS' and not have to say `rm TAGS' first.
! TAGS: $(DEPFILES) $(TAGFILES_NO_SRCDIR) $(TAGFILES_WITH_SRCDIR)
@echo Making TAGS
@etags $(srcdir)/$(DEPRECATED_TM_FILE) \
$(srcdir)/$(XM_FILE) \
$(srcdir)/$(NAT_FILE) \
! `(for i in $(DEPFILES) $(TAGFILES_NO_SRCDIR); do \
echo $(srcdir)/$$i ; \
done ; for i in $(TAGFILES_WITH_SRCDIR); do \
echo $$i ; \
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2005-09-28 3:23 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2005-09-20 22:27 [PATCH] Get make TAGS to work in gdb directory Nick Roberts
2005-09-21 14:36 ` Kris Warkentin
2005-09-28 3:23 ` Nick Roberts
2005-09-26 1:39 ` Daniel Jacobowitz
2005-09-26 4:43 ` Nick Roberts
2005-09-26 13:25 ` Daniel Jacobowitz
2005-09-28 3:01 ` Nick Roberts
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox