[Spice-devel] [Spice-commits] 2 commits - autogen.sh git.mk Makefile.am README
Marc-André Lureau
marcandre.lureau at gmail.com
Tue Mar 28 13:01:31 UTC 2017
wrong push, reverting
sorry for the noise
On Tue, Mar 28, 2017 at 3:00 PM Marc-André Lureau <
elmarco at kemper.freedesktop.org> wrote:
> Makefile.am | 45 +++++++--------------------------------------
> README | 2 +-
> autogen.sh | 1 -
> git.mk | 42 +++++++++++++++++++++++++++++++++++++-----
> 4 files changed, 45 insertions(+), 45 deletions(-)
>
> New commits:
> commit c13b3eb0c4773edbe2d26a8f9732f305eeb342ce
> Author: Marc-André Lureau <marcandre.lureau at redhat.com>
> Date: Tue Mar 28 14:51:04 2017 +0200
>
> build-sys: remove intltool
>
> It never really worked, and we removed some of its commented usage a
> while ago when dropping spicy desktop/mime.
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau at redhat.com>
>
> diff --git a/Makefile.am b/Makefile.am
> index f462ae0..54a8a57 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -26,20 +26,7 @@ if WITH_CONTROLLER
> pkgconfig_DATA += spice-controller.pc
> endif
>
> -INTLTOOL_FILES = \
> - intltool-extract.in \
> - intltool-merge.in \
> - intltool-update.in \
> - $(NULL)
> -
> -DISTCLEANFILES = \
> - $(pkgconfig_DATA) \
> - intltool-extract \
> - intltool-merge \
> - intltool-update \
> - gnome-doc-utils.make \
> - po/.intltool-merge-cache \
> - $(NULL)
> +DISTCLEANFILES = $(pkgconfig_DATA)
>
> EXTRA_DIST = \
> build-aux/git-version-gen \
> @@ -53,7 +40,6 @@ MAINTAINERCLEANFILES =
> \
> $(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN) \
> $(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL) \
> m4/gtk-doc.m4 \
> - m4/intltool.m4 \
> gtk-doc.make \
> $(NULL)
>
> diff --git a/README b/README
> index 2ab5b67..1ea621a 100644
> --- a/README
> +++ b/README
> @@ -42,7 +42,7 @@ dnf builddep spice-gtk
>
> . or install:
>
> -gtk3-devel spice-protocol intltool
> +gtk3-devel spice-protocol
> openssl-devel pulseaudio-libs-devel pixman-devel
> gobject-introspection-devel libjpeg-turbo-devel zlib-devel
> cyrus-sasl-devel gtk-doc
> diff --git a/autogen.sh b/autogen.sh
> index da28eef..cc7bda3 100755
> --- a/autogen.sh
> +++ b/autogen.sh
> @@ -10,7 +10,6 @@ test -z "$srcdir" && srcdir=.
> git submodule update --init --recursive
> gtkdocize
> autoreconf -v --force --install
> - intltoolize -f
> )
>
> CONFIGURE_ARGS="--enable-maintainer-mode --enable-gtk-doc --with-gtk=3.0
> --enable-vala"
> commit 243357cbc18db92b2b301c4c89ee9431fd12e0b1
> Author: Marc-André Lureau <marcandre.lureau at redhat.com>
> Date: Tue Mar 28 14:37:47 2017 +0200
>
> build-sys: update git.mk
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau at redhat.com>
>
> diff --git a/Makefile.am b/Makefile.am
> index 31d4707..f462ae0 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -48,30 +48,13 @@ EXTRA_DIST = \
> $(INTLTOOL_FILES) \
> $(NULL)
>
> -MAINTAINERCLEANFILES = \
> - ABOUT-NLS \
> - aclocal.m4 \
> - config.h.in \
> - m4/gtk-doc.m4 \
> - m4/intltool.m4 \
> - m4/libtool.m4 \
> - m4/ltoptions.m4 \
> - m4/ltsugar.m4 \
> - m4/ltversion.m4 \
> - m4/lt~obsolete.m4 \
> - build-aux/ar-lib \
> - build-aux/compile \
> - build-aux/config.guess \
> - build-aux/config.rpath \
> - build-aux/config.sub \
> - build-aux/depcomp \
> - build-aux/install-sh \
> - build-aux/ltmain.sh \
> - build-aux/missing \
> - build-aux/mkinstalldirs \
> - build-aux/test-driver \
> - po/Makefile.in.in \
> - gtk-doc.make \
> +MAINTAINERCLEANFILES = \
> + $(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \
> + $(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN) \
> + $(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL) \
> + m4/gtk-doc.m4 \
> + m4/intltool.m4 \
> + gtk-doc.make \
> $(NULL)
>
> # Generate the ChangeLog file
> diff --git a/git.mk b/git.mk
> index af15798..facca55 100644
> --- a/git.mk
> +++ b/git.mk
> @@ -1,4 +1,5 @@
> -# git.mk
> +# git.mk, a small Makefile to autogenerate .gitignore files
> +# for autotools-based projects.
> #
> # Copyright 2009, Red Hat, Inc.
> # Copyright 2010,2011,2012,2013 Behdad Esfahbod
> @@ -9,7 +10,8 @@
> # notice and this notice are preserved.
> #
> # The latest version of this file can be downloaded from:
> -# https://raw.github.com/behdad/git.mk/master/git.mk
> +GIT_MK_URL =
> https://raw.githubusercontent.com/behdad/git.mk/master/git.mk
> +#
> # Bugs, etc, should be reported upstream at:
> # https://github.com/behdad/git.mk
> #
> @@ -46,7 +48,7 @@
> #
> # This file knows how to handle autoconf, automake, libtool, gtk-doc,
> # gnome-doc-utils, yelp.m4, mallard, intltool, gsettings, dejagnu,
> appdata,
> -# appstream.
> +# appstream, hotdoc.
> #
> # This makefile provides the following targets:
> #
> @@ -84,6 +86,7 @@ GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL = \
> ar-lib \
> compile \
> config.guess \
> + config.rpath \
> config.sub \
> depcomp \
> install-sh \
> @@ -149,7 +152,10 @@ git-mk-install:
> fi; \
> fi; done; test -z "$$any_failed"
>
> -.PHONY: git-all git-mk-install
> +git-mk-update:
> + wget $(GIT_MK_URL) -O $(top_srcdir)/git.mk
> +
> +.PHONY: git-all git-mk-install git-mk-update
>
>
>
> @@ -166,10 +172,24 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/
> git.mk
> $(DOC_MODULE)-decl.txt \
> tmpl/$(DOC_MODULE)-unused.sgml \
> "tmpl/*.bak" \
> + $(REPORT_FILES) \
> + $(DOC_MODULE).pdf \
> xml html \
> ; do echo "/$$x"; done; \
> FLAVOR=$$(cd $(top_srcdir); $(AUTOCONF) --trace
> 'GTK_DOC_CHECK:$$2' ./configure.ac); \
> case $$FLAVOR in *no-tmpl*) echo /tmpl;; esac; \
> + if echo "$(SCAN_OPTIONS)" | grep -q
> "\-\-rebuild-types"; then \
> + echo "/$(DOC_MODULE).types"; \
> + fi; \
> + if echo "$(SCAN_OPTIONS)" | grep -q
> "\-\-rebuild-sections"; then \
> + echo "/$(DOC_MODULE)-sections.txt"; \
> + fi; \
> + if test "$(abs_srcdir)" != "$(abs_builddir)" ;
> then \
> + for x in \
> + $(SETUP_FILES) \
> + $(DOC_MODULE).types \
> + ; do echo "/$$x"; done; \
> + fi; \
> fi; \
> if test "x$(DOC_MODULE)$(DOC_ID)" = x -o "x$(DOC_LINGUAS)"
> = x; then :; else \
> for lc in $(DOC_LINGUAS); do \
> @@ -189,6 +209,15 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/
> git.mk
> "*/*.omf.out" \
> ; do echo /$$x; done; \
> fi; \
> + if test "x$(HOTDOC)" = x; then :; else \
> + $(foreach project, $(HOTDOC_PROJECTS),echo
> "/$(call HOTDOC_TARGET,$(project))"; \
> + echo "/$(shell $(call
> HOTDOC_PROJECT_COMMAND,$(project)) --get-conf-path output)" ; \
> + echo "/$(shell $(call
> HOTDOC_PROJECT_COMMAND,$(project)) --get-private-folder)" ; \
> + ) \
> + for x in \
> + .hotdoc.d \
> + ; do echo "/$$x"; done; \
> + fi; \
> if test "x$(HELP_ID)" = x -o "x$(HELP_LINGUAS)" = x; then
> :; else \
> for lc in $(HELP_LINGUAS); do \
> for x in \
> @@ -216,6 +245,7 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
> fi; \
> if test -f $(srcdir)/po/Makefile.in.in; then \
> for x in \
> + ABOUT-NLS \
> po/Makefile.in.in \
> po/Makefile.in.in~ \
> po/Makefile.in \
> @@ -224,6 +254,7 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
> po/POTFILES \
> po/Rules-quot \
> po/stamp-it \
> + po/stamp-po \
> po/.intltool-merge-cache \
> "po/*.gmo" \
> "po/*.header" \
> @@ -255,7 +286,7 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
> if test "x$(am__dirstamp)" = x; then :; else \
> echo "$(am__dirstamp)"; \
> fi; \
> - if test "x$(LTCOMPILE)" = x -a "x$(LTCXXCOMPILE)" = x -a
> "x$(GTKDOC_RUN)" = x; then :; else \
> + if test "x$(findstring libtool,$(LTCOMPILE))" = x -a
> "x$(findstring libtool,$(LTCXXCOMPILE))" = x -a "x$(GTKDOC_RUN)" = x; then
> :; else \
> for x in \
> "*.lo" \
> ".libs" "_libs" \
> @@ -273,6 +304,7 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
> $(TEST_LOGS) \
> $(TEST_LOGS:.log=.trs) \
> $(TEST_SUITE_LOG) \
> + $(TESTS:=.test) \
> "*.gcda" \
> "*.gcno" \
> $(DISTCLEANFILES) \
> _______________________________________________
> Spice-commits mailing list
> Spice-commits at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/spice-commits
>
--
Marc-André Lureau
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/spice-devel/attachments/20170328/534b2fa9/attachment-0001.html>
More information about the Spice-devel
mailing list