* gdb.stabs/ecoff.sed: Remove comment lines except for first one.

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

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index d8d13ef21c3b79d3ae873581d8ef691c661b0daa..ff0ec6498af45c10e1501cd97aeb81fbebbef691 100644 (file)
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -74,8 +74,8 @@ MAKEINFO=makeinfo
 
 # Set this up with gcc if you have gnu ld and the loader will print out
 # line numbers for undefined references.
-#CC-LD=gcc -static
-CC-LD=$(CC)
+#CC_LD=gcc -static
+CC_LD=$(CC)
 
 # Where is our "include" directory?  Typically $(srcdir)/../include.
 # This is essentially the header file directory for the library
@@ -90,12 +90,13 @@ LIBIBERTY = ../libiberty/libiberty.a
 # Note that mmalloc can still be used on systems without mmap().
 # To use your system malloc, comment out the following defines.
 MMALLOC_DIR = ../mmalloc
+MMALLOC_SRC = $(srcdir)/$(MMALLOC_DIR)
 MMALLOC = $(MMALLOC_DIR)/libmmalloc.a
 # To use your system malloc, uncomment MMALLOC_DISABLE.
 #MMALLOC_DISABLE = -DNO_MMALLOC
 # To use mmalloc but disable corruption checking, uncomment MMALLOC_CHECK
 #MMALLOC_CHECK = -DNO_MMALLOC_CHECK
-MMALLOC_CFLAGS = -I$(srcdir)/$(MMALLOC_DIR) $(MMALLOC_CHECK) $(MMALLOC_DISABLE)
+MMALLOC_CFLAGS = -I$(MMALLOC_SRC) $(MMALLOC_CHECK) $(MMALLOC_DISABLE)
 
 # Where is the BFD library?  Typically in ../bfd.
 BFD_DIR = ../bfd
@@ -133,8 +134,9 @@ TCL_CFLAGS = @TCLHDIR@
 TK = @TKLIB@
 TK_CFLAGS = @TKHDIR@
 
-X11 = @X_LIBDIR@ @X_PRE_LIBS@ -lX11 @X_EXTRA_LIBS@
-X11_CFLAGS = @X_INCDIR@
+X11_CFLAGS = @X_CFLAGS@ $(X11_EXTRA_CFLAGS)
+X11_LDFLAGS = @X_LDFLAGS@
+X11_LIBS = @X_LIBS@ $(X11_EXTRA_LIBS)
 
 ENABLE_GDBTK= @ENABLE_GDBTK@
 #end-sanitize-gdbtk
@@ -146,7 +148,7 @@ ENABLE_OBS= @ENABLE_OBS@
 
 # All the includes used for CFLAGS and for lint.
 # -I. for config files.
-# -I$(srcdir) for gdb internal headers and possibly for regex.h also.
+# -I$(srcdir) for gdb internal headers and possibly for gnu-regex.h also.
 # -I$(srcdir)/config for more generic config files.
 
 # It is also possible that you will need to add -I/usr/include/sys if
@@ -184,8 +186,8 @@ INTERNAL_LDFLAGS = $(CFLAGS) $(GLOBAL_CFLAGS) $(PROFILE_CFLAGS) $(LDFLAGS)
 
 # We are using our own version of REGEX now to be consistent across
 # machines.
-REGEX = regex.o
-REGEX1 = regex.o
+REGEX = gnu-regex.o
+REGEX1 = gnu-regex.o
 
 # If your system is missing alloca(), or, more likely, it's there but
 # it doesn't work, then refer to libiberty.
@@ -224,7 +226,7 @@ RUNTESTFLAGS=
 # part of libiberty) a POSIX interface.  But at least for now the
 # host-dependent makefile fragment might need to use something else
 # besides ser-unix.o
-SER_HARDWIRE=ser-unix.o
+SER_HARDWIRE = ser-unix.o
 
 # The `remote' debugging target is supported for most architectures,
 # but not all (e.g. 960)
@@ -435,7 +437,7 @@ INFOFILES = gdb.info*
 
 REMOTE_EXAMPLES = m68k-stub.c i386-stub.c sparc-stub.c rem-multi.shar
 
-POSSLIBS = regex.c regex.h
+POSSLIBS = gnu-regex.c gnu-regex.h
 
 # {X,T,NAT}DEPFILES are something of a pain in that it's hard to
 # default their values the way we do for SER_HARDWIRE; in the future
@@ -601,7 +603,7 @@ init.c: $(OBS) $(TSOBS)
 # Removing the old gdb first works better if it is running, at least on SunOS.
 gdb: $(OBS) $(TSOBS) $(ADD_DEPS) $(CDEPS) init.o
        rm -f gdb
