commit: ce44bd0686411b53c1cdfee265b90744a35e2501
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue May 21 14:11:41 2019 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue May 21 14:11:41 2019 +0000
URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=ce44bd06
build-sys: regenerate
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
Makefile.in | 119 +++++++++++++++++-------------------------------------
TODO.md | 3 ++
configure | 17 +++++++-
tests/Makefile.in | 13 +++---
4 files changed, 62 insertions(+), 90 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index eadaa63..c5fd207 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -89,6 +89,9 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = q$(EXEEXT)
+@QMANIFEST_ENABLED_TRUE@am__append_1 = qmanifest.c
+@QMANIFEST_ENABLED_TRUE@am__append_2 = man/qmanifest.1
+@QMANIFEST_ENABLED_TRUE@am__append_3 = qmanifest
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/autotools/m4/00gnulib.m4 \
@@ -245,13 +248,17 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
PROGRAMS = $(bin_PROGRAMS)
+am__q_SOURCES_DIST = main.c q.c qatom.c qcheck.c qdepends.c qfile.c \
+ qgrep.c qkeyword.c qlist.c qlop.c qmerge.c qpkg.c qsearch.c \
+ qsize.c qtbz2.c qtegrity.c quse.c qxpak.c qmanifest.c
+@QMANIFEST_ENABLED_TRUE@am__objects_1 = q-qmanifest.$(OBJEXT)
am_q_OBJECTS = q-main.$(OBJEXT) q-q.$(OBJEXT) q-qatom.$(OBJEXT) \
q-qcheck.$(OBJEXT) q-qdepends.$(OBJEXT) q-qfile.$(OBJEXT) \
q-qgrep.$(OBJEXT) q-qkeyword.$(OBJEXT) q-qlist.$(OBJEXT) \
- q-qlop.$(OBJEXT) q-qmanifest.$(OBJEXT) q-qmerge.$(OBJEXT) \
- q-qpkg.$(OBJEXT) q-qsearch.$(OBJEXT) q-qsize.$(OBJEXT) \
- q-qtbz2.$(OBJEXT) q-qtegrity.$(OBJEXT) q-quse.$(OBJEXT) \
- q-qxpak.$(OBJEXT)
+ q-qlop.$(OBJEXT) q-qmerge.$(OBJEXT) q-qpkg.$(OBJEXT) \
+ q-qsearch.$(OBJEXT) q-qsize.$(OBJEXT) q-qtbz2.$(OBJEXT) \
+ q-qtegrity.$(OBJEXT) q-quse.$(OBJEXT) q-qxpak.$(OBJEXT) \
+ $(am__objects_1)
q_OBJECTS = $(am_q_OBJECTS)
am__DEPENDENCIES_1 =
q_DEPENDENCIES = $(am__DEPENDENCIES_1) $(top_builddir)/libq/libq.la \
@@ -298,7 +305,7 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 =
SOURCES = $(q_SOURCES)
-DIST_SOURCES = $(q_SOURCES)
+DIST_SOURCES = $(am__q_SOURCES_DIST)
RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
ctags-recursive dvi-recursive html-recursive info-recursive \
install-data-recursive install-dvi-recursive \
@@ -1558,70 +1565,16 @@ SUBDIRS = \
tests \
$(NULL)
-APPLETS = \
- q \
- qatom \
- qcheck \
- qdepends \
- qfile \
- qgrep \
- qkeyword \
- qlist \
- qlop \
- qmanifest \
- qmerge \
- qpkg \
- qsearch \
- qsize \
- qtbz2 \
- qtegrity \
- quse \
- qxpak \
- $(NULL)
-
-dist_man_MANS = \
- man/q.1 \
- man/qatom.1 \
- man/qcheck.1 \
- man/qdepends.1 \
- man/qfile.1 \
- man/qgrep.1 \
- man/qkeyword.1 \
- man/qlist.1 \
- man/qlop.1 \
- man/qmanifest.1 \
- man/qmerge.1 \
- man/qpkg.1 \
- man/qsearch.1 \
- man/qsize.1 \
- man/qtbz2.1 \
- man/qtegrity.1 \
- man/quse.1 \
- man/qxpak.1 \
- $(NULL)
-
-q_SOURCES = \
- main.c \
- q.c \
- qatom.c \
- qcheck.c \
- qdepends.c \
- qfile.c \
- qgrep.c \
- qkeyword.c \
- qlist.c \
- qlop.c \
- qmanifest.c \
- qmerge.c \
- qpkg.c \
- qsearch.c \
- qsize.c \
- qtbz2.c \
- qtegrity.c \
- quse.c \
- qxpak.c \
- $(NULL)
-
+APPLETS = q qatom qcheck qdepends qfile qgrep qkeyword qlist qlop \
+ qmerge qpkg qsearch qsize qtbz2 qtegrity quse qxpak $(NULL) \
+ $(am__append_3)
+dist_man_MANS = man/q.1 man/qatom.1 man/qcheck.1 man/qdepends.1 \
+ man/qfile.1 man/qgrep.1 man/qkeyword.1 man/qlist.1 man/qlop.1 \
+ man/qmerge.1 man/qpkg.1 man/qsearch.1 man/qsize.1 man/qtbz2.1 \
+ man/qtegrity.1 man/quse.1 man/qxpak.1 $(NULL) $(am__append_2)
+q_SOURCES = main.c q.c qatom.c qcheck.c qdepends.c qfile.c qgrep.c \
+ qkeyword.c qlist.c qlop.c qmerge.c qpkg.c qsearch.c qsize.c \
+ qtbz2.c qtegrity.c quse.c qxpak.c $(NULL) $(am__append_1)
q_CPPFLAGS = \
$(OPENMP_CFLAGS) \
$(GPGME_CFLAGS) \
@@ -1943,20 +1896,6 @@ q-qlop.obj: qlop.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(q_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o q-qlop.obj
`if test -f 'qlop.c'; then $(CYGPATH_W) 'qlop.c'; else $(CYGPATH_W)
'$(srcdir)/qlop.c'; fi`
-q-qmanifest.o: qmanifest.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(q_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT q-qmanifest.o -MD -MP -MF
$(DEPDIR)/q-qmanifest.Tpo -c -o q-qmanifest.o `test -f 'qmanifest.c' || echo
'$(srcdir)/'`qmanifest.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/q-qmanifest.Tpo
$(DEPDIR)/q-qmanifest.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='qmanifest.c'
object='q-qmanifest.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(q_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o
q-qmanifest.o `test -f 'qmanifest.c' || echo '$(srcdir)/'`qmanifest.c
-
-q-qmanifest.obj: qmanifest.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(q_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT q-qmanifest.obj -MD -MP
-MF $(DEPDIR)/q-qmanifest.Tpo -c -o q-qmanifest.obj `if test -f 'qmanifest.c';
then $(CYGPATH_W) 'qmanifest.c'; else $(CYGPATH_W) '$(srcdir)/qmanifest.c'; fi`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/q-qmanifest.Tpo
$(DEPDIR)/q-qmanifest.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='qmanifest.c'
object='q-qmanifest.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(q_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o
q-qmanifest.obj `if test -f 'qmanifest.c'; then $(CYGPATH_W) 'qmanifest.c';
else $(CYGPATH_W) '$(srcdir)/qmanifest.c'; fi`
-
q-qmerge.o: qmerge.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(q_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT q-qmerge.o -MD -MP -MF
$(DEPDIR)/q-qmerge.Tpo -c -o q-qmerge.o `test -f 'qmerge.c' || echo
'$(srcdir)/'`qmerge.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/q-qmerge.Tpo
$(DEPDIR)/q-qmerge.Po
@@ -2069,6 +2008,20 @@ q-qxpak.obj: qxpak.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(q_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o q-qxpak.obj
`if test -f 'qxpak.c'; then $(CYGPATH_W) 'qxpak.c'; else $(CYGPATH_W)
'$(srcdir)/qxpak.c'; fi`
+q-qmanifest.o: qmanifest.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(q_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT q-qmanifest.o -MD -MP -MF
$(DEPDIR)/q-qmanifest.Tpo -c -o q-qmanifest.o `test -f 'qmanifest.c' || echo
'$(srcdir)/'`qmanifest.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/q-qmanifest.Tpo
$(DEPDIR)/q-qmanifest.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='qmanifest.c'
object='q-qmanifest.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(q_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o
q-qmanifest.o `test -f 'qmanifest.c' || echo '$(srcdir)/'`qmanifest.c
+
+q-qmanifest.obj: qmanifest.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(q_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT q-qmanifest.obj -MD -MP
-MF $(DEPDIR)/q-qmanifest.Tpo -c -o q-qmanifest.obj `if test -f 'qmanifest.c';
then $(CYGPATH_W) 'qmanifest.c'; else $(CYGPATH_W) '$(srcdir)/qmanifest.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/q-qmanifest.Tpo
$(DEPDIR)/q-qmanifest.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='qmanifest.c'
object='q-qmanifest.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(q_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o
q-qmanifest.obj `if test -f 'qmanifest.c'; then $(CYGPATH_W) 'qmanifest.c';
else $(CYGPATH_W) '$(srcdir)/qmanifest.c'; fi`
+
mostlyclean-libtool:
-rm -f *.lo
diff --git a/TODO.md b/TODO.md
index 99078d5..e32cbfe 100644
--- a/TODO.md
+++ b/TODO.md
@@ -85,3 +85,6 @@
# qkeyword
- drop -c argument? it can be fully expressed using -p cat/
+
+# qmanifest
+- use openat in most places
diff --git a/configure b/configure
index 89f6d0b..62d3db9 100755
--- a/configure
+++ b/configure
@@ -639,6 +639,8 @@ am__EXEEXT_FALSE
am__EXEEXT_TRUE
LTLIBOBJS
LIBOBJS
+QMANIFEST_ENABLED_FALSE
+QMANIFEST_ENABLED_TRUE
GPGME_LIBS
GPGME_CFLAGS
GPGME_CONFIG
@@ -34901,6 +34903,14 @@ $as_echo_n "checking whether to enable qmanifest... "
>&6; }
$as_echo "no: disabled by configure argument" >&6; }
fi
+ if test "x$enable_qmanifest" != xno; then
+ QMANIFEST_ENABLED_TRUE=
+ QMANIFEST_ENABLED_FALSE='#'
+else
+ QMANIFEST_ENABLED_TRUE='#'
+ QMANIFEST_ENABLED_FALSE=
+fi
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -35602,7 +35612,7 @@ fi
# -Wno-format-nonliteral
# -Wno-expansion-to-defined
-ac_config_files="$ac_config_files Makefile libq/Makefile
autotools/gnulib/Makefile tests/init.sh tests/Makefile
tests/atom_compare/Makefile tests/atom_explode/Makefile
tests/copy_file/Makefile tests/install/Makefile tests/mkdir/Makefile
tests/profile/Makefile tests/qatom/Makefile tests/qcheck/Makefile
tests/qdepends/Makefile tests/qfile/Makefile tests/qlist/Makefile
tests/qlop/Makefile tests/qmerge/Makefile tests/qtbz2/Makefile
tests/quse/Makefile tests/qxpak/Makefile tests/rmspace/Makefile
tests/source/Makefile"
+ac_config_files="$ac_config_files Makefile libq/Makefile
autotools/gnulib/Makefile tests/init.sh tests/Makefile
tests/atom_compare/Makefile tests/atom_explode/Makefile
tests/copy_file/Makefile tests/install/Makefile tests/mkdir/Makefile
tests/profile/Makefile tests/qatom/Makefile tests/qcheck/Makefile
tests/qdepends/Makefile tests/qfile/Makefile tests/qlist/Makefile
tests/qlop/Makefile tests/qmanifest/Makefile tests/qmerge/Makefile
tests/qtbz2/Makefile tests/quse/Makefile tests/qxpak/Makefile
tests/rmspace/Makefile tests/source/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -35815,6 +35825,10 @@ fi
gltests_LTLIBOBJS=$gltests_ltlibobjs
+if test -z "${QMANIFEST_ENABLED_TRUE}" && test -z
"${QMANIFEST_ENABLED_FALSE}"; then
+ as_fn_error $? "conditional \"QMANIFEST_ENABLED\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
: "${CONFIG_STATUS=./config.status}"
ac_write_fail=0
@@ -36710,6 +36724,7 @@ do
"tests/qfile/Makefile") CONFIG_FILES="$CONFIG_FILES tests/qfile/Makefile"
;;
"tests/qlist/Makefile") CONFIG_FILES="$CONFIG_FILES tests/qlist/Makefile"
;;
"tests/qlop/Makefile") CONFIG_FILES="$CONFIG_FILES tests/qlop/Makefile" ;;
+ "tests/qmanifest/Makefile") CONFIG_FILES="$CONFIG_FILES
tests/qmanifest/Makefile" ;;
"tests/qmerge/Makefile") CONFIG_FILES="$CONFIG_FILES
tests/qmerge/Makefile" ;;
"tests/qtbz2/Makefile") CONFIG_FILES="$CONFIG_FILES tests/qtbz2/Makefile"
;;
"tests/quse/Makefile") CONFIG_FILES="$CONFIG_FILES tests/quse/Makefile" ;;
diff --git a/tests/Makefile.in b/tests/Makefile.in
index aa6b6a9..bcdf1c3 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -87,6 +87,7 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
+@QMANIFEST_ENABLED_TRUE@am__append_1 = qmanifest
subdir = tests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/autotools/m4/00gnulib.m4 \
@@ -292,7 +293,9 @@ am__define_uniq_tagged_files = \
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
+DIST_SUBDIRS = atom_compare atom_explode copy_file mkdir rmspace qatom \
+ qcheck qdepends qfile qlist qlop qmerge qtbz2 quse qxpak \
+ install profile source qmanifest
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/init.sh.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
am__relativize = \
@@ -1453,11 +1456,9 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-SUBDIRS = \
- atom_compare atom_explode copy_file mkdir rmspace \
- qatom qcheck qdepends qfile qlist qlop qmerge qtbz2 quse qxpak \
- install profile source
-
+SUBDIRS = atom_compare atom_explode copy_file mkdir rmspace qatom \
+ qcheck qdepends qfile qlist qlop qmerge qtbz2 quse qxpak \
+ install profile source $(am__append_1)
all: all-recursive
.SUFFIXES:
