diff options
Diffstat (limited to 'gdb/gdbserver/Makefile.in')
| -rw-r--r-- | gdb/gdbserver/Makefile.in | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in index 4f0ba19..cbeccef 100644 --- a/gdb/gdbserver/Makefile.in +++ b/gdb/gdbserver/Makefile.in @@ -76,20 +76,20 @@ ustlibs = @ustlibs@ ustinc = @ustinc@ # gnulib -LIBGNU = gnulib/libgnu.a -INCGNU = -I$(srcdir)/../gnulib -Ignulib +LIBGNU = gnulib/import/libgnu.a +INCGNU = -I$(srcdir)/../gnulib/import -Ignulib/import # We build gnulib directly under the gdbserver build directory, but # its sources don't live directly under gdbserver's source directory. # Tweak $srcdir and VPATH to make that work. GNULIB_FLAGS_TO_PASS = \ "top_srcdir=$(abs_top_srcdir)/.." \ - "srcdir=$(abs_srcdir)/../gnulib" \ - "VPATH=$(abs_top_srcdir)/../gnulib:$(abs_top_srcdir)" + "srcdir=$(abs_srcdir)/../gnulib/import" \ + "VPATH=$(abs_top_srcdir)/../gnulib/import:$(abs_top_srcdir)" # Generated headers in the gnulib directory. These must be listed # so that they are generated before other files are compiled. -GNULIB_H = gnulib/string.h @GNULIB_STDINT_H@ +GNULIB_H = gnulib/import/string.h @GNULIB_STDINT_H@ # All the includes used for CFLAGS and for lint. # -I. for config files. @@ -216,7 +216,7 @@ generated_files = config.h $(GNULIB_H) ${CC} -c ${INTERNAL_CFLAGS} $< all: gdbserver$(EXEEXT) gdbreplay$(EXEEXT) $(extra_libraries) - @cd gnulib; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) all + @cd gnulib/import; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) all # Traditionally "install" depends on "all". But it may be useful # not to; for example, if the user has made some trivial change to a @@ -237,13 +237,13 @@ install-only: $(INSTALL_PROGRAM) gdbserver$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT); \ $(SHELL) $(srcdir)/../../mkinstalldirs $(DESTDIR)$(man1dir); \ $(INSTALL_DATA) $(srcdir)/gdbserver.1 $(DESTDIR)$(man1dir)/$$n.1 - @cd gnulib; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) install + @cd gnulib/import; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) install uninstall: force n=`echo gdbserver | sed '$(program_transform_name)'`; \ if [ x$$n = x ]; then n=gdbserver; else true; fi; \ rm -f $(DESTDIR)/$(bindir)/$$n$(EXEEXT) $(DESTDIR)$(man1dir)/$$n.1 - @cd gnulib; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) uninstall + @cd gnulib/import; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) uninstall installcheck: check: @@ -253,7 +253,7 @@ install-pdf: html: install-html: clean-info: force - @cd gnulib; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) $@ + @cd gnulib/import; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) $@ gdbserver$(EXEEXT): $(OBS) ${ADD_DEPS} ${CDEPS} $(LIBGNU) rm -f gdbserver$(EXEEXT) @@ -261,8 +261,8 @@ gdbserver$(EXEEXT): $(OBS) ${ADD_DEPS} ${CDEPS} $(LIBGNU) $(LIBGNU) $(GDBSERVER_LIBS) $(XM_CLIBS) $(LIBGNU) $(GNULIB_H): all-lib -all-lib: gnulib/Makefile - @cd gnulib; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) all +all-lib: gnulib/import/Makefile + @cd gnulib/import/; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) all .PHONY: all-lib @@ -320,11 +320,11 @@ clean: rm -f i386-mmx.c i386-mmx-linux.c rm -f x32.c x32-linux.c rm -f x32-avx.c x32-avx-linux.c - @cd gnulib; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) clean + @cd gnulib/import; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) clean maintainer-clean realclean distclean: clean rm -f nm.h tm.h xm.h config.h stamp-h config.log - @cd gnulib; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) $@ + @cd gnulib/import; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) $@ rm -f Makefile config.status config.h: stamp-h ; @true @@ -334,11 +334,11 @@ stamp-h: config.in config.status Makefile: Makefile.in config.status CONFIG_HEADERS="" $(SHELL) ./config.status -gnulib/Makefile: $(srcdir)/../gnulib/Makefile.in config.status +gnulib/import/Makefile: $(srcdir)/../gnulib/import/Makefile.in config.status CONFIG_COMMANDS="depfiles" \ CONFIG_HEADERS= \ CONFIG_LINKS= \ - $(SHELL) config.status "gnulib/Makefile" + $(SHELL) config.status "gnulib/import/Makefile" config.status: configure configure.srv $(SHELL) ./config.status --recheck |