-       $(CC-LD) $(INTERNAL_LDFLAGS) -o gdb \
+       $(CC_LD) $(INTERNAL_LDFLAGS) -o gdb \
          init.o $(OBS) $(TSOBS) $(ADD_FILES) $(CLIBS) $(LOADLIBES)
 
 nlm:   force
@@ -643,7 +645,7 @@ saber_gdb: $(SFILES) $(DEPFILES) copying.c version.c
 # A Mach 3.0 program to force gdb back to command level
 
 stop-gdb: stop-gdb.o
-       ${CC-LD} $(GLOBAL_CFLAGS) $(LDFLAGS) -o stop-gdb \
+       ${CC_LD} $(GLOBAL_CFLAGS) $(LDFLAGS) -o stop-gdb \
        stop-gdb.o $(CLIBS) $(LOADLIBES)
 
 # This is useful when debugging GDB, because some Unix's don't let you run GDB
@@ -1211,7 +1213,7 @@ inftarg.o: inftarg.c $(wait_h) $(defs_h) $(gdbcore_h) $(inferior_h) \
 
 irix4-nat.o: irix4-nat.c $(defs_h) $(inferior_h)
 irix5-nat.o: irix5-nat.c $(defs_h) $(inferior_h) $(gdbcore_h) target.h \
-       $(symtab_h) symfile.h objfiles.h $(command_h) $(frame_h) regex.h \
+       $(symtab_h) symfile.h objfiles.h $(command_h) $(frame_h) gnu-regex.h \
        language.h
 isi-xdep.o: isi-xdep.c
 
@@ -1306,7 +1308,7 @@ objfiles.o: objfiles.c $(bfd_h) $(defs_h) objfiles.h symfile.h \
        $(symtab_h)
 
 osfsolib.o: osfsolib.c $(command_h) $(defs_h) $(gdbcore_h) $(inferior_h) \
-       objfiles.h regex.h symfile.h target.h language.h
+       objfiles.h gnu-regex.h symfile.h target.h language.h
 
 somread.o: somread.c $(bfd_h) buildsym.h complaints.h $(defs_h) \
        gdb-stabs.h objfiles.h symfile.h $(symtab_h)
@@ -1330,7 +1332,7 @@ pyr-tdep.o: pyr-tdep.c $(defs_h)
 
 pyr-xdep.o: pyr-xdep.c $(defs_h) $(gdbcore_h) $(inferior_h) 
 
-regex.o: regex.c regex.h $(defs_h)
+gnu-regex.o: gnu-regex.c gnu-regex.h $(defs_h)
 
 remote-adapt.o: remote-adapt.c $(wait_h) $(defs_h) $(gdbcore_h) \
        $(inferior_h) target.h terminal.h
@@ -1406,6 +1408,8 @@ rs6000-tdep.o: rs6000-tdep.c $(defs_h) $(gdbcore_h) $(inferior_h) \
 
 ser-go32.o: ser-go32.c $(defs_h) serial.h 
 
+ser-mac.o: ser-mac.c $(defs_h) serial.h signals.h
+
 ser-tcp.o: ser-tcp.c $(defs_h) serial.h signals.h
 
 ser-unix.o: ser-unix.c $(defs_h) serial.h 
@@ -1420,10 +1424,10 @@ sh3-rom.o: sh3-rom.c monitor.h $(bfd_h) $(wait_h) $(defs_h) $(gdbcmd_h) \
        $(inferior_h) target.h serial.h terminal.h
 
 solib.o: solib.c $(command_h) $(defs_h) $(gdbcore_h) $(inferior_h) \
-       objfiles.h regex.h symfile.h target.h
+       objfiles.h gnu-regex.h symfile.h target.h
 
 source.o: source.c $(defs_h) $(expression_h) $(frame_h) $(gdbcmd_h) \
-       $(gdbcore_h) language.h objfiles.h regex.h symfile.h $(symtab_h)
+       $(gdbcore_h) language.h objfiles.h gnu-regex.h symfile.h $(symtab_h)
 
 sparc-nat.o: sparc-nat.c $(bfd_h) $(defs_h) $(inferior_h) target.h
 
@@ -1455,7 +1459,7 @@ symmisc.o: symmisc.c $(bfd_h) $(breakpoint_h) $(command_h) $(defs_h) \
 
 symtab.o: symtab.c call-cmds.h $(defs_h) $(expression_h) $(frame_h) \
        $(gdbcmd_h) $(gdbcore_h) $(gdbtypes_h) language.h objfiles.h \
-       regex.h symfile.h $(symtab_h) target.h $(value_h)
+       gnu-regex.h symfile.h $(symtab_h) target.h $(value_h)
 
 tahoe-tdep.o: tahoe-tdep.c $(OP_INCLUDE)/tahoe.h $(defs_h) \
        $(symtab_h)