summaryrefslogtreecommitdiff
path: root/gdb/data-directory
diff options
context:
space:
mode:
authorSimon Marchi <simon.marchi@polymtl.ca>2016-11-22 16:14:22 -0500
committerSimon Marchi <simon.marchi@ericsson.com>2016-11-23 09:45:22 -0500
commitb593ecca856860a8b38deb808493bba4beef3aee (patch)
tree243b9c409075f4b821f25a282cc89860f923d083 /gdb/data-directory
parent1a9ccd70f9a75dc6b48d340059f28ef3550c107b (diff)
downloadbinutils-gdb-b593ecca856860a8b38deb808493bba4beef3aee.tar.gz
Makefiles: Flatten and sort file lists
I find the big file lists in the Makefiles a bit ugly and not very practical. Since there are multiple filenames on each line (as much as fits in 80 columns), it's not easy to add, remove or change a name in the middle. As a result, we have a mix of long and short lines in no particular order (ALL_TARGET_OBS is a good example). I therefore suggest flattening the lists (one name per line) and keeping them in alphabetical order. The diffs will be much clearer and merge conflicts will be easier to resolve. A nice (IMO) side-effect I observed is that the files are compiled alphabetically by make, so it gives a rough idea of the progress of the build. I added a comment in gdb/Makefile.in to mention to keep the file lists ordered, and gave the general guidelines on what order to respect. I added a comment in other Makefiles which refers to gdb/Makefile.in, to avoid duplication. Running the patch through the buildbot found that gdb.base/default.exp started to fail. The languages in the error message shown when typing "set language" have changed order. We could probably improve gdb so that it prints them in a stable order, regardless of the order of the object list passed to the linked, but just fixing the test is easier for now. New in v2: - Change ordering style, directories go at the end. - Cleanup gdbserver's and data-directory's Makefile as well. - Add comments at top of Makefiles about the ordering. - Remove wrong trailing backslahes. - Fix test gdb.base/default.exp. gdb/ChangeLog: * Makefile.in: Add comment about file lists ordering. (SUBDIR_CLI_OBS, SUBDIR_CLI_SRCS, SUBDIR_MI_OBS, SUBDIR_MI_SRCS, SUBDIR_TUI_OBS, SUBDIR_TUI_SRCS, SUBDIR_GCC_COMPILE_OBS, SUBDIR_GCC_COMPILE_SRCS, SUBDIR_GUILE_OBS, SUBDIR_GUILE_SRCS, SUBDIR_PYTHON_OBS, SUBDIR_PYTHON_SRCS, SUBDIR_GDBTK_OBS, SUBDIR_GDBTK_SRCS, XMLFILES, REMOTE_OBS, ALL_64_TARGET_OBS, ALL_TARGET_OBS, SFILES, HFILES_NO_SRCDIR, HFILES_WITH_SRCDIR, COMMON_OBS, YYFILES, YYOBJ, generated_files, ALLDEPFILES): Flatten list and order alphabetically. * data-directory/Makefile.in: Add comment about file lists ordering. (GEN_SYSCALLS_FILES, PYTHON_FILE_LIST): Flatten list and order alphabetically. gdb/gdbserver/ChangeLog: * Makefile.in (SFILES, OBS): Flatten list and order alphabetically. gdb/testsuite/ChangeLog: * gdb.base/default.exp: Fix output of "set language".
Diffstat (limited to 'gdb/data-directory')
-rw-r--r--gdb/data-directory/Makefile.in39
1 files changed, 25 insertions, 14 deletions
diff --git a/gdb/data-directory/Makefile.in b/gdb/data-directory/Makefile.in
index 3f235168762..51b5c2ab408 100644
--- a/gdb/data-directory/Makefile.in
+++ b/gdb/data-directory/Makefile.in
@@ -16,6 +16,9 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# Please keep lists in this file sorted alphabetically, with one item per line.
+# See gdb/Makefile.in for guidelines on ordering files and directories.
+
srcdir = @srcdir@
SYSCALLS_SRCDIR = $(srcdir)/../syscalls
PYTHON_SRCDIR = $(srcdir)/../python/lib
@@ -45,12 +48,20 @@ GDB_DATADIR = @GDB_DATADIR@
SYSCALLS_DIR = syscalls
SYSCALLS_INSTALL_DIR = $(DESTDIR)$(GDB_DATADIR)/$(SYSCALLS_DIR)
-GEN_SYSCALLS_FILES = arm-linux.xml aarch64-linux.xml \
- ppc-linux.xml ppc64-linux.xml \
- i386-linux.xml amd64-linux.xml \
- sparc-linux.xml sparc64-linux.xml \
- mips-o32-linux.xml mips-n32-linux.xml mips-n64-linux.xml \
- s390-linux.xml s390x-linux.xml
+GEN_SYSCALLS_FILES = \
+ aarch64-linux.xml \
+ amd64-linux.xml \
+ arm-linux.xml \
+ i386-linux.xml \
+ mips-n32-linux.xml \
+ mips-n64-linux.xml \
+ mips-o32-linux.xml \
+ ppc-linux.xml \
+ ppc64-linux.xml \
+ s390-linux.xml \
+ s390x-linux.xml \
+ sparc-linux.xml \
+ sparc64-linux.xml
SYSCALLS_FILES = gdb-syscalls.dtd freebsd.xml $(GEN_SYSCALLS_FILES)
@@ -58,22 +69,22 @@ PYTHON_DIR = python
PYTHON_INSTALL_DIR = $(DESTDIR)$(GDB_DATADIR)/$(PYTHON_DIR)
PYTHON_FILE_LIST = \
gdb/__init__.py \
- gdb/frames.py \
- gdb/FrameIterator.py \
gdb/FrameDecorator.py \
- gdb/types.py \
+ gdb/FrameIterator.py \
+ gdb/frames.py \
gdb/printing.py \
- gdb/unwinder.py \
gdb/prompt.py \
+ gdb/types.py \
+ gdb/unwinder.py \
gdb/xmethod.py \
gdb/command/__init__.py \
- gdb/command/xmethods.py \
+ gdb/command/explore.py \
gdb/command/frame_filters.py \
- gdb/command/unwinders.py \
- gdb/command/type_printers.py \
gdb/command/pretty_printers.py \
gdb/command/prompt.py \
- gdb/command/explore.py \
+ gdb/command/type_printers.py \
+ gdb/command/unwinders.py \
+ gdb/command/xmethods.py \
gdb/function/__init__.py \
gdb/function/as_string.py \
gdb/function/caller_is.py \