-# Copyright (C) 1989-2018 Free Software Foundation, Inc.
+# Copyright (C) 1989-2019 Free Software Foundation, Inc.
# This file is part of GDB.
# Where is libmpfr? This will be empty if libmpfr was not available.
LIBMPFR = @LIBMPFR@
+# GNU source highlight library.
+SRCHIGH_LIBS = @SRCHIGH_LIBS@
+SRCHIGH_CFLAGS = @SRCHIGH_CFLAGS@
+
WARN_CFLAGS = @WARN_CFLAGS@
WERROR_CFLAGS = @WERROR_CFLAGS@
GDB_WARN_CFLAGS = $(WARN_CFLAGS)
GDBFLAGS =
# Helper code from gnulib.
-GNULIB_BUILDDIR = build-gnulib
+GNULIB_BUILDDIR = ../gnulib
LIBGNU = $(GNULIB_BUILDDIR)/import/libgnu.a
-INCGNU = -I$(srcdir)/gnulib/import -I$(GNULIB_BUILDDIR)/import
-
-# Generated headers in the gnulib directory. These must be listed
-# so that they are generated before other files are compiled.
-GNULIB_H = $(GNULIB_BUILDDIR)/import/string.h @GNULIB_STDINT_H@
+INCGNU = -I$(srcdir)/../gnulib/import -I$(GNULIB_BUILDDIR)/import
#
# CLI sub directory definitons
cli/cli-dump.c \
cli/cli-interp.c \
cli/cli-logging.c \
+ cli/cli-option.c \
cli/cli-script.c \
cli/cli-setshow.c \
+ cli/cli-style.c \
cli/cli-utils.c
SUBDIR_CLI_OBS = $(patsubst %.c,%.o,$(SUBDIR_CLI_SRCS))
SUBDIR_UNITTESTS_SRCS = \
unittests/array-view-selftests.c \
+ unittests/child-path-selftests.c \
unittests/cli-utils-selftests.c \
unittests/common-utils-selftests.c \
unittests/copy_bitwise-selftests.c \
unittests/scoped_mmap-selftests.c \
unittests/scoped_restore-selftests.c \
unittests/string_view-selftests.c \
+ unittests/style-selftests.c \
unittests/tracepoint-selftests.c \
unittests/unpack-selftests.c \
unittests/utils-selftests.c \
CONFIG_UNINSTALL = @CONFIG_UNINSTALL@
HAVE_NATIVE_GCORE_TARGET = @HAVE_NATIVE_GCORE_TARGET@
-CONFIG_SRC_SUBDIR = arch cli mi common compile tui unittests guile python target
+CONFIG_SRC_SUBDIR = arch cli mi common compile tui unittests guile python \
+ target nat
CONFIG_DEP_SUBDIR = $(addsuffix /$(DEPDIR),$(CONFIG_SRC_SUBDIR))
# -I. for config files.
# your system doesn't have fcntl.h in /usr/include (which is where it
# should be according to Posix).
DEFS = @DEFS@
-GDB_CFLAGS = -I. -I$(srcdir) -I$(srcdir)/common -I$(srcdir)/config \
+GDB_CFLAGS = -I. -I$(srcdir) -I$(srcdir)/config \
-DLOCALEDIR="\"$(localedir)\"" $(DEFS)
# MH_CFLAGS, if defined, has host-dependent CFLAGS from the config directory.
$(CXXFLAGS) $(GLOBAL_CFLAGS) $(PROFILE_CFLAGS) \
$(GDB_CFLAGS) $(OPCODES_CFLAGS) $(READLINE_CFLAGS) $(ZLIBINC) \
$(BFD_CFLAGS) $(INCLUDE_CFLAGS) $(LIBDECNUMBER_CFLAGS) \
- $(INTL_CFLAGS) $(INCGNU) $(ENABLE_CFLAGS) $(INTERNAL_CPPFLAGS)
+ $(INTL_CFLAGS) $(INCGNU) $(ENABLE_CFLAGS) $(INTERNAL_CPPFLAGS) \
+ $(SRCHIGH_CFLAGS)
INTERNAL_WARN_CFLAGS = $(INTERNAL_CFLAGS_BASE) $(GDB_WARN_CFLAGS)
INTERNAL_CFLAGS = $(INTERNAL_WARN_CFLAGS) $(GDB_WERROR_CFLAGS)
$(XM_CLIBS) $(GDBTKLIBS) \
@LIBS@ @GUILE_LIBS@ @PYTHON_LIBS@ \
$(LIBEXPAT) $(LIBLZMA) $(LIBBABELTRACE) $(LIBIPT) \
- $(LIBIBERTY) $(WIN32LIBS) $(LIBGNU) $(LIBICONV) $(LIBMPFR)
+ $(LIBIBERTY) $(WIN32LIBS) $(LIBGNU) $(LIBICONV) $(LIBMPFR) \
+ $(SRCHIGH_LIBS)
CDEPS = $(NAT_CDEPS) $(SIM) $(BFD) $(READLINE_DEPS) \
$(OPCODES) $(INTL_DEPS) $(LIBIBERTY) $(CONFIG_DEPS) $(LIBGNU)
ada-varobj.c \
addrmap.c \
agent.c \
+ alloc.c \
annotate.c \
arch-utils.c \
auto-load.c \
macrotab.c \
main.c \
maint.c \
+ maint-test-options.c \
+ maint-test-settings.c \
mdebugread.c \
mem-break.c \
memattr.c \
solib.c \
solib-target.c \
source.c \
+ source-cache.c \
stabsread.c \
stack.c \
std-regs.c \
test-target.c \
thread.c \
thread-iter.c \
- thread-fsm.c \
tid-parse.c \
top.c \
tracefile.c \
trad-frame.c \
tramp-frame.c \
target-float.c \
+ type-stack.c \
typeprint.c \
ui-file.c \
ui-out.c \
+ ui-style.c \
user-regs.c \
utils.c \
valarith.c \
solib-target.h \
solist.h \
source.h \
+ source-cache.h \
sparc-nat.h \
sparc-ravenscar-thread.h \
sparc-tdep.h \
trad-frame.h \
target-float.h \
tramp-frame.h \
+ type-stack.h \
typeprint.h \
ui-file.h \
ui-out.h \
+ ui-style.h \
user-regs.h \
utils.h \
valprint.h \
cli/cli-decode.h \
cli/cli-script.h \
cli/cli-setshow.h \
+ cli/cli-style.h \
cli/cli-utils.h \
common/buffer.h \
common/cleanups.h \
config/djgpp/nl_types.h \
config/i386/nm-i386gnu.h \
config/sparc/nm-sol2.h \
- gnulib/import/inttypes.in.h \
- gnulib/import/stddef.in.h \
- gnulib/import/stdint.in.h \
- gnulib/import/str-two-way.h \
- gnulib/import/string.in.h \
- gnulib/import/extra/snippet/arg-nonnull.h \
- gnulib/import/extra/snippet/c++defs.h \
- gnulib/import/extra/snippet/warn-on-use.h \
mi/mi-cmds.h \
mi/mi-common.h \
mi/mi-console.h \
$(SUBDIR_TARGET_OBS) \
$(SUBDIR_GCC_COMPILE_OBS)
-SUBDIRS = doc @subdirs@ data-directory $(GNULIB_BUILDDIR)
+SUBDIRS = doc @subdirs@ data-directory
CLEANDIRS = $(SUBDIRS)
# List of subdirectories in the build tree that must exist.
# This is used to force build failures in existing trees when
# a new directory is added.
# The format here is for the `case' shell command.
-REQUIRED_SUBDIRS = doc | testsuite | $(GNULIB_BUILDDIR) | data-directory
+REQUIRED_SUBDIRS = doc | testsuite | data-directory
# Parser intermediate files.
YYFILES = \
config.h \
gcore \
jit-reader.h \
- $(GNULIB_H) \
$(NAT_GENERATED_FILES)
# Flags needed to compile Python code
$(COMPILE) $(all_gdbtk_cflags) $<
$(POSTCOMPILE)
-%.o: ${srcdir}/nat/%.c
- $(COMPILE) $<
- $(POSTCOMPILE)
-
installcheck:
# The check target can not use subdir_do, because subdir_do does not
INIT_FILES = \
$(patsubst %.o,%.c, \
$(patsubst %-exp.o,%-exp.y, \
- $(filter-out $(NATDEPFILES) init.o version.o %_S.o %_U.o,\
+ $(filter-out init.o version.o %_S.o %_U.o,\
$(COMMON_OBS))))
init.c: stamp-init; @true
$(ECHO_SIGN) $(CODESIGN) -s $(CODESIGN_CERT) gdb$(EXEEXT)
endif
-# Convenience rule to handle recursion.
-$(LIBGNU) $(GNULIB_H): all-lib
-all-lib: $(GNULIB_BUILDDIR)/Makefile
- @$(MAKE) $(FLAGS_TO_PASS) DO=all DODIRS=$(GNULIB_BUILDDIR) subdir_do
-.PHONY: all-lib
-
# Convenience rule to handle recursion.
.PHONY: all-data-directory
all-data-directory: data-directory/Makefile
# always included in SUBDIRS. Remove the gdbserver files explicitly.
distclean: clean
@$(MAKE) $(FLAGS_TO_PASS) DO=distclean "DODIRS=$(CLEANDIRS)" subdir_do
- rm -rf $(GNULIB_BUILDDIR)
rm -f gdbserver/config.status gdbserver/config.log
rm -f gdbserver/tm.h gdbserver/xm.h gdbserver/nm.h
rm -f gdbserver/Makefile gdbserver/config.cache
CONFIG_HEADERS= \
$(SHELL) config.status
-$(GNULIB_BUILDDIR)/Makefile: gnulib/Makefile.in config.status
- @cd $(GNULIB_BUILDDIR); CONFIG_FILES="Makefile" \
- CONFIG_COMMANDS="depfiles" \
- CONFIG_HEADERS= \
- CONFIG_LINKS= \
- $(SHELL) config.status
-
data-directory/Makefile: data-directory/Makefile.in config.status
CONFIG_FILES="data-directory/Makefile" \
CONFIG_COMMANDS="depfiles" \
projects / deliverable / binutils-gdb.git / blobdiff