{gdb,gdbserver}/Makefile.in: remove unnecessary intermediary variables

Remove `INTERNAL_CFLAGS_BASE` and `INTERNAL_WARN_CFLAGS`, inline their
contents in `INTERNAL_CFLAGS`.  Not functional changes expected.

Change-Id: I6a09794835ca2cfd4a88a3e9f2e627c8f5bd569f
Approved-By: Pedro Alves <pedro@palves.net>

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index bf57a9a3e62e8d7a82b4ab773553482943b09e5b..a5139ea75803ba5f889e34d34bd2b3f7699ab172 100644 (file)
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -631,7 +631,7 @@ INTERNAL_CPPFLAGS = $(CPPFLAGS) @GUILE_CPPFLAGS@ @PYTHON_CPPFLAGS@ \
        @LARGEFILE_CPPFLAGS@
 
 # INTERNAL_CFLAGS is the aggregate of all other *CFLAGS macros.
-INTERNAL_CFLAGS_BASE = \
+INTERNAL_CFLAGS = \
        $(GLOBAL_CFLAGS) \
        $(PROFILE_CFLAGS) \
        $(GDB_CFLAGS) \
@@ -653,9 +653,9 @@ INTERNAL_CFLAGS_BASE = \
        $(PTHREAD_CFLAGS) \
        $(DEBUGINFOD_CFLAGS) \
        $(GMPINC) \
-       $(AMD_DBGAPI_CFLAGS)
-INTERNAL_WARN_CFLAGS = $(INTERNAL_CFLAGS_BASE) $(GDB_WARN_CFLAGS)
-INTERNAL_CFLAGS = $(INTERNAL_WARN_CFLAGS) $(GDB_WERROR_CFLAGS)
+       $(AMD_DBGAPI_CFLAGS) \
+       $(GDB_WARN_CFLAGS) \
+       $(GDB_WERROR_CFLAGS)
 
 # LDFLAGS is specifically reserved for setting from the command line
 # when running make.

diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in
index 3aa7aa760eaf52e0b03f539ec32dd9573db2d2f4..45073abca493c4100649d92f80b6461c89d6c878 100644 (file)
--- a/gdbserver/Makefile.in
+++ b/gdbserver/Makefile.in
@@ -163,19 +163,13 @@ WIN32APILIBS = @WIN32APILIBS@
 MAYBE_LIBICONV = @MAYBE_LIBICONV@
 
 # INTERNAL_CFLAGS is the aggregate of all other *CFLAGS macros.
-INTERNAL_CFLAGS_BASE = \
+INTERNAL_CFLAGS = \
        ${GLOBAL_CFLAGS} \
        ${PROFILE_CFLAGS} \
        ${INCLUDE_CFLAGS} \
        ${CPPFLAGS} \
-       $(PTHREAD_CFLAGS)
-
-INTERNAL_WARN_CFLAGS = \
-       ${INTERNAL_CFLAGS_BASE} \
-       $(WARN_CFLAGS)
-
-INTERNAL_CFLAGS = \
-       ${INTERNAL_WARN_CFLAGS} \
+       $(PTHREAD_CFLAGS) \
+       $(WARN_CFLAGS) \
        $(WERROR_CFLAGS) \
        -DGDBSERVER