diff options
| -rw-r--r-- | gdb/Makefile.in | 3 | ||||
| -rw-r--r-- | gdbserver/Makefile.in | 14 | ||||
| -rw-r--r-- | gdbsupport/Makefile.am | 1 | ||||
| -rw-r--r-- | gdbsupport/Makefile.in | 1 |
4 files changed, 16 insertions, 3 deletions
diff --git a/gdb/Makefile.in b/gdb/Makefile.in index a5139ea..a9f641c 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -607,6 +607,7 @@ GDB_CFLAGS = \ -I. \ -I$(srcdir) \ -I$(srcdir)/config \ + -include $(srcdir)/defs.h \ -DLOCALEDIR="\"$(localedir)\"" \ $(DEFS) @@ -2050,7 +2051,7 @@ check-headers: @echo Checking headers. for i in $(CHECK_HEADERS) ; do \ $(CXX) $(CXX_DIALECT) -x c++-header -c -fsyntax-only \ - $(INTERNAL_CFLAGS) $(CXXFLAGS) -include defs.h $(srcdir)/$$i ; \ + $(INTERNAL_CFLAGS) $(CXXFLAGS) $(srcdir)/$$i ; \ done .PHONY: check-headers diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in index 45073ab..5180e73 100644 --- a/gdbserver/Makefile.in +++ b/gdbserver/Makefile.in @@ -69,9 +69,12 @@ COMPILE.pre = $(CXX) $(CXX_DIALECT) COMPILE.post = -c -o $@ POSTCOMPILE = @true +INCLUDE_SERVER_H = -include $(srcdir)/server.h + # CXXFLAGS is at the very end on purpose, so that user-supplied flags can # override internal flags. -COMPILE = $(ECHO_CXX) $(COMPILE.pre) $(INTERNAL_CFLAGS) $(CXXFLAGS) $(COMPILE.post) +COMPILE = $(ECHO_CXX) $(COMPILE.pre) $(INTERNAL_CFLAGS) $(INCLUDE_SERVER_H) \ + $(CXXFLAGS) $(COMPILE.post) # It is also possible that you will need to add -I/usr/include/sys to the # CFLAGS section if your system doesn't have fcntl.h in /usr/include (which @@ -509,7 +512,8 @@ IPAGENT_CFLAGS = \ # CXXFLAGS is at the very end on purpose, so that user-supplied flags can # override internal flags. -IPAGENT_COMPILE = $(ECHO_CXX) $(COMPILE.pre) $(IPAGENT_CFLAGS) $(CXXFLAGS) $(COMPILE.post) +IPAGENT_COMPILE = $(ECHO_CXX) $(COMPILE.pre) $(IPAGENT_CFLAGS) \ + $(INCLUDE_SERVER_H) $(CXXFLAGS) $(COMPILE.post) # Rules for special cases. @@ -589,6 +593,12 @@ target/%.o: ../gdb/target/%.c %-generated.cc: ../gdb/regformats/rs6000/%.dat $(regdat_sh) $(ECHO_REGDAT) $(SHELL) $(regdat_sh) $< $@ +# Rule for gdbreplay.o. This is the same as COMPILE, but includes common-defs.h +# instead of server.h. +gdbreplay.o: gdbreplay.cc + $(ECHO_CXX) $(COMPILE.pre) $(INTERNAL_CFLAGS) $(CXXFLAGS) \ + -include gdbsupport/common-defs.h $(COMPILE.post) $< + # # Dependency tracking. # diff --git a/gdbsupport/Makefile.am b/gdbsupport/Makefile.am index 7c360aa..2b0f987 100644 --- a/gdbsupport/Makefile.am +++ b/gdbsupport/Makefile.am @@ -35,6 +35,7 @@ AM_CPPFLAGS = \ $(INCINTL) \ -I../bfd \ -I$(srcdir)/../bfd \ + -include $(srcdir)/common-defs.h \ @LARGEFILE_CPPFLAGS@ override CXX += $(CXX_DIALECT) diff --git a/gdbsupport/Makefile.in b/gdbsupport/Makefile.in index ab35b91..ee70911 100644 --- a/gdbsupport/Makefile.in +++ b/gdbsupport/Makefile.in @@ -403,6 +403,7 @@ AM_CPPFLAGS = \ $(INCINTL) \ -I../bfd \ -I$(srcdir)/../bfd \ + -include $(srcdir)/common-defs.h \ @LARGEFILE_CPPFLAGS@ AM_CXXFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) |