2012-04-19 Pedro Alves <palves@redhat.com>
gdb/ * gnulib/: Move whole directory ... * gnulib/import/: ... here, and re-rerun gnulib-tool to adjust. * Makefile.in (LIBGNU, INCGNU, GNULIB_H, CLEANDIRS) (REQUIRED_SUBDIRS, all-lib, gnulib/Makefile, ACLOCAL_AMFLAGS) (aclocal_m4_deps): Adjust. * aclocal.m4: Regenerate. * configure: Regenerate. * configure.ac: Adjust AC_OUTPUT output. gdbserver/ * Makefile.in (LIBGNU, INCGNU): Adjust. (GNULIB_FLAGS_TO_PASS, GNULIB_H): Adjust. (all, install-only, uninstall, clean-info, all-lib, clean) (maintainer-clean, Makefile, gnulib/Makefile): Adjust. * configure.ac: Adjust AC_OUTPUT output. * aclocal.m4: Regenerate. * configure: Regenerate.
This commit is contained in:
parent
fd9bb8b878
commit
809277f8ce
|
@ -1,3 +1,14 @@
|
||||||
|
2012-04-19 Pedro Alves <palves@redhat.com>
|
||||||
|
|
||||||
|
* gnulib/: Move whole directory ...
|
||||||
|
* gnulib/import/: ... here, and re-rerun gnulib-tool to adjust.
|
||||||
|
* Makefile.in (LIBGNU, INCGNU, GNULIB_H, CLEANDIRS)
|
||||||
|
(REQUIRED_SUBDIRS, all-lib, gnulib/Makefile, ACLOCAL_AMFLAGS)
|
||||||
|
(aclocal_m4_deps): Adjust.
|
||||||
|
* aclocal.m4: Regenerate.
|
||||||
|
* configure: Regenerate.
|
||||||
|
* configure.ac: Adjust AC_OUTPUT output.
|
||||||
|
|
||||||
2012-04-19 Yao Qi <yao@codesourcery.com>
|
2012-04-19 Yao Qi <yao@codesourcery.com>
|
||||||
|
|
||||||
* Makefile.in (SFILES): Add common/vec.c and remove vec.c.
|
* Makefile.in (SFILES): Add common/vec.c and remove vec.c.
|
||||||
|
|
|
@ -170,12 +170,12 @@ INTL_CFLAGS = @INCINTL@
|
||||||
GDB_DATADIR = @GDB_DATADIR@
|
GDB_DATADIR = @GDB_DATADIR@
|
||||||
|
|
||||||
# Helper code from gnulib.
|
# Helper code from gnulib.
|
||||||
LIBGNU = gnulib/libgnu.a
|
LIBGNU = gnulib/import/libgnu.a
|
||||||
INCGNU = -I$(srcdir)/gnulib -Ignulib
|
INCGNU = -I$(srcdir)/gnulib/import -Ignulib/import
|
||||||
|
|
||||||
# Generated headers in the gnulib directory. These must be listed
|
# Generated headers in the gnulib directory. These must be listed
|
||||||
# so that they are generated before other files are compiled.
|
# 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@
|
||||||
|
|
||||||
#
|
#
|
||||||
# CLI sub directory definitons
|
# CLI sub directory definitons
|
||||||
|
@ -916,13 +916,13 @@ COMMON_OBS = $(DEPFILES) $(CONFIG_OBS) $(YYOBJ) \
|
||||||
TSOBS = inflow.o
|
TSOBS = inflow.o
|
||||||
|
|
||||||
SUBDIRS = doc @subdirs@ data-directory
|
SUBDIRS = doc @subdirs@ data-directory
|
||||||
CLEANDIRS = $(SUBDIRS) gnulib
|
CLEANDIRS = $(SUBDIRS) gnulib/import
|
||||||
|
|
||||||
# List of subdirectories in the build tree that must exist.
|
# List of subdirectories in the build tree that must exist.
|
||||||
# This is used to force build failures in existing trees when
|
# This is used to force build failures in existing trees when
|
||||||
# a new directory is added.
|
# a new directory is added.
|
||||||
# The format here is for the `case' shell command.
|
# The format here is for the `case' shell command.
|
||||||
REQUIRED_SUBDIRS = doc | testsuite | gnulib | data-directory
|
REQUIRED_SUBDIRS = doc | testsuite | gnulib/import | data-directory
|
||||||
|
|
||||||
# For now, shortcut the "configure GDB for fewer languages" stuff.
|
# For now, shortcut the "configure GDB for fewer languages" stuff.
|
||||||
YYFILES = c-exp.c \
|
YYFILES = c-exp.c \
|
||||||
|
@ -1162,8 +1162,8 @@ gdb$(EXEEXT): gdb.o $(LIBGDB_OBS) $(ADD_DEPS) $(CDEPS) $(TDEPLIBS)
|
||||||
|
|
||||||
# Convenience rule to handle recursion.
|
# Convenience rule to handle recursion.
|
||||||
$(LIBGNU) $(GNULIB_H): all-lib
|
$(LIBGNU) $(GNULIB_H): all-lib
|
||||||
all-lib: gnulib/Makefile
|
all-lib: gnulib/import/Makefile
|
||||||
@$(MAKE) $(FLAGS_TO_PASS) DO=all DODIRS=gnulib subdir_do
|
@$(MAKE) $(FLAGS_TO_PASS) DO=all DODIRS=gnulib/import subdir_do
|
||||||
.PHONY: all-lib
|
.PHONY: all-lib
|
||||||
|
|
||||||
# Convenience rule to handle recursion.
|
# Convenience rule to handle recursion.
|
||||||
|
@ -1273,8 +1273,8 @@ Makefile: Makefile.in config.status @frags@
|
||||||
CONFIG_HEADERS= \
|
CONFIG_HEADERS= \
|
||||||
$(SHELL) config.status
|
$(SHELL) config.status
|
||||||
|
|
||||||
gnulib/Makefile: gnulib/Makefile.in config.status @frags@
|
gnulib/import/Makefile: gnulib/import/Makefile.in config.status @frags@
|
||||||
CONFIG_FILES="gnulib/Makefile" \
|
CONFIG_FILES="gnulib/import/Makefile" \
|
||||||
CONFIG_COMMANDS="depfiles" \
|
CONFIG_COMMANDS="depfiles" \
|
||||||
CONFIG_HEADERS= \
|
CONFIG_HEADERS= \
|
||||||
CONFIG_LINKS= \
|
CONFIG_LINKS= \
|
||||||
|
@ -1302,31 +1302,31 @@ config.status: $(srcdir)/configure configure.tgt configure.host
|
||||||
$(SHELL) config.status --recheck
|
$(SHELL) config.status --recheck
|
||||||
|
|
||||||
ACLOCAL = aclocal
|
ACLOCAL = aclocal
|
||||||
ACLOCAL_AMFLAGS = -I gnulib/m4 -I ../config
|
ACLOCAL_AMFLAGS = -I gnulib/import/m4 -I ../config
|
||||||
aclocal_m4_deps = \
|
aclocal_m4_deps = \
|
||||||
configure.ac \
|
configure.ac \
|
||||||
gnulib/m4/00gnulib.m4 \
|
gnulib/import/m4/00gnulib.m4 \
|
||||||
gnulib/m4/extensions.m4 \
|
gnulib/import/m4/extensions.m4 \
|
||||||
gnulib/m4/gnulib-cache.m4 \
|
gnulib/import/m4/gnulib-cache.m4 \
|
||||||
gnulib/m4/gnulib-common.m4 \
|
gnulib/import/m4/gnulib-common.m4 \
|
||||||
gnulib/m4/gnulib-comp.m4 \
|
gnulib/import/m4/gnulib-comp.m4 \
|
||||||
gnulib/m4/gnulib-tool.m4 \
|
gnulib/import/m4/gnulib-tool.m4 \
|
||||||
gnulib/m4/include_next.m4 \
|
gnulib/import/m4/include_next.m4 \
|
||||||
gnulib/m4/inttypes.m4 \
|
gnulib/import/m4/inttypes.m4 \
|
||||||
gnulib/m4/inttypes-pri.m4 \
|
gnulib/import/m4/inttypes-pri.m4 \
|
||||||
gnulib/m4/longlong.m4 \
|
gnulib/import/m4/longlong.m4 \
|
||||||
gnulib/m4/memchr.m4 \
|
gnulib/import/m4/memchr.m4 \
|
||||||
gnulib/m4/memmem.m4 \
|
gnulib/import/m4/memmem.m4 \
|
||||||
gnulib/m4/mmap-anon.m4 \
|
gnulib/import/m4/mmap-anon.m4 \
|
||||||
gnulib/m4/multiarch.m4 \
|
gnulib/import/m4/multiarch.m4 \
|
||||||
gnulib/m4/onceonly.m4 \
|
gnulib/import/m4/onceonly.m4 \
|
||||||
gnulib/m4/stddef_h.m4 \
|
gnulib/import/m4/stddef_h.m4 \
|
||||||
gnulib/m4/stdint.m4 \
|
gnulib/import/m4/stdint.m4 \
|
||||||
gnulib/m4/string_h.m4 \
|
gnulib/import/m4/string_h.m4 \
|
||||||
gnulib/m4/warn-on-use.m4 \
|
gnulib/import/m4/warn-on-use.m4 \
|
||||||
gnulib/m4/wchar_h.m4 \
|
gnulib/import/m4/wchar_h.m4 \
|
||||||
gnulib/m4/wchar_t.m4 \
|
gnulib/import/m4/wchar_t.m4 \
|
||||||
gnulib/m4/wint_t.m4 \
|
gnulib/import/m4/wint_t.m4 \
|
||||||
../config/extensions.m4 \
|
../config/extensions.m4 \
|
||||||
../config/lead-dot.m4 \
|
../config/lead-dot.m4 \
|
||||||
../config/proginstall.m4 \
|
../config/proginstall.m4 \
|
||||||
|
|
|
@ -971,22 +971,22 @@ AC_SUBST([am__untar])
|
||||||
m4_include([../config/largefile.m4])
|
m4_include([../config/largefile.m4])
|
||||||
m4_include([../config/lead-dot.m4])
|
m4_include([../config/lead-dot.m4])
|
||||||
m4_include([../config/plugins.m4])
|
m4_include([../config/plugins.m4])
|
||||||
m4_include([gnulib/m4/00gnulib.m4])
|
m4_include([gnulib/import/m4/00gnulib.m4])
|
||||||
m4_include([gnulib/m4/extensions.m4])
|
m4_include([gnulib/import/m4/extensions.m4])
|
||||||
m4_include([gnulib/m4/gnulib-common.m4])
|
m4_include([gnulib/import/m4/gnulib-common.m4])
|
||||||
m4_include([gnulib/m4/gnulib-comp.m4])
|
m4_include([gnulib/import/m4/gnulib-comp.m4])
|
||||||
m4_include([gnulib/m4/include_next.m4])
|
m4_include([gnulib/import/m4/include_next.m4])
|
||||||
m4_include([gnulib/m4/inttypes-pri.m4])
|
m4_include([gnulib/import/m4/inttypes-pri.m4])
|
||||||
m4_include([gnulib/m4/inttypes.m4])
|
m4_include([gnulib/import/m4/inttypes.m4])
|
||||||
m4_include([gnulib/m4/longlong.m4])
|
m4_include([gnulib/import/m4/longlong.m4])
|
||||||
m4_include([gnulib/m4/memchr.m4])
|
m4_include([gnulib/import/m4/memchr.m4])
|
||||||
m4_include([gnulib/m4/memmem.m4])
|
m4_include([gnulib/import/m4/memmem.m4])
|
||||||
m4_include([gnulib/m4/mmap-anon.m4])
|
m4_include([gnulib/import/m4/mmap-anon.m4])
|
||||||
m4_include([gnulib/m4/multiarch.m4])
|
m4_include([gnulib/import/m4/multiarch.m4])
|
||||||
m4_include([gnulib/m4/onceonly.m4])
|
m4_include([gnulib/import/m4/onceonly.m4])
|
||||||
m4_include([gnulib/m4/stddef_h.m4])
|
m4_include([gnulib/import/m4/stddef_h.m4])
|
||||||
m4_include([gnulib/m4/stdint.m4])
|
m4_include([gnulib/import/m4/stdint.m4])
|
||||||
m4_include([gnulib/m4/string_h.m4])
|
m4_include([gnulib/import/m4/string_h.m4])
|
||||||
m4_include([gnulib/m4/warn-on-use.m4])
|
m4_include([gnulib/import/m4/warn-on-use.m4])
|
||||||
m4_include([gnulib/m4/wchar_t.m4])
|
m4_include([gnulib/import/m4/wchar_t.m4])
|
||||||
m4_include([acinclude.m4])
|
m4_include([acinclude.m4])
|
||||||
|
|
|
@ -6988,7 +6988,7 @@ fi
|
||||||
gl_cond_libtool=false
|
gl_cond_libtool=false
|
||||||
gl_libdeps=
|
gl_libdeps=
|
||||||
gl_ltlibdeps=
|
gl_ltlibdeps=
|
||||||
gl_m4_base='gnulib/m4'
|
gl_m4_base='gnulib/import/m4'
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -6998,7 +6998,7 @@ fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
gl_source_base='gnulib'
|
gl_source_base='gnulib/import'
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -16833,7 +16833,7 @@ ac_config_links="$ac_config_links $ac_config_links_1"
|
||||||
$as_echo "#define GDB_DEFAULT_HOST_CHARSET \"UTF-8\"" >>confdefs.h
|
$as_echo "#define GDB_DEFAULT_HOST_CHARSET \"UTF-8\"" >>confdefs.h
|
||||||
|
|
||||||
|
|
||||||
ac_config_files="$ac_config_files Makefile gdb-gdb.gdb doc/Makefile gnulib/Makefile data-directory/Makefile"
|
ac_config_files="$ac_config_files Makefile gdb-gdb.gdb doc/Makefile gnulib/import/Makefile data-directory/Makefile"
|
||||||
|
|
||||||
ac_config_commands="$ac_config_commands default"
|
ac_config_commands="$ac_config_commands default"
|
||||||
|
|
||||||
|
@ -17609,7 +17609,7 @@ do
|
||||||
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
|
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
|
||||||
"gdb-gdb.gdb") CONFIG_FILES="$CONFIG_FILES gdb-gdb.gdb" ;;
|
"gdb-gdb.gdb") CONFIG_FILES="$CONFIG_FILES gdb-gdb.gdb" ;;
|
||||||
"doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
|
"doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
|
||||||
"gnulib/Makefile") CONFIG_FILES="$CONFIG_FILES gnulib/Makefile" ;;
|
"gnulib/import/Makefile") CONFIG_FILES="$CONFIG_FILES gnulib/import/Makefile" ;;
|
||||||
"data-directory/Makefile") CONFIG_FILES="$CONFIG_FILES data-directory/Makefile" ;;
|
"data-directory/Makefile") CONFIG_FILES="$CONFIG_FILES data-directory/Makefile" ;;
|
||||||
"default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
|
"default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
|
||||||
|
|
||||||
|
|
|
@ -2242,7 +2242,7 @@ dnl At the moment, we just assume it's UTF-8.
|
||||||
AC_DEFINE(GDB_DEFAULT_HOST_CHARSET, "UTF-8",
|
AC_DEFINE(GDB_DEFAULT_HOST_CHARSET, "UTF-8",
|
||||||
[Define to be a string naming the default host character set.])
|
[Define to be a string naming the default host character set.])
|
||||||
|
|
||||||
AC_OUTPUT(Makefile gdb-gdb.gdb doc/Makefile gnulib/Makefile data-directory/Makefile,
|
AC_OUTPUT(Makefile gdb-gdb.gdb doc/Makefile gnulib/import/Makefile data-directory/Makefile,
|
||||||
[
|
[
|
||||||
case x$CONFIG_HEADERS in
|
case x$CONFIG_HEADERS in
|
||||||
xconfig.h:config.in)
|
xconfig.h:config.in)
|
||||||
|
|
|
@ -1,3 +1,13 @@
|
||||||
|
2012-04-19 Pedro Alves <palves@redhat.com>
|
||||||
|
|
||||||
|
* Makefile.in (LIBGNU, INCGNU): Adjust.
|
||||||
|
(GNULIB_FLAGS_TO_PASS, GNULIB_H): Adjust.
|
||||||
|
(all, install-only, uninstall, clean-info, all-lib, clean)
|
||||||
|
(maintainer-clean, Makefile, gnulib/Makefile): Adjust.
|
||||||
|
* configure.ac: Adjust AC_OUTPUT output.
|
||||||
|
* aclocal.m4: Regenerate.
|
||||||
|
* configure: Regenerate.
|
||||||
|
|
||||||
2012-04-19 Pedro Alves <palves@redhat.com>
|
2012-04-19 Pedro Alves <palves@redhat.com>
|
||||||
|
|
||||||
* Makefile.in (generated_files): New.
|
* Makefile.in (generated_files): New.
|
||||||
|
|
|
@ -76,20 +76,20 @@ ustlibs = @ustlibs@
|
||||||
ustinc = @ustinc@
|
ustinc = @ustinc@
|
||||||
|
|
||||||
# gnulib
|
# gnulib
|
||||||
LIBGNU = gnulib/libgnu.a
|
LIBGNU = gnulib/import/libgnu.a
|
||||||
INCGNU = -I$(srcdir)/../gnulib -Ignulib
|
INCGNU = -I$(srcdir)/../gnulib/import -Ignulib/import
|
||||||
|
|
||||||
# We build gnulib directly under the gdbserver build directory, but
|
# We build gnulib directly under the gdbserver build directory, but
|
||||||
# its sources don't live directly under gdbserver's source directory.
|
# its sources don't live directly under gdbserver's source directory.
|
||||||
# Tweak $srcdir and VPATH to make that work.
|
# Tweak $srcdir and VPATH to make that work.
|
||||||
GNULIB_FLAGS_TO_PASS = \
|
GNULIB_FLAGS_TO_PASS = \
|
||||||
"top_srcdir=$(abs_top_srcdir)/.." \
|
"top_srcdir=$(abs_top_srcdir)/.." \
|
||||||
"srcdir=$(abs_srcdir)/../gnulib" \
|
"srcdir=$(abs_srcdir)/../gnulib/import" \
|
||||||
"VPATH=$(abs_top_srcdir)/../gnulib:$(abs_top_srcdir)"
|
"VPATH=$(abs_top_srcdir)/../gnulib/import:$(abs_top_srcdir)"
|
||||||
|
|
||||||
# Generated headers in the gnulib directory. These must be listed
|
# Generated headers in the gnulib directory. These must be listed
|
||||||
# so that they are generated before other files are compiled.
|
# 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.
|
# All the includes used for CFLAGS and for lint.
|
||||||
# -I. for config files.
|
# -I. for config files.
|
||||||
|
@ -216,7 +216,7 @@ generated_files = config.h $(GNULIB_H)
|
||||||
${CC} -c ${INTERNAL_CFLAGS} $<
|
${CC} -c ${INTERNAL_CFLAGS} $<
|
||||||
|
|
||||||
all: gdbserver$(EXEEXT) gdbreplay$(EXEEXT) $(extra_libraries)
|
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
|
# Traditionally "install" depends on "all". But it may be useful
|
||||||
# not to; for example, if the user has made some trivial change to a
|
# 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); \
|
$(INSTALL_PROGRAM) gdbserver$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT); \
|
||||||
$(SHELL) $(srcdir)/../../mkinstalldirs $(DESTDIR)$(man1dir); \
|
$(SHELL) $(srcdir)/../../mkinstalldirs $(DESTDIR)$(man1dir); \
|
||||||
$(INSTALL_DATA) $(srcdir)/gdbserver.1 $(DESTDIR)$(man1dir)/$$n.1
|
$(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
|
uninstall: force
|
||||||
n=`echo gdbserver | sed '$(program_transform_name)'`; \
|
n=`echo gdbserver | sed '$(program_transform_name)'`; \
|
||||||
if [ x$$n = x ]; then n=gdbserver; else true; fi; \
|
if [ x$$n = x ]; then n=gdbserver; else true; fi; \
|
||||||
rm -f $(DESTDIR)/$(bindir)/$$n$(EXEEXT) $(DESTDIR)$(man1dir)/$$n.1
|
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:
|
installcheck:
|
||||||
check:
|
check:
|
||||||
|
@ -253,7 +253,7 @@ install-pdf:
|
||||||
html:
|
html:
|
||||||
install-html:
|
install-html:
|
||||||
clean-info: force
|
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)
|
gdbserver$(EXEEXT): $(OBS) ${ADD_DEPS} ${CDEPS} $(LIBGNU)
|
||||||
rm -f gdbserver$(EXEEXT)
|
rm -f gdbserver$(EXEEXT)
|
||||||
|
@ -261,8 +261,8 @@ gdbserver$(EXEEXT): $(OBS) ${ADD_DEPS} ${CDEPS} $(LIBGNU)
|
||||||
$(LIBGNU) $(GDBSERVER_LIBS) $(XM_CLIBS)
|
$(LIBGNU) $(GDBSERVER_LIBS) $(XM_CLIBS)
|
||||||
|
|
||||||
$(LIBGNU) $(GNULIB_H): all-lib
|
$(LIBGNU) $(GNULIB_H): all-lib
|
||||||
all-lib: gnulib/Makefile
|
all-lib: gnulib/import/Makefile
|
||||||
@cd gnulib; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) all
|
@cd gnulib/import/; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) all
|
||||||
|
|
||||||
.PHONY: all-lib
|
.PHONY: all-lib
|
||||||
|
|
||||||
|
@ -320,11 +320,11 @@ clean:
|
||||||
rm -f i386-mmx.c i386-mmx-linux.c
|
rm -f i386-mmx.c i386-mmx-linux.c
|
||||||
rm -f x32.c x32-linux.c
|
rm -f x32.c x32-linux.c
|
||||||
rm -f x32-avx.c x32-avx-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
|
maintainer-clean realclean distclean: clean
|
||||||
rm -f nm.h tm.h xm.h config.h stamp-h config.log
|
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
|
rm -f Makefile config.status
|
||||||
|
|
||||||
config.h: stamp-h ; @true
|
config.h: stamp-h ; @true
|
||||||
|
@ -334,11 +334,11 @@ stamp-h: config.in config.status
|
||||||
Makefile: Makefile.in config.status
|
Makefile: Makefile.in config.status
|
||||||
CONFIG_HEADERS="" $(SHELL) ./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_COMMANDS="depfiles" \
|
||||||
CONFIG_HEADERS= \
|
CONFIG_HEADERS= \
|
||||||
CONFIG_LINKS= \
|
CONFIG_LINKS= \
|
||||||
$(SHELL) config.status "gnulib/Makefile"
|
$(SHELL) config.status "gnulib/import/Makefile"
|
||||||
|
|
||||||
config.status: configure configure.srv
|
config.status: configure configure.srv
|
||||||
$(SHELL) ./config.status --recheck
|
$(SHELL) ./config.status --recheck
|
||||||
|
|
|
@ -989,22 +989,22 @@ AC_SUBST([am__tar])
|
||||||
AC_SUBST([am__untar])
|
AC_SUBST([am__untar])
|
||||||
]) # _AM_PROG_TAR
|
]) # _AM_PROG_TAR
|
||||||
|
|
||||||
m4_include([../gnulib/m4/00gnulib.m4])
|
m4_include([../gnulib/import/m4/00gnulib.m4])
|
||||||
m4_include([../gnulib/m4/extensions.m4])
|
m4_include([../gnulib/import/m4/extensions.m4])
|
||||||
m4_include([../gnulib/m4/gnulib-common.m4])
|
m4_include([../gnulib/import/m4/gnulib-common.m4])
|
||||||
m4_include([../gnulib/m4/gnulib-comp.m4])
|
m4_include([../gnulib/import/m4/gnulib-comp.m4])
|
||||||
m4_include([../gnulib/m4/include_next.m4])
|
m4_include([../gnulib/import/m4/include_next.m4])
|
||||||
m4_include([../gnulib/m4/inttypes-pri.m4])
|
m4_include([../gnulib/import/m4/inttypes-pri.m4])
|
||||||
m4_include([../gnulib/m4/inttypes.m4])
|
m4_include([../gnulib/import/m4/inttypes.m4])
|
||||||
m4_include([../gnulib/m4/longlong.m4])
|
m4_include([../gnulib/import/m4/longlong.m4])
|
||||||
m4_include([../gnulib/m4/memchr.m4])
|
m4_include([../gnulib/import/m4/memchr.m4])
|
||||||
m4_include([../gnulib/m4/memmem.m4])
|
m4_include([../gnulib/import/m4/memmem.m4])
|
||||||
m4_include([../gnulib/m4/mmap-anon.m4])
|
m4_include([../gnulib/import/m4/mmap-anon.m4])
|
||||||
m4_include([../gnulib/m4/multiarch.m4])
|
m4_include([../gnulib/import/m4/multiarch.m4])
|
||||||
m4_include([../gnulib/m4/onceonly.m4])
|
m4_include([../gnulib/import/m4/onceonly.m4])
|
||||||
m4_include([../gnulib/m4/stddef_h.m4])
|
m4_include([../gnulib/import/m4/stddef_h.m4])
|
||||||
m4_include([../gnulib/m4/stdint.m4])
|
m4_include([../gnulib/import/m4/stdint.m4])
|
||||||
m4_include([../gnulib/m4/string_h.m4])
|
m4_include([../gnulib/import/m4/string_h.m4])
|
||||||
m4_include([../gnulib/m4/warn-on-use.m4])
|
m4_include([../gnulib/import/m4/warn-on-use.m4])
|
||||||
m4_include([../gnulib/m4/wchar_t.m4])
|
m4_include([../gnulib/import/m4/wchar_t.m4])
|
||||||
m4_include([acinclude.m4])
|
m4_include([acinclude.m4])
|
||||||
|
|
|
@ -7848,7 +7848,7 @@ fi
|
||||||
gl_cond_libtool=false
|
gl_cond_libtool=false
|
||||||
gl_libdeps=
|
gl_libdeps=
|
||||||
gl_ltlibdeps=
|
gl_ltlibdeps=
|
||||||
gl_m4_base='gnulib/m4'
|
gl_m4_base='gnulib/import/m4'
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -7858,7 +7858,7 @@ fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
gl_source_base='gnulib'
|
gl_source_base='gnulib/import'
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -9125,7 +9125,7 @@ if test x"$STDINT_H" != x; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
ac_config_files="$ac_config_files Makefile gnulib/Makefile:${srcdir}/../gnulib/Makefile.in"
|
ac_config_files="$ac_config_files Makefile gnulib/import/Makefile:${srcdir}/../gnulib/import/Makefile.in"
|
||||||
|
|
||||||
ac_config_commands="$ac_config_commands default"
|
ac_config_commands="$ac_config_commands default"
|
||||||
|
|
||||||
|
@ -9886,7 +9886,7 @@ do
|
||||||
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.in" ;;
|
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.in" ;;
|
||||||
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
|
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
|
||||||
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
|
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
|
||||||
"gnulib/Makefile") CONFIG_FILES="$CONFIG_FILES gnulib/Makefile:${srcdir}/../gnulib/Makefile.in" ;;
|
"gnulib/import/Makefile") CONFIG_FILES="$CONFIG_FILES gnulib/import/Makefile:${srcdir}/../gnulib/import/Makefile.in" ;;
|
||||||
"default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
|
"default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
|
||||||
|
|
||||||
*) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
|
*) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
|
||||||
|
|
|
@ -450,7 +450,7 @@ if test x"$STDINT_H" != x; then
|
||||||
fi
|
fi
|
||||||
AC_SUBST(GNULIB_STDINT_H)
|
AC_SUBST(GNULIB_STDINT_H)
|
||||||
|
|
||||||
AC_OUTPUT(Makefile gnulib/Makefile:${srcdir}/../gnulib/Makefile.in,
|
AC_OUTPUT(Makefile gnulib/import/Makefile:${srcdir}/../gnulib/import/Makefile.in,
|
||||||
[case x$CONFIG_HEADERS in
|
[case x$CONFIG_HEADERS in
|
||||||
xconfig.h:config.in)
|
xconfig.h:config.in)
|
||||||
echo > stamp-h ;;
|
echo > stamp-h ;;
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
# the same distribution terms as the rest of that program.
|
# the same distribution terms as the rest of that program.
|
||||||
#
|
#
|
||||||
# Generated by gnulib-tool.
|
# Generated by gnulib-tool.
|
||||||
# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib --m4-base=gnulib/m4 --doc-base=doc --tests-base=tests --aux-dir=gnulib/extra --no-conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files inttypes memmem update-copyright
|
# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/import --m4-base=gnulib/import/m4 --doc-base=doc --tests-base=tests --aux-dir=gnulib/import/extra --no-conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files inttypes memmem update-copyright
|
||||||
|
|
||||||
AUTOMAKE_OPTIONS = 1.5 gnits
|
AUTOMAKE_OPTIONS = 1.5 gnits
|
||||||
|
|
||||||
|
@ -122,17 +122,17 @@ BUILT_SOURCES += arg-nonnull.h
|
||||||
# The arg-nonnull.h that gets inserted into generated .h files is the same as
|
# The arg-nonnull.h that gets inserted into generated .h files is the same as
|
||||||
# build-aux/snippet/arg-nonnull.h, except that it has the copyright header cut
|
# build-aux/snippet/arg-nonnull.h, except that it has the copyright header cut
|
||||||
# off.
|
# off.
|
||||||
arg-nonnull.h: $(top_srcdir)/gnulib/extra/snippet/arg-nonnull.h
|
arg-nonnull.h: $(top_srcdir)/gnulib/import/extra/snippet/arg-nonnull.h
|
||||||
$(AM_V_GEN)rm -f $@-t $@ && \
|
$(AM_V_GEN)rm -f $@-t $@ && \
|
||||||
sed -n -e '/GL_ARG_NONNULL/,$$p' \
|
sed -n -e '/GL_ARG_NONNULL/,$$p' \
|
||||||
< $(top_srcdir)/gnulib/extra/snippet/arg-nonnull.h \
|
< $(top_srcdir)/gnulib/import/extra/snippet/arg-nonnull.h \
|
||||||
> $@-t && \
|
> $@-t && \
|
||||||
mv $@-t $@
|
mv $@-t $@
|
||||||
MOSTLYCLEANFILES += arg-nonnull.h arg-nonnull.h-t
|
MOSTLYCLEANFILES += arg-nonnull.h arg-nonnull.h-t
|
||||||
|
|
||||||
ARG_NONNULL_H=arg-nonnull.h
|
ARG_NONNULL_H=arg-nonnull.h
|
||||||
|
|
||||||
EXTRA_DIST += $(top_srcdir)/gnulib/extra/snippet/arg-nonnull.h
|
EXTRA_DIST += $(top_srcdir)/gnulib/import/extra/snippet/arg-nonnull.h
|
||||||
|
|
||||||
## end gnulib module snippet/arg-nonnull
|
## end gnulib module snippet/arg-nonnull
|
||||||
|
|
||||||
|
@ -146,17 +146,17 @@ EXTRA_DIST += $(top_srcdir)/gnulib/extra/snippet/arg-nonnull.h
|
||||||
BUILT_SOURCES += c++defs.h
|
BUILT_SOURCES += c++defs.h
|
||||||
# The c++defs.h that gets inserted into generated .h files is the same as
|
# The c++defs.h that gets inserted into generated .h files is the same as
|
||||||
# build-aux/snippet/c++defs.h, except that it has the copyright header cut off.
|
# build-aux/snippet/c++defs.h, except that it has the copyright header cut off.
|
||||||
c++defs.h: $(top_srcdir)/gnulib/extra/snippet/c++defs.h
|
c++defs.h: $(top_srcdir)/gnulib/import/extra/snippet/c++defs.h
|
||||||
$(AM_V_GEN)rm -f $@-t $@ && \
|
$(AM_V_GEN)rm -f $@-t $@ && \
|
||||||
sed -n -e '/_GL_CXXDEFS/,$$p' \
|
sed -n -e '/_GL_CXXDEFS/,$$p' \
|
||||||
< $(top_srcdir)/gnulib/extra/snippet/c++defs.h \
|
< $(top_srcdir)/gnulib/import/extra/snippet/c++defs.h \
|
||||||
> $@-t && \
|
> $@-t && \
|
||||||
mv $@-t $@
|
mv $@-t $@
|
||||||
MOSTLYCLEANFILES += c++defs.h c++defs.h-t
|
MOSTLYCLEANFILES += c++defs.h c++defs.h-t
|
||||||
|
|
||||||
CXXDEFS_H=c++defs.h
|
CXXDEFS_H=c++defs.h
|
||||||
|
|
||||||
EXTRA_DIST += $(top_srcdir)/gnulib/extra/snippet/c++defs.h
|
EXTRA_DIST += $(top_srcdir)/gnulib/import/extra/snippet/c++defs.h
|
||||||
|
|
||||||
## end gnulib module snippet/c++defs
|
## end gnulib module snippet/c++defs
|
||||||
|
|
||||||
|
@ -166,17 +166,17 @@ BUILT_SOURCES += warn-on-use.h
|
||||||
# The warn-on-use.h that gets inserted into generated .h files is the same as
|
# The warn-on-use.h that gets inserted into generated .h files is the same as
|
||||||
# build-aux/snippet/warn-on-use.h, except that it has the copyright header cut
|
# build-aux/snippet/warn-on-use.h, except that it has the copyright header cut
|
||||||
# off.
|
# off.
|
||||||
warn-on-use.h: $(top_srcdir)/gnulib/extra/snippet/warn-on-use.h
|
warn-on-use.h: $(top_srcdir)/gnulib/import/extra/snippet/warn-on-use.h
|
||||||
$(AM_V_GEN)rm -f $@-t $@ && \
|
$(AM_V_GEN)rm -f $@-t $@ && \
|
||||||
sed -n -e '/^.ifndef/,$$p' \
|
sed -n -e '/^.ifndef/,$$p' \
|
||||||
< $(top_srcdir)/gnulib/extra/snippet/warn-on-use.h \
|
< $(top_srcdir)/gnulib/import/extra/snippet/warn-on-use.h \
|
||||||
> $@-t && \
|
> $@-t && \
|
||||||
mv $@-t $@
|
mv $@-t $@
|
||||||
MOSTLYCLEANFILES += warn-on-use.h warn-on-use.h-t
|
MOSTLYCLEANFILES += warn-on-use.h warn-on-use.h-t
|
||||||
|
|
||||||
WARN_ON_USE_H=warn-on-use.h
|
WARN_ON_USE_H=warn-on-use.h
|
||||||
|
|
||||||
EXTRA_DIST += $(top_srcdir)/gnulib/extra/snippet/warn-on-use.h
|
EXTRA_DIST += $(top_srcdir)/gnulib/import/extra/snippet/warn-on-use.h
|
||||||
|
|
||||||
## end gnulib module snippet/warn-on-use
|
## end gnulib module snippet/warn-on-use
|
||||||
|
|
||||||
|
@ -363,7 +363,7 @@ EXTRA_DIST += string.in.h
|
||||||
## begin gnulib module update-copyright
|
## begin gnulib module update-copyright
|
||||||
|
|
||||||
|
|
||||||
EXTRA_DIST += $(top_srcdir)/gnulib/extra/update-copyright
|
EXTRA_DIST += $(top_srcdir)/gnulib/import/extra/update-copyright
|
||||||
|
|
||||||
## end gnulib module update-copyright
|
## end gnulib module update-copyright
|
||||||
|
|
|
@ -36,7 +36,7 @@
|
||||||
# the same distribution terms as the rest of that program.
|
# the same distribution terms as the rest of that program.
|
||||||
#
|
#
|
||||||
# Generated by gnulib-tool.
|
# Generated by gnulib-tool.
|
||||||
# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib --m4-base=gnulib/m4 --doc-base=doc --tests-base=tests --aux-dir=gnulib/extra --no-conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files inttypes memmem update-copyright
|
# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/import --m4-base=gnulib/import/m4 --doc-base=doc --tests-base=tests --aux-dir=gnulib/import/extra --no-conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files inttypes memmem update-copyright
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -60,32 +60,32 @@ POST_UNINSTALL = :
|
||||||
build_triplet = @build@
|
build_triplet = @build@
|
||||||
host_triplet = @host@
|
host_triplet = @host@
|
||||||
target_triplet = @target@
|
target_triplet = @target@
|
||||||
subdir = gnulib
|
subdir = gnulib/import
|
||||||
DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
|
DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
|
||||||
$(srcdir)/Makefile.in
|
$(srcdir)/Makefile.in
|
||||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||||
am__aclocal_m4_deps = $(top_srcdir)/../config/largefile.m4 \
|
am__aclocal_m4_deps = $(top_srcdir)/../config/largefile.m4 \
|
||||||
$(top_srcdir)/../config/lead-dot.m4 \
|
$(top_srcdir)/../config/lead-dot.m4 \
|
||||||
$(top_srcdir)/../config/plugins.m4 \
|
$(top_srcdir)/../config/plugins.m4 \
|
||||||
$(top_srcdir)/gnulib/m4/00gnulib.m4 \
|
$(top_srcdir)/gnulib/import/m4/00gnulib.m4 \
|
||||||
$(top_srcdir)/gnulib/m4/extensions.m4 \
|
$(top_srcdir)/gnulib/import/m4/extensions.m4 \
|
||||||
$(top_srcdir)/gnulib/m4/gnulib-common.m4 \
|
$(top_srcdir)/gnulib/import/m4/gnulib-common.m4 \
|
||||||
$(top_srcdir)/gnulib/m4/gnulib-comp.m4 \
|
$(top_srcdir)/gnulib/import/m4/gnulib-comp.m4 \
|
||||||
$(top_srcdir)/gnulib/m4/include_next.m4 \
|
$(top_srcdir)/gnulib/import/m4/include_next.m4 \
|
||||||
$(top_srcdir)/gnulib/m4/inttypes-pri.m4 \
|
$(top_srcdir)/gnulib/import/m4/inttypes-pri.m4 \
|
||||||
$(top_srcdir)/gnulib/m4/inttypes.m4 \
|
$(top_srcdir)/gnulib/import/m4/inttypes.m4 \
|
||||||
$(top_srcdir)/gnulib/m4/longlong.m4 \
|
$(top_srcdir)/gnulib/import/m4/longlong.m4 \
|
||||||
$(top_srcdir)/gnulib/m4/memchr.m4 \
|
$(top_srcdir)/gnulib/import/m4/memchr.m4 \
|
||||||
$(top_srcdir)/gnulib/m4/memmem.m4 \
|
$(top_srcdir)/gnulib/import/m4/memmem.m4 \
|
||||||
$(top_srcdir)/gnulib/m4/mmap-anon.m4 \
|
$(top_srcdir)/gnulib/import/m4/mmap-anon.m4 \
|
||||||
$(top_srcdir)/gnulib/m4/multiarch.m4 \
|
$(top_srcdir)/gnulib/import/m4/multiarch.m4 \
|
||||||
$(top_srcdir)/gnulib/m4/onceonly.m4 \
|
$(top_srcdir)/gnulib/import/m4/onceonly.m4 \
|
||||||
$(top_srcdir)/gnulib/m4/stddef_h.m4 \
|
$(top_srcdir)/gnulib/import/m4/stddef_h.m4 \
|
||||||
$(top_srcdir)/gnulib/m4/stdint.m4 \
|
$(top_srcdir)/gnulib/import/m4/stdint.m4 \
|
||||||
$(top_srcdir)/gnulib/m4/string_h.m4 \
|
$(top_srcdir)/gnulib/import/m4/string_h.m4 \
|
||||||
$(top_srcdir)/gnulib/m4/warn-on-use.m4 \
|
$(top_srcdir)/gnulib/import/m4/warn-on-use.m4 \
|
||||||
$(top_srcdir)/gnulib/m4/wchar_t.m4 $(top_srcdir)/acinclude.m4 \
|
$(top_srcdir)/gnulib/import/m4/wchar_t.m4 \
|
||||||
$(top_srcdir)/../bfd/bfd.m4 \
|
$(top_srcdir)/acinclude.m4 $(top_srcdir)/../bfd/bfd.m4 \
|
||||||
$(top_srcdir)/../config/acinclude.m4 \
|
$(top_srcdir)/../config/acinclude.m4 \
|
||||||
$(top_srcdir)/../config/override.m4 \
|
$(top_srcdir)/../config/override.m4 \
|
||||||
$(top_srcdir)/../config/gettext-sister.m4 \
|
$(top_srcdir)/../config/gettext-sister.m4 \
|
||||||
|
@ -504,11 +504,11 @@ noinst_LIBRARIES = libgnu.a
|
||||||
noinst_LTLIBRARIES =
|
noinst_LTLIBRARIES =
|
||||||
EXTRA_DIST = m4/gnulib-cache.m4 inttypes.in.h memchr.c memchr.valgrind \
|
EXTRA_DIST = m4/gnulib-cache.m4 inttypes.in.h memchr.c memchr.valgrind \
|
||||||
memmem.c str-two-way.h \
|
memmem.c str-two-way.h \
|
||||||
$(top_srcdir)/gnulib/extra/snippet/arg-nonnull.h \
|
$(top_srcdir)/gnulib/import/extra/snippet/arg-nonnull.h \
|
||||||
$(top_srcdir)/gnulib/extra/snippet/c++defs.h \
|
$(top_srcdir)/gnulib/import/extra/snippet/c++defs.h \
|
||||||
$(top_srcdir)/gnulib/extra/snippet/warn-on-use.h stddef.in.h \
|
$(top_srcdir)/gnulib/import/extra/snippet/warn-on-use.h \
|
||||||
stdint.in.h string.in.h \
|
stddef.in.h stdint.in.h string.in.h \
|
||||||
$(top_srcdir)/gnulib/extra/update-copyright
|
$(top_srcdir)/gnulib/import/extra/update-copyright
|
||||||
|
|
||||||
# The BUILT_SOURCES created by this Makefile snippet are not used via #include
|
# The BUILT_SOURCES created by this Makefile snippet are not used via #include
|
||||||
# statements but through direct file reference. Therefore this snippet must be
|
# statements but through direct file reference. Therefore this snippet must be
|
||||||
|
@ -553,9 +553,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
|
||||||
exit 1;; \
|
exit 1;; \
|
||||||
esac; \
|
esac; \
|
||||||
done; \
|
done; \
|
||||||
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits gnulib/Makefile'; \
|
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits gnulib/import/Makefile'; \
|
||||||
$(am__cd) $(top_srcdir) && \
|
$(am__cd) $(top_srcdir) && \
|
||||||
$(AUTOMAKE) --gnits gnulib/Makefile
|
$(AUTOMAKE) --gnits gnulib/import/Makefile
|
||||||
.PRECIOUS: Makefile
|
.PRECIOUS: Makefile
|
||||||
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
||||||
@case '$?' in \
|
@case '$?' in \
|
||||||
|
@ -973,27 +973,27 @@ inttypes.h: inttypes.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_U
|
||||||
# The arg-nonnull.h that gets inserted into generated .h files is the same as
|
# The arg-nonnull.h that gets inserted into generated .h files is the same as
|
||||||
# build-aux/snippet/arg-nonnull.h, except that it has the copyright header cut
|
# build-aux/snippet/arg-nonnull.h, except that it has the copyright header cut
|
||||||
# off.
|
# off.
|
||||||
arg-nonnull.h: $(top_srcdir)/gnulib/extra/snippet/arg-nonnull.h
|
arg-nonnull.h: $(top_srcdir)/gnulib/import/extra/snippet/arg-nonnull.h
|
||||||
$(AM_V_GEN)rm -f $@-t $@ && \
|
$(AM_V_GEN)rm -f $@-t $@ && \
|
||||||
sed -n -e '/GL_ARG_NONNULL/,$$p' \
|
sed -n -e '/GL_ARG_NONNULL/,$$p' \
|
||||||
< $(top_srcdir)/gnulib/extra/snippet/arg-nonnull.h \
|
< $(top_srcdir)/gnulib/import/extra/snippet/arg-nonnull.h \
|
||||||
> $@-t && \
|
> $@-t && \
|
||||||
mv $@-t $@
|
mv $@-t $@
|
||||||
# The c++defs.h that gets inserted into generated .h files is the same as
|
# The c++defs.h that gets inserted into generated .h files is the same as
|
||||||
# build-aux/snippet/c++defs.h, except that it has the copyright header cut off.
|
# build-aux/snippet/c++defs.h, except that it has the copyright header cut off.
|
||||||
c++defs.h: $(top_srcdir)/gnulib/extra/snippet/c++defs.h
|
c++defs.h: $(top_srcdir)/gnulib/import/extra/snippet/c++defs.h
|
||||||
$(AM_V_GEN)rm -f $@-t $@ && \
|
$(AM_V_GEN)rm -f $@-t $@ && \
|
||||||
sed -n -e '/_GL_CXXDEFS/,$$p' \
|
sed -n -e '/_GL_CXXDEFS/,$$p' \
|
||||||
< $(top_srcdir)/gnulib/extra/snippet/c++defs.h \
|
< $(top_srcdir)/gnulib/import/extra/snippet/c++defs.h \
|
||||||
> $@-t && \
|
> $@-t && \
|
||||||
mv $@-t $@
|
mv $@-t $@
|
||||||
# The warn-on-use.h that gets inserted into generated .h files is the same as
|
# The warn-on-use.h that gets inserted into generated .h files is the same as
|
||||||
# build-aux/snippet/warn-on-use.h, except that it has the copyright header cut
|
# build-aux/snippet/warn-on-use.h, except that it has the copyright header cut
|
||||||
# off.
|
# off.
|
||||||
warn-on-use.h: $(top_srcdir)/gnulib/extra/snippet/warn-on-use.h
|
warn-on-use.h: $(top_srcdir)/gnulib/import/extra/snippet/warn-on-use.h
|
||||||
$(AM_V_GEN)rm -f $@-t $@ && \
|
$(AM_V_GEN)rm -f $@-t $@ && \
|
||||||
sed -n -e '/^.ifndef/,$$p' \
|
sed -n -e '/^.ifndef/,$$p' \
|
||||||
< $(top_srcdir)/gnulib/extra/snippet/warn-on-use.h \
|
< $(top_srcdir)/gnulib/import/extra/snippet/warn-on-use.h \
|
||||||
> $@-t && \
|
> $@-t && \
|
||||||
mv $@-t $@
|
mv $@-t $@
|
||||||
|
|
0
gdb/gnulib/extra/update-copyright → gdb/gnulib/import/extra/update-copyright
Executable file → Normal file
0
gdb/gnulib/extra/update-copyright → gdb/gnulib/import/extra/update-copyright
Executable file → Normal file
|
@ -27,7 +27,7 @@
|
||||||
|
|
||||||
|
|
||||||
# Specification in the form of a command-line invocation:
|
# Specification in the form of a command-line invocation:
|
||||||
# gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib --m4-base=gnulib/m4 --doc-base=doc --tests-base=tests --aux-dir=gnulib/extra --no-conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files inttypes memmem update-copyright
|
# gnulib-tool --import --dir=. --lib=libgnu --source-base=gnulib/import --m4-base=gnulib/import/m4 --doc-base=doc --tests-base=tests --aux-dir=gnulib/import/extra --no-conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files inttypes memmem update-copyright
|
||||||
|
|
||||||
# Specification in the form of a few gnulib-tool.m4 macro invocations:
|
# Specification in the form of a few gnulib-tool.m4 macro invocations:
|
||||||
gl_LOCAL_DIR([])
|
gl_LOCAL_DIR([])
|
||||||
|
@ -37,8 +37,8 @@ gl_MODULES([
|
||||||
update-copyright
|
update-copyright
|
||||||
])
|
])
|
||||||
gl_AVOID([])
|
gl_AVOID([])
|
||||||
gl_SOURCE_BASE([gnulib])
|
gl_SOURCE_BASE([gnulib/import])
|
||||||
gl_M4_BASE([gnulib/m4])
|
gl_M4_BASE([gnulib/import/m4])
|
||||||
gl_PO_BASE([])
|
gl_PO_BASE([])
|
||||||
gl_DOC_BASE([doc])
|
gl_DOC_BASE([doc])
|
||||||
gl_TESTS_BASE([tests])
|
gl_TESTS_BASE([tests])
|
|
@ -64,14 +64,14 @@ AC_DEFUN([gl_INIT],
|
||||||
gl_cond_libtool=false
|
gl_cond_libtool=false
|
||||||
gl_libdeps=
|
gl_libdeps=
|
||||||
gl_ltlibdeps=
|
gl_ltlibdeps=
|
||||||
gl_m4_base='gnulib/m4'
|
gl_m4_base='gnulib/import/m4'
|
||||||
m4_pushdef([AC_LIBOBJ], m4_defn([gl_LIBOBJ]))
|
m4_pushdef([AC_LIBOBJ], m4_defn([gl_LIBOBJ]))
|
||||||
m4_pushdef([AC_REPLACE_FUNCS], m4_defn([gl_REPLACE_FUNCS]))
|
m4_pushdef([AC_REPLACE_FUNCS], m4_defn([gl_REPLACE_FUNCS]))
|
||||||
m4_pushdef([AC_LIBSOURCES], m4_defn([gl_LIBSOURCES]))
|
m4_pushdef([AC_LIBSOURCES], m4_defn([gl_LIBSOURCES]))
|
||||||
m4_pushdef([gl_LIBSOURCES_LIST], [])
|
m4_pushdef([gl_LIBSOURCES_LIST], [])
|
||||||
m4_pushdef([gl_LIBSOURCES_DIR], [])
|
m4_pushdef([gl_LIBSOURCES_DIR], [])
|
||||||
gl_COMMON
|
gl_COMMON
|
||||||
gl_source_base='gnulib'
|
gl_source_base='gnulib/import'
|
||||||
gl_INTTYPES_H
|
gl_INTTYPES_H
|
||||||
gl_INTTYPES_INCOMPLETE
|
gl_INTTYPES_INCOMPLETE
|
||||||
gl_FUNC_MEMCHR
|
gl_FUNC_MEMCHR
|
||||||
|
@ -197,7 +197,7 @@ AC_DEFUN([gl_REPLACE_FUNCS], [
|
||||||
AC_DEFUN([gl_LIBSOURCES], [
|
AC_DEFUN([gl_LIBSOURCES], [
|
||||||
m4_foreach([_gl_NAME], [$1], [
|
m4_foreach([_gl_NAME], [$1], [
|
||||||
m4_if(_gl_NAME, [alloca.c], [], [
|
m4_if(_gl_NAME, [alloca.c], [], [
|
||||||
m4_define([gl_LIBSOURCES_DIR], [gnulib])
|
m4_define([gl_LIBSOURCES_DIR], [gnulib/import])
|
||||||
m4_append([gl_LIBSOURCES_LIST], _gl_NAME, [ ])
|
m4_append([gl_LIBSOURCES_LIST], _gl_NAME, [ ])
|
||||||
])
|
])
|
||||||
])
|
])
|
Loading…
Reference in New Issue