gdb/

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

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 65eb1feb750efd1933825332066685f4395b92f7..e5eee0626f2953b09c1fe888ca88a9f4ca04e8ff 100644 (file)
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -155,7 +155,8 @@ WERROR_CFLAGS = @WERROR_CFLAGS@
 GDB_WARN_CFLAGS = $(WARN_CFLAGS)
 GDB_WERROR_CFLAGS = $(WERROR_CFLAGS)
 
-GDB_WARN_CFLAGS_NO_FORMAT = `echo " $(GDB_WARN_CFLAGS) " | sed "s/ -Wformat-nonliteral / /g"`
+GDB_WARN_CFLAGS_NO_FORMAT = `echo " $(GDB_WARN_CFLAGS) " \
+                  | sed "s/ -Wformat-nonliteral / -Wno-format-nonliteral /g"`
 
 RDYNAMIC = @RDYNAMIC@
 
@@ -1037,6 +1038,8 @@ install-tui:
                $(INSTALL_DATA) $(srcdir)/gdb.1 \
                        $(DESTDIR)$(man1dir)/$$transformed_name.1
 
+install-python:
+       $(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(GDB_DATADIR)/python/gdb
 
 uninstall: force $(CONFIG_UNINSTALL)
        transformed_name=`t='$(program_transform_name)'; \
@@ -1529,14 +1532,15 @@ main.o: $(srcdir)/main.c
 # definitly will not work.  "monitor.c" needs to be rewritten so that
 # it doesn't use format strings and instead uses callbacks.
 monitor.o: $(srcdir)/monitor.c
-       $(COMPILE.pre) $(INTERNAL_WARN_CFLAGS) $(COMPILE.post) $(srcdir)/monitor.c
+       $(COMPILE.pre) $(INTERNAL_CFLAGS) $(GDB_WARN_CFLAGS_NO_FORMAT) \
+               $(COMPILE.post) $(srcdir)/monitor.c
        $(POSTCOMPILE)
 
 # Do not try to build "printcmd.c" with -Wformat-nonliteral.  It manually
 # checks format strings.
 printcmd.o: $(srcdir)/printcmd.c
-       $(COMPILE.pre) $(INTERNAL_CFLAGS_BASE) $(GDB_WARN_CFLAGS_NO_FORMAT) \
-               $(GDB_WERROR_CFLAGS) $(COMPILE.post) $(srcdir)/printcmd.c
+       $(COMPILE.pre) $(INTERNAL_CFLAGS) $(GDB_WARN_CFLAGS_NO_FORMAT) \
+               $(COMPILE.post) $(srcdir)/printcmd.c
        $(POSTCOMPILE)
 
 # Message files.  Based on code in gcc/Makefile.in.