From 8629c02c0db6ff3f7444397567a57dd36a3eed41 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Tue, 22 Nov 2016 16:14:25 -0500 Subject: [PATCH] Minor formatting fixups in Makefiles Mostly some whitespace changes to make things a bit more consistent. gdb/ChangeLog: * Makefile.in: Fix whitespace formatting. gdb/gdbserver/ChangeLog: * Makefile.in: Fix whitespace formatting. --- gdb/ChangeLog | 4 +++ gdb/Makefile.in | 71 +++++++++++++++++++-------------------- gdb/gdbserver/ChangeLog | 4 +++ gdb/gdbserver/Makefile.in | 24 ++++++------- 4 files changed, 55 insertions(+), 48 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index aae4e7abd20..a9a82491f74 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2016-11-22 Simon Marchi + + * Makefile.in: Fix whitespace formatting. + 2016-11-22 Simon Marchi * Makefile.in (ALL_64_TARGET_OBS, ALL_TARGET_OBS, diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 056b7642bd0..e3e3ce4cba1 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -103,9 +103,9 @@ CATALOGS = @CATALOGS@ # -traditional flag. Otherwise the ioctl calls in inflow.c # will be incorrectly compiled. The "fixincludes" script in the gcc # distribution will fix your include files up. -CC=@CC@ -CXX=@CXX@ -CXX_DIALECT= @CXX_DIALECT@ +CC = @CC@ +CXX = @CXX@ +CXX_DIALECT = @CXX_DIALECT@ # Dependency tracking information. DEPMODE = @CCDEPMODE@ @@ -124,7 +124,7 @@ srcdir = @srcdir@ VPATH = @srcdir@ top_srcdir = @top_srcdir@ -YACC=@YACC@ +YACC = @YACC@ # This is used to rebuild ada-lex.c from ada-lex.l. If the program is # not defined, but ada-lex.c is present, compilation will continue, @@ -144,13 +144,13 @@ MAKEHTMLFLAGS = # Set this up with gcc if you have gnu ld and the loader will print out # line numbers for undefined references. -#CC_LD=g++ -static -CC_LD=$(CXX) $(CXX_DIALECT) +#CC_LD = g++ -static +CC_LD = $(CXX) $(CXX_DIALECT) # Where is our "include" directory? Typically $(srcdir)/../include. # This is essentially the header file directory for the library # routines in libiberty. -INCLUDE_DIR = $(srcdir)/../include +INCLUDE_DIR = $(srcdir)/../include INCLUDE_CFLAGS = -I$(INCLUDE_DIR) # Where is the "-liberty" library? Typically in ../libiberty. @@ -253,8 +253,8 @@ SUBDIR_CLI_SRCS = \ cli/cli-utils.c SUBDIR_CLI_DEPS = -SUBDIR_CLI_LDFLAGS= -SUBDIR_CLI_CFLAGS= +SUBDIR_CLI_LDFLAGS = +SUBDIR_CLI_CFLAGS = # # MI sub directory definitons @@ -298,13 +298,12 @@ SUBDIR_MI_SRCS = \ mi/mi-symbol-cmds.c SUBDIR_MI_DEPS = -SUBDIR_MI_LDFLAGS= -SUBDIR_MI_CFLAGS= +SUBDIR_MI_LDFLAGS = +SUBDIR_MI_CFLAGS = # # TUI sub directory definitions # - SUBDIR_TUI_OBS = \ tui.o \ tui-command.o \ @@ -344,9 +343,8 @@ SUBDIR_TUI_SRCS = \ tui/tui-winsource.c SUBDIR_TUI_DEPS = -SUBDIR_TUI_LDFLAGS= -SUBDIR_TUI_CFLAGS= \ - -DTUI=1 +SUBDIR_TUI_LDFLAGS = +SUBDIR_TUI_CFLAGS = -DTUI=1 # # GCC Compile support sub-directory definitions @@ -371,8 +369,9 @@ SUBDIR_GCC_COMPILE_SRCS = \ compile/compile-object-run.c \ compile/compile-object-run.h +# # Guile sub directory definitons for guile support. - +# SUBDIR_GUILE_OBS = \ guile.o \ scm-arch.o \ @@ -428,8 +427,8 @@ SUBDIR_GUILE_SRCS = \ guile/scm-value.c SUBDIR_GUILE_DEPS = -SUBDIR_GUILE_LDFLAGS= -SUBDIR_GUILE_CFLAGS= +SUBDIR_GUILE_LDFLAGS = +SUBDIR_GUILE_CFLAGS = # # python sub directory definitons @@ -515,8 +514,8 @@ SUBDIR_PYTHON_SRCS = \ python/python.c SUBDIR_PYTHON_DEPS = -SUBDIR_PYTHON_LDFLAGS= -SUBDIR_PYTHON_CFLAGS= +SUBDIR_PYTHON_LDFLAGS = +SUBDIR_PYTHON_CFLAGS = # Opcodes currently live in one of two places. Either they are in the # opcode library, typically ../opcodes, or they are in a header file @@ -556,7 +555,7 @@ WIN32LDAPP = @WIN32LDAPP@ LIBGUI = @LIBGUI@ GUI_CFLAGS_X = @GUI_CFLAGS_X@ -IDE_CFLAGS=$(GUI_CFLAGS_X) $(IDE_CFLAGS_X) +IDE_CFLAGSv = $(GUI_CFLAGS_X) $(IDE_CFLAGS_X) ALL_TCL_CFLAGS = $(TCL_CFLAGS) $(TK_CFLAGS) @@ -593,16 +592,16 @@ SUBDIR_GDBTK_SRCS = \ gdbtk/generic/gdbtk-wrapper.c SUBDIR_GDBTK_DEPS = $(LIBGUI) $(TCL_DEPS) $(TK_DEPS) -SUBDIR_GDBTK_LDFLAGS= -SUBDIR_GDBTK_CFLAGS= -DGDBTK +SUBDIR_GDBTK_LDFLAGS = +SUBDIR_GDBTK_CFLAGS = -DGDBTK -CONFIG_OBS= @CONFIG_OBS@ -CONFIG_SRCS= @CONFIG_SRCS@ -CONFIG_DEPS= @CONFIG_DEPS@ +CONFIG_OBS = @CONFIG_OBS@ +CONFIG_SRCS = @CONFIG_SRCS@ +CONFIG_DEPS = @CONFIG_DEPS@ CONFIG_LDFLAGS = @CONFIG_LDFLAGS@ -ENABLE_CFLAGS= @ENABLE_CFLAGS@ -CONFIG_ALL= @CONFIG_ALL@ -CONFIG_CLEAN= @CONFIG_CLEAN@ +ENABLE_CFLAGS = @ENABLE_CFLAGS@ +CONFIG_ALL = @CONFIG_ALL@ +CONFIG_CLEAN = @CONFIG_CLEAN@ CONFIG_INSTALL = @CONFIG_INSTALL@ CONFIG_UNINSTALL = @CONFIG_UNINSTALL@ HAVE_NATIVE_GCORE_TARGET = @HAVE_NATIVE_GCORE_TARGET@ @@ -674,15 +673,15 @@ CDEPS = $(XM_CDEPS) $(NAT_CDEPS) $(SIM) $(BFD) $(READLINE_DEPS) \ ADD_FILES = $(XM_ADD_FILES) $(TM_ADD_FILES) $(NAT_ADD_FILES) ADD_DEPS = $(XM_ADD_FILES) $(TM_ADD_FILES) $(NAT_ADD_FILES) -DIST=gdb +DIST = gdb -LINT=/usr/5bin/lint -LINTFLAGS= $(GDB_CFLAGS) $(OPCODES_CFLAGS) $(READLINE_CFLAGS) \ +LINT = /usr/5bin/lint +LINTFLAGS = $(GDB_CFLAGS) $(OPCODES_CFLAGS) $(READLINE_CFLAGS) \ $(BFD_CFLAGS) $(INCLUDE_CFLAGS) \ $(INTL_CFLAGS) RUNTEST = runtest -RUNTESTFLAGS= +RUNTESTFLAGS = # XML files to build in to GDB. XMLFILES = \ @@ -1841,7 +1840,7 @@ generated_files = \ $(NAT_GENERATED_FILES) # Flags needed to compile Python code -PYTHON_CFLAGS=@PYTHON_CFLAGS@ +PYTHON_CFLAGS = @PYTHON_CFLAGS@ all: gdb$(EXEEXT) $(CONFIG_ALL) @$(MAKE) $(FLAGS_TO_PASS) DO=all "DODIRS=`echo $(SUBDIRS) | sed 's/testsuite//'`" subdir_do @@ -2165,7 +2164,7 @@ init.c: $(INIT_FILES) # against that. # # init.o is very important. It pulls in the rest of GDB. -LIBGDB_OBS= $(COMMON_OBS) $(TSOBS) $(ADD_FILES) init.o +LIBGDB_OBS = $(COMMON_OBS) $(TSOBS) $(ADD_FILES) init.o libgdb.a: $(LIBGDB_OBS) -rm -f libgdb.a $(AR) q libgdb.a $(LIBGDB_OBS) @@ -2425,7 +2424,7 @@ force_update: # GNU Make 3.63 has a different problem: it keeps tacking command line # overrides onto the definition of $(MAKE). This variable setting # will remove them. -MAKEOVERRIDES= +MAKEOVERRIDES = ALLDEPFILES = \ aarch64-linux-nat.c \ diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index e141021c3f0..701e22ed0ce 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,7 @@ +2016-11-22 Simon Marchi + + * Makefile.in: Fix whitespace formatting. + 2016-11-22 Simon Marchi * Makefile.in (SFILES, OBS): Flatten list and order diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in index 261ab55baba..5316c95b67f 100644 --- a/gdb/gdbserver/Makefile.in +++ b/gdb/gdbserver/Makefile.in @@ -54,7 +54,7 @@ RANLIB = @RANLIB@ CC = @CC@ CXX = @CXX@ -CXX_DIALECT= @CXX_DIALECT@ +CXX_DIALECT = @CXX_DIALECT@ AR = @AR@ AR_FLAGS = rc @@ -73,8 +73,8 @@ POSTCOMPILE = @true # Directory containing source files. Don't clean up the spacing, # this exact string is matched for by the "configure" script. srcdir = @srcdir@ -abs_top_srcdir=@abs_top_srcdir@ -abs_srcdir=@abs_srcdir@ +abs_top_srcdir = @abs_top_srcdir@ +abs_srcdir = @abs_srcdir@ VPATH = @srcdir@ # It is also possible that you will need to add -I/usr/include/sys to the @@ -83,11 +83,11 @@ VPATH = @srcdir@ # Set this up with gcc if you have gnu ld and the loader will print out # line numbers for undefinded refs. -#CC_LD=g++ -static -CC_LD=$(CXX) $(CXX_DIALECT) +#CC_LD = g++ -static +CC_LD = $(CXX) $(CXX_DIALECT) # Where is the "include" directory? Traditionally ../include or ./include -INCLUDE_DIR = ${srcdir}/../../include +INCLUDE_DIR = ${srcdir}/../../include INCLUDE_DEP = $$(INCLUDE_DIR) LIBIBERTY_BUILDDIR = build-libiberty-gdbserver @@ -137,10 +137,10 @@ CXXFLAGS = @CXXFLAGS@ CPPFLAGS = @CPPFLAGS@ # INTERNAL_CFLAGS is the aggregate of all other *CFLAGS macros. -INTERNAL_CFLAGS_BASE = ${CXXFLAGS} ${GLOBAL_CFLAGS} \ +INTERNAL_CFLAGS_BASE = ${CXXFLAGS} ${GLOBAL_CFLAGS} \ ${PROFILE_CFLAGS} ${INCLUDE_CFLAGS} ${CPPFLAGS} -INTERNAL_WARN_CFLAGS = ${INTERNAL_CFLAGS_BASE} $(WARN_CFLAGS) -INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) -DGDBSERVER +INTERNAL_WARN_CFLAGS = ${INTERNAL_CFLAGS_BASE} $(WARN_CFLAGS) +INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) -DGDBSERVER # LDFLAGS is specifically reserved for setting from the command line # when running make. @@ -386,12 +386,12 @@ gdbreplay$(EXEEXT): $(GDBREPLAY_OBS) $(LIBGNU) $(LIBIBERTY) $(CC_LD) $(INTERNAL_CFLAGS) $(INTERNAL_LDFLAGS) -o gdbreplay$(EXEEXT) $(GDBREPLAY_OBS) \ $(XM_CLIBS) $(LIBGNU) $(LIBIBERTY) -IPA_OBJS=ax-ipa.o tracepoint-ipa.o format-ipa.o utils-ipa.o \ +IPA_OBJS = ax-ipa.o tracepoint-ipa.o format-ipa.o utils-ipa.o \ regcache-ipa.o remote-utils-ipa.o common-utils-ipa.o \ tdesc-ipa.o print-utils-ipa.o rsp-low-ipa.o errors-ipa.o \ ${IPA_DEPFILES} -IPA_LIB=libinproctrace.so +IPA_LIB = libinproctrace.so $(IPA_LIB): $(IPA_OBJS) ${ADD_DEPS} ${CDEPS} rm -f $(IPA_LIB) @@ -526,7 +526,7 @@ stamp-xml: $(XML_DIR)/feature_to_c.sh Makefile $(XML_FILES) # GNU Make 3.63 has a different problem: it keeps tacking command line # overrides onto the definition of $(MAKE). This variable setting # will remove them. -MAKEOVERRIDES= +MAKEOVERRIDES = regdat_sh = $(srcdir)/../regformats/regdat.sh -- 2.30.2