diff options
author | Jim Kingdon <jkingdon@engr.sgi.com> | 1993-05-22 18:29:17 +0000 |
---|---|---|
committer | Jim Kingdon <jkingdon@engr.sgi.com> | 1993-05-22 18:29:17 +0000 |
commit | 1d3f5383e28d3b61852aefad0f77df22dcf98b04 (patch) | |
tree | 90eeb96f44d73dcc170e266f2eaa09edfc8069f9 /gdb/depend | |
parent | b273dc0f02c3aa130a3bb1b90b740ae3a122de52 (diff) | |
download | gdb-1d3f5383e28d3b61852aefad0f77df22dcf98b04.zip gdb-1d3f5383e28d3b61852aefad0f77df22dcf98b04.tar.gz gdb-1d3f5383e28d3b61852aefad0f77df22dcf98b04.tar.bz2 |
Remove <<<< stuff from CVS. Not sure how it got here
Diffstat (limited to 'gdb/depend')
-rwxr-xr-x | gdb/depend | 9 |
1 files changed, 0 insertions, 9 deletions
@@ -617,14 +617,6 @@ remote-st2000.o : ${srcdir}/remote-st2000.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansi ${srcdir}/gdbcore.h $(INCLUDE_DIR)/bfd.h $(INCLUDE_DIR)/obstack.h \ ${srcdir}/target.h $(INCLUDE_DIR)/wait.h ${srcdir}/serial.h ${CC} -c ${INTERNAL_CFLAGS} ${srcdir}/remote-st2000.c -<<<<<<< depend -remote-udi.o : ${srcdir}/remote-udi.c ${srcdir}/defs.h ${srcdir}/../include/ansidecl.h xm.h config.status nm.h \ - ${srcdir}/../include/fopen-same.h tm.h config.status ${srcdir}/inferior.h ${srcdir}/symtab.h ${srcdir}/../include/obstack.h \ - ${srcdir}/breakpoint.h ${srcdir}/frame.h ${srcdir}/value.h ${srcdir}/gdbtypes.h ${srcdir}/expression.h ${srcdir}/../include/wait.h \ - ${srcdir}/terminal.h ${srcdir}/target.h ${srcdir}/../include/bfd.h ${srcdir}/29k-share/udi/udiproc.h ${srcdir}/29k-share/udi/udiphcfg.h \ - ${srcdir}/29k-share/udi/udiphunix.h ${srcdir}/29k-share/udi/udiptcfg.h ${srcdir}/29k-share/udi/udipt29k.h \ - ${srcdir}/gdbcmd.h ${srcdir}/command.h -======= remote-udi.o : ${srcdir}/remote-udi.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h \ xm.h config.status ${srcdir}/config/sparc/xm-sparc.h nm.h config.status $(INCLUDE_DIR)/fopen-same.h \ tm.h config.status ${srcdir}/config/sparc/tm-sparc.h ${srcdir}/config/tm-sunos.h ${srcdir}/solib.h \ @@ -634,7 +626,6 @@ remote-udi.o : ${srcdir}/remote-udi.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h ${srcdir}/29k-share/udi/udiproc.h ${srcdir}/29k-share/udi/udiphcfg.h ${srcdir}/29k-share/udi/udiphsun.h \ ${srcdir}/29k-share/udi/udiptcfg.h ${srcdir}/29k-share/udi/udipt29k.h ${srcdir}/gdbcmd.h \ ${srcdir}/command.h ->>>>>>> 1.51 ${CC} -c ${INTERNAL_CFLAGS} ${srcdir}/remote-udi.c remote-vx.o : ${srcdir}/remote-vx.c ${srcdir}/defs.h $(INCLUDE_DIR)/ansidecl.h \ xm.h config.status ${srcdir}/config/sparc/xm-sparc.h nm.h config.status $(INCLUDE_DIR)/fopen-same.h \ |