* gdbint.texinfo (Formatting): Mention some formatting guidelines

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

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 9459de44f0b725482ce44e87b958c8ee5d4d4e31..4882bd4674faadb86de315ead1b7f278b8ee1443 100644 (file)
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -408,8 +408,13 @@ PROFILE_CFLAGS = @PROFILE_CFLAGS@
 # when running make.  I.E.  "make CFLAGS=-Wmissing-prototypes".
 CFLAGS = @CFLAGS@
 
-# Set by configure, for e.g. expat.
-INTERNAL_CPPFLAGS = @CPPFLAGS@
+# Set by configure, for e.g. expat.  Python installations are such that
+# C headers are included using their basename (for example, we #include
+# <Python.h> rather than, say, <python/Python.h>).  Since the file names
+# are sometimes a little generic, we think that the risk of collision
+# with other header files is high.  If that happens, we try to mitigate
+# a bit the consequences by putting the Python includes last in the list.
+INTERNAL_CPPFLAGS = @CPPFLAGS@ @PYTHON_CPPFLAGS@
 
 # Need to pass this to testsuite for "make check".  Probably should be
 # consistent with top-level Makefile.in and gdb/testsuite/Makefile.in
@@ -444,10 +449,10 @@ INTERNAL_LDFLAGS = $(CFLAGS) $(GLOBAL_CFLAGS) $(MH_LDFLAGS) $(LDFLAGS) $(CONFIG_
 # If you have the Cygnus libraries installed,
 # you can use 'CLIBS=$(INSTALLED_LIBS)' 'CDEPS='
 INSTALLED_LIBS=-lbfd -lreadline -lopcodes -liberty -ldecnumber \
-       $(XM_CLIBS) $(NAT_CLIBS) $(GDBTKLIBS) @LIBS@ \
+       $(XM_CLIBS) $(NAT_CLIBS) $(GDBTKLIBS) @LIBS@ @PYTHON_LIBS@ \
        -lintl -liberty $(LIBGNU)
 CLIBS = $(SIM) $(READLINE) $(OPCODES) $(BFD) $(INTL) $(LIBIBERTY) $(LIBDECNUMBER) \
-       $(XM_CLIBS) $(NAT_CLIBS) $(GDBTKLIBS) @LIBS@ \
+       $(XM_CLIBS) $(NAT_CLIBS) $(GDBTKLIBS) @LIBS@ @PYTHON_LIBS@ \
        $(LIBEXPAT) \
        $(LIBIBERTY) $(WIN32LIBS) $(LIBGNU)
 CDEPS = $(XM_CDEPS) $(NAT_CDEPS) $(SIM) $(BFD) $(READLINE_DEPS) \
@@ -497,7 +502,7 @@ ALL_64_TARGET_OBS = \
        amd64fbsd-tdep.o amd64-darwin-tdep.o amd64-dicos-tdep.o \
        amd64-linux-tdep.o amd64nbsd-tdep.o \
        amd64obsd-tdep.o amd64-sol2-tdep.o amd64-tdep.o amd64-windows-tdep.o \
-       ia64-linux-tdep.o ia64-tdep.o \
+       ia64-hpux-tdep.o ia64-linux-tdep.o ia64-tdep.o \
        mips64obsd-tdep.o \
        sparc64fbsd-tdep.o sparc64-linux-tdep.o sparc64nbsd-tdep.o \
        sparc64obsd-tdep.o sparc64-sol2-tdep.o sparc64-tdep.o
@@ -554,7 +559,7 @@ ALL_TARGET_OBS = \
        solib-frv.o solib-irix.o solib-svr4.o solib-target.o \
        solib-som.o solib-pa64.o solib-darwin.o \
        dbug-rom.o dink32-rom.o ppcbug-rom.o m32r-rom.o dsrec.o monitor.o \
-       remote-m32r-sdi.o \
+       remote-m32r-sdi.o remote-mips.o \
        xcoffread.o \
        symfile-mem.o \
        corelow.o \
@@ -783,7 +788,7 @@ annotate.h sim-regno.h dictionary.h dfp.h main.h frame-unwind.h     \
 remote-fileio.h i386-linux-tdep.h vax-tdep.h objc-lang.h \
 sentinel-frame.h bcache.h symfile.h windows-tdep.h linux-tdep.h \
 gdb_usleep.h jit.h xml-syscall.h ada-operator.inc microblaze-tdep.h \
-psymtab.h psympriv.h progspace.h bfin-tdep.h
+psymtab.h psympriv.h progspace.h bfin-tdep.h ia64-hpux-tdep.h
 
 # Header files that already have srcdir in them, or which are in objdir.
 
@@ -1445,6 +1450,7 @@ ALLDEPFILES = \
        i386-linux-tdep.c i386-nat.c \
        i386-sol2-nat.c i386-sol2-tdep.c \
        i386gnu-nat.c i386gnu-tdep.c \
+       ia64-hpux-nat.c ia64-hpux-tdep.c \
        ia64-linux-nat.c ia64-linux-tdep.c ia64-tdep.c \
        inf-ptrace.c inf-ttrace.c \
        irix5-nat.c \
@@ -1503,11 +1509,6 @@ ALLDEPFILES = \
 # Some files need explicit build rules (due to -Werror problems) or due
 # to sub-directory fun 'n' games.
 
-hpux-thread.o: $(srcdir)/hpux-thread.c
-       $(COMPILE) -I$(srcdir)/osf-share -I$(srcdir)/osf-share/HP800 \
-               -I/usr/include/dce $(srcdir)/hpux-thread.c
-       $(POSTCOMPILE)
-
 # main.o needs an explicit build rule to get TARGET_SYSTEM_ROOT and BINDIR.
 main.o: $(srcdir)/main.c
        $(COMPILE) $(TARGET_SYSTEM_ROOT_DEFINE) -DBINDIR=\"$(bindir)\" $(srcdir)/main.c