[Spice-commits] 2 commits - autogen.sh git.mk Makefile.am README
Marc-André Lureau
elmarco at kemper.freedesktop.org
Tue Mar 28 13:02:18 UTC 2017
Makefile.am | 45 ++++++++++++++++++++++++++++++++++++++-------
README | 2 +-
autogen.sh | 1 +
git.mk | 42 +++++-------------------------------------
4 files changed, 45 insertions(+), 45 deletions(-)
New commits:
commit 9dc37c4be202121dc67947070eda25e772d660a5
Author: Marc-André Lureau <marcandre.lureau at redhat.com>
Date: Tue Mar 28 15:02:06 2017 +0200
Revert "build-sys: update git.mk"
This reverts commit 243357cbc18db92b2b301c4c89ee9431fd12e0b1.
diff --git a/Makefile.am b/Makefile.am
index f462ae0..31d4707 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,13 +48,30 @@ EXTRA_DIST = \
$(INTLTOOL_FILES) \
$(NULL)
-MAINTAINERCLEANFILES = \
- $(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \
- $(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN) \
- $(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL) \
- m4/gtk-doc.m4 \
- m4/intltool.m4 \
- gtk-doc.make \
+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 \
$(NULL)
# Generate the ChangeLog file
diff --git a/git.mk b/git.mk
index facca55..af15798 100644
--- a/git.mk
+++ b/git.mk
@@ -1,5 +1,4 @@
-# git.mk, a small Makefile to autogenerate .gitignore files
-# for autotools-based projects.
+# git.mk
#
# Copyright 2009, Red Hat, Inc.
# Copyright 2010,2011,2012,2013 Behdad Esfahbod
@@ -10,8 +9,7 @@
# notice and this notice are preserved.
#
# The latest version of this file can be downloaded from:
-GIT_MK_URL = https://raw.githubusercontent.com/behdad/git.mk/master/git.mk
-#
+# https://raw.github.com/behdad/git.mk/master/git.mk
# Bugs, etc, should be reported upstream at:
# https://github.com/behdad/git.mk
#
@@ -48,7 +46,7 @@ GIT_MK_URL = https://raw.githubusercontent.com/behdad/git.mk/master/git.mk
#
# This file knows how to handle autoconf, automake, libtool, gtk-doc,
# gnome-doc-utils, yelp.m4, mallard, intltool, gsettings, dejagnu, appdata,
-# appstream, hotdoc.
+# appstream.
#
# This makefile provides the following targets:
#
@@ -86,7 +84,6 @@ GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL = \
ar-lib \
compile \
config.guess \
- config.rpath \
config.sub \
depcomp \
install-sh \
@@ -152,10 +149,7 @@ git-mk-install:
fi; \
fi; done; test -z "$$any_failed"
-git-mk-update:
- wget $(GIT_MK_URL) -O $(top_srcdir)/git.mk
-
-.PHONY: git-all git-mk-install git-mk-update
+.PHONY: git-all git-mk-install
@@ -172,24 +166,10 @@ $(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 \
@@ -209,15 +189,6 @@ $(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 \
@@ -245,7 +216,6 @@ $(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 \
@@ -254,7 +224,6 @@ $(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" \
@@ -286,7 +255,7 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
if test "x$(am__dirstamp)" = x; then :; else \
echo "$(am__dirstamp)"; \
fi; \
- if test "x$(findstring libtool,$(LTCOMPILE))" = x -a "x$(findstring libtool,$(LTCXXCOMPILE))" = x -a "x$(GTKDOC_RUN)" = x; then :; else \
+ if test "x$(LTCOMPILE)" = x -a "x$(LTCXXCOMPILE)" = x -a "x$(GTKDOC_RUN)" = x; then :; else \
for x in \
"*.lo" \
".libs" "_libs" \
@@ -304,7 +273,6 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
$(TEST_LOGS) \
$(TEST_LOGS:.log=.trs) \
$(TEST_SUITE_LOG) \
- $(TESTS:=.test) \
"*.gcda" \
"*.gcno" \
$(DISTCLEANFILES) \
commit 8e20d945c737bad156f35b918b725b53b6280409
Author: Marc-André Lureau <marcandre.lureau at redhat.com>
Date: Tue Mar 28 15:02:02 2017 +0200
Revert "build-sys: remove intltool"
This reverts commit c13b3eb0c4773edbe2d26a8f9732f305eeb342ce.
diff --git a/Makefile.am b/Makefile.am
index 54a8a57..f462ae0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,7 +26,20 @@ if WITH_CONTROLLER
pkgconfig_DATA += spice-controller.pc
endif
-DISTCLEANFILES = $(pkgconfig_DATA)
+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)
EXTRA_DIST = \
build-aux/git-version-gen \
@@ -40,6 +53,7 @@ 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 1ea621a..2ab5b67 100644
--- a/README
+++ b/README
@@ -42,7 +42,7 @@ dnf builddep spice-gtk
. or install:
-gtk3-devel spice-protocol
+gtk3-devel spice-protocol intltool
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 cc7bda3..da28eef 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -10,6 +10,7 @@ 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"
More information about the Spice-commits
mailing list