diff options
| -rw-r--r-- | gdb/ChangeLog | 9 | ||||
| -rw-r--r-- | gdb/Makefile.in | 55 | ||||
| -rwxr-xr-x | gdb/configure | 2 | ||||
| -rw-r--r-- | gdb/configure.ac | 2 |
4 files changed, 17 insertions, 51 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c91a45b..412720c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,14 @@ 2017-11-27 Tom Tromey <tom@tromey.com> + * Makefile.in (SUBDIR_PYTHON_OBS): Redefine. + (CONFIG_SRC_SUBDIR): Add python. + (%.o): Remove python rule. + (python/%.o): New rule. + * configure: Rebuild. + * configure.ac (CONFIG_OBS): Refer to python/python.o + +2017-11-27 Tom Tromey <tom@tromey.com> + * configure: Rebuild. * configure.ac (CONFIG_OBS): Refer to guile/guile.o. * Makefile.in (SUBDIR_GUILE_OBS): Redefine. diff --git a/gdb/Makefile.in b/gdb/Makefile.in index bcb34cc..c1b2e65 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -362,50 +362,6 @@ SUBDIR_GUILE_CFLAGS = # # python sub directory definitons # -SUBDIR_PYTHON_OBS = \ - py-arch.o \ - py-auto-load.o \ - py-block.o \ - py-bpevent.o \ - py-breakpoint.o \ - py-cmd.o \ - py-continueevent.o \ - py-event.o \ - py-evtregistry.o \ - py-evts.o \ - py-exitedevent.o \ - py-finishbreakpoint.o \ - py-frame.o \ - py-framefilter.o \ - py-function.o \ - py-gdb-readline.o \ - py-inferior.o \ - py-infevents.o \ - py-infthread.o \ - py-instruction.o \ - py-lazy-string.o \ - py-linetable.o \ - py-newobjfileevent.o \ - py-objfile.o \ - py-param.o \ - py-prettyprint.o \ - py-progspace.o \ - py-record.o \ - py-record-btrace.o \ - py-record-full.o \ - py-signalevent.o \ - py-stopevent.o \ - py-symbol.o \ - py-symtab.o \ - py-threadevent.o \ - py-type.o \ - py-unwind.o \ - py-utils.o \ - py-value.o \ - py-varobj.o \ - py-xmethods.o \ - python.o - SUBDIR_PYTHON_SRCS = \ python/py-arch.c \ python/py-auto-load.c \ @@ -450,6 +406,8 @@ SUBDIR_PYTHON_SRCS = \ python/py-xmethods.c \ python/python.c +SUBDIR_PYTHON_OBS = $(patsubst %.c,%.o,$(SUBDIR_PYTHON_SRCS)) + SUBDIR_PYTHON_DEPS = SUBDIR_PYTHON_LDFLAGS = SUBDIR_PYTHON_CFLAGS = @@ -560,7 +518,7 @@ CONFIG_INSTALL = @CONFIG_INSTALL@ CONFIG_UNINSTALL = @CONFIG_UNINSTALL@ HAVE_NATIVE_GCORE_TARGET = @HAVE_NATIVE_GCORE_TARGET@ -CONFIG_SRC_SUBDIR = arch cli mi compile tui unittests guile +CONFIG_SRC_SUBDIR = arch cli mi compile tui unittests guile python CONFIG_DEP_SUBDIR = $(addsuffix /$(DEPDIR),$(CONFIG_SRC_SUBDIR)) # -I. for config files. @@ -1850,6 +1808,9 @@ all: gdb$(EXEEXT) $(CONFIG_ALL) $(CONFIG_DEP_SUBDIR): $(SHELL) $(srcdir)/../mkinstalldirs $@ +# Python files need special flags. +python/%.o: INTERNAL_CFLAGS += $(PYTHON_CFLAGS) + # Rules for compiling .c files in the various source subdirectories. %.o: ${srcdir}/common/%.c $(COMPILE) $< @@ -1863,10 +1824,6 @@ $(CONFIG_DEP_SUBDIR): $(COMPILE) $< $(POSTCOMPILE) -%.o: $(srcdir)/python/%.c - $(COMPILE) $(PYTHON_CFLAGS) $< - $(POSTCOMPILE) - %.o: ${srcdir}/target/%.c $(COMPILE) $< $(POSTCOMPILE) diff --git a/gdb/configure b/gdb/configure index f3e0ce6..3c64bb1 100755 --- a/gdb/configure +++ b/gdb/configure @@ -10718,7 +10718,7 @@ $as_echo "${python_has_threads}" >&6; } else # Even if Python support is not compiled in, we need to have this file # included so that the "python" command, et.al., still exists. - CONFIG_OBS="$CONFIG_OBS python.o" + CONFIG_OBS="$CONFIG_OBS python/python.o" CONFIG_SRCS="$CONFIG_SRCS python/python.c" fi diff --git a/gdb/configure.ac b/gdb/configure.ac index 00a36be..de24cfa 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -1027,7 +1027,7 @@ if test "${have_libpython}" != no; then else # Even if Python support is not compiled in, we need to have this file # included so that the "python" command, et.al., still exists. - CONFIG_OBS="$CONFIG_OBS python.o" + CONFIG_OBS="$CONFIG_OBS python/python.o" CONFIG_SRCS="$CONFIG_SRCS python/python.c" fi |