diff options
| author | Pedro Alves <palves@redhat.com> | 2012-04-19 12:02:56 +0000 |
|---|---|---|
| committer | Pedro Alves <palves@redhat.com> | 2012-04-19 12:02:56 +0000 |
| commit | 57c4b50b8827c6407f3f5f0db622118403bf61e5 (patch) | |
| tree | a3b348ccfc8fef50fd2aad5fe1d63a557441166c /gdb | |
| parent | 1030e047aad7eb5c05cfbe986ef9fdc48e9ffe43 (diff) | |
| download | gdb-57c4b50b8827c6407f3f5f0db622118403bf61e5.zip gdb-57c4b50b8827c6407f3f5f0db622118403bf61e5.tar.gz gdb-57c4b50b8827c6407f3f5f0db622118403bf61e5.tar.bz2 | |
2012-04-19 Pedro Alves <palves@redhat.com>
* Makefile.in (GNULIB_INCLUDE_DIR): Rename to ...
(INCGNU): ... this, and spell out -I here.
(GNULIB_LIB): Rename to ...
(LIBGNU): ... this.
(INCLUDE_CFLAGS, gdbserver$(EXEEXT), $(GNULIB_LIB) rule): Adjust.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/gdbserver/ChangeLog | 8 | ||||
| -rw-r--r-- | gdb/gdbserver/Makefile.in | 12 |
2 files changed, 14 insertions, 6 deletions
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index ae12f46..bf24d06 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,5 +1,13 @@ 2012-04-19 Pedro Alves <palves@redhat.com> + * Makefile.in (GNULIB_INCLUDE_DIR): Rename to ... + (INCGNU): ... this, and spell out -I here. + (GNULIB_LIB): Rename to ... + (LIBGNU): ... this. + (INCLUDE_CFLAGS, gdbserver$(EXEEXT), $(GNULIB_LIB) rule): Adjust. + +2012-04-19 Pedro Alves <palves@redhat.com> + * config.in: Regenerate. 2012-04-19 Pedro Alves <palves@redhat.com> diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in index 7d29f85..94b9cae 100644 --- a/gdb/gdbserver/Makefile.in +++ b/gdb/gdbserver/Makefile.in @@ -76,8 +76,8 @@ ustlibs = @ustlibs@ ustinc = @ustinc@ # gnulib -GNULIB_INCLUDE_DIR = $(srcdir)/../gnulib -GNULIB_LIB = gnulib/libgnu.a +LIBGNU = gnulib/libgnu.a +INCGNU = -I$(srcdir)/../gnulib # We build gnulib directly under the gdbserver build directory, but # its sources don't live directly under gdbserver's source directory. @@ -97,7 +97,7 @@ GNULIB_H = gnulib/string.h @GNULIB_STDINT_H@ # -I$(srcdir)/../regformats for regdef.h. INCLUDE_CFLAGS = -I. -I${srcdir} -I$(srcdir)/../common \ -I$(srcdir)/../regformats -I$(INCLUDE_DIR) \ - -I$(GNULIB_INCLUDE_DIR) + $(INCGNU) # M{H,T}_CFLAGS, if defined, has host- and target-dependent CFLAGS # from the config/ directory. @@ -252,12 +252,12 @@ install-html: clean-info: force @cd gnulib; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) $@ -gdbserver$(EXEEXT): $(OBS) ${ADD_DEPS} ${CDEPS} $(GNULIB_LIB) +gdbserver$(EXEEXT): $(OBS) ${ADD_DEPS} ${CDEPS} $(LIBGNU) rm -f gdbserver$(EXEEXT) ${CC-LD} $(INTERNAL_CFLAGS) $(INTERNAL_LDFLAGS) -o gdbserver$(EXEEXT) $(OBS) \ - $(GNULIB_LIB) $(GDBSERVER_LIBS) $(XM_CLIBS) + $(LIBGNU) $(GDBSERVER_LIBS) $(XM_CLIBS) -$(GNULIB_LIB) $(GNULIB_H): all-lib +$(LIBGNU) $(GNULIB_H): all-lib all-lib: gnulib/Makefile @cd gnulib; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) all |