[Spice-devel] [PATCH spice-protocol] build-sys: use git.mk
Christophe Fergeau
cfergeau at redhat.com
Tue Mar 20 02:54:25 PDT 2012
Hmm, what does that bring to spice-protocol which is not modified that
often?
Christophe
On Mon, Mar 19, 2012 at 09:19:35PM +0100, Marc-André Lureau wrote:
> ---
> .gitignore | 17 ----
> Makefile.am | 21 +++++-
> configure.ac | 2 +
> git.mk | 212 +++++++++++++++++++++++++++++++++++++++++++++++++++++
> spice/Makefile.am | 36 +++++----
> 5 files changed, 252 insertions(+), 36 deletions(-)
> delete mode 100644 .gitignore
> create mode 100644 git.mk
>
> diff --git a/.gitignore b/.gitignore
> deleted file mode 100644
> index ad774e7..0000000
> --- a/.gitignore
> +++ /dev/null
> @@ -1,17 +0,0 @@
> -*~
> -Makefile
> -Makefile.in
> -aclocal.m4
> -autom4te.cache
> -config.h
> -config.h.in
> -config.log
> -config.status
> -configure
> -install-sh
> -ltmain.sh
> -m4/
> -missing
> -spice-protocol.pc
> -stamp-h1
> -INSTALL
> diff --git a/Makefile.am b/Makefile.am
> index 6f6c8cd..d2e49a4 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -1,7 +1,24 @@
> +NULL =
> SUBDIRS = spice
>
> pkgconfigdir = $(datadir)/pkgconfig
> pkgconfig_DATA = spice-protocol.pc
>
> -DISTCLEANFILES = \
> - spice-protocol.pc
> +MAINTAINERCLEANFILES = \
> + $(srcdir)/INSTALL \
> + $(srcdir)/aclocal.m4 \
> + $(srcdir)/autoscan.log \
> + $(srcdir)/compile \
> + $(srcdir)/config.guess \
> + $(srcdir)/config.h.in \
> + $(srcdir)/config.sub \
> + $(srcdir)/configure.scan \
> + $(srcdir)/depcomp \
> + $(srcdir)/install-sh \
> + $(srcdir)/ltmain.sh \
> + $(srcdir)/missing \
> + $(srcdir)/mkinstalldirs \
> + `find "$(srcdir)" -type f -name Makefile.in -print` \
> + $(NULL)
> +
> +-include $(top_srcdir)/git.mk
> diff --git a/configure.ac b/configure.ac
> index 9047742..fa88184 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -12,6 +12,8 @@ AM_CONFIG_HEADER([config.h])
> AM_INIT_AUTOMAKE([dist-bzip2])
> AM_MAINTAINER_MODE
>
> +m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
> +
> AC_OUTPUT([
> Makefile
> spice-protocol.pc
> diff --git a/git.mk b/git.mk
> new file mode 100644
> index 0000000..8aebb8d
> --- /dev/null
> +++ b/git.mk
> @@ -0,0 +1,212 @@
> +# git.mk
> +#
> +# Copyright 2009, Red Hat, Inc.
> +# Copyright 2010,2011 Behdad Esfahbod
> +# Written by Behdad Esfahbod
> +#
> +# Copying and distribution of this file, with or without modification,
> +# is permitted in any medium without royalty provided the copyright
> +# notice and this notice are preserved.
> +#
> +# The canonical source for this file is https://github.com/behdad/git.mk.
> +#
> +# To use in your project, import this file in your git repo's toplevel,
> +# then do "make -f git.mk". This modifies all Makefile.am files in
> +# your project to -include git.mk. Remember to add that line to new
> +# Makefile.am files you create in your project, or just rerun the
> +# "make -f git.mk".
> +#
> +# This enables automatic .gitignore generation. If you need to ignore
> +# more files, add them to the GITIGNOREFILES variable in your Makefile.am.
> +# But think twice before doing that. If a file has to be in .gitignore,
> +# chances are very high that it's a generated file and should be in one
> +# of MOSTLYCLEANFILES, CLEANFILES, DISTCLEANFILES, or MAINTAINERCLEANFILES.
> +#
> +# The only case that you need to manually add a file to GITIGNOREFILES is
> +# when remove files in one of mostlyclean-local, clean-local, distclean-local,
> +# or maintainer-clean-local make targets.
> +#
> +# Note that for files like editor backup, etc, there are better places to
> +# ignore them. See "man gitignore".
> +#
> +# If "make maintainer-clean" removes the files but they are not recognized
> +# by this script (that is, if "git status" shows untracked files still), send
> +# me the output of "git status" as well as your Makefile.am and Makefile for
> +# the directories involved and I'll diagnose.
> +#
> +# For a list of toplevel files that should be in MAINTAINERCLEANFILES, see
> +# Makefile.am.sample in the git.mk git repo.
> +#
> +# Don't EXTRA_DIST this file. It is supposed to only live in git clones,
> +# not tarballs. It serves no useful purpose in tarballs and clutters the
> +# build dir.
> +#
> +# This file knows how to handle autoconf, automake, libtool, gtk-doc,
> +# gnome-doc-utils, yelp.m4, mallard, intltool, gsettings, dejagnu.
> +#
> +#
> +# KNOWN ISSUES:
> +#
> +# - Recursive configure doesn't work as $(top_srcdir)/git.mk inside the
> +# submodule doesn't find us. If you have configure.{in,ac} files in
> +# subdirs, add a proxy git.mk file in those dirs that simply does:
> +# "include $(top_srcdir)/../git.mk". Add more ..'s to your taste.
> +# And add those files to git. See vte/gnome-pty-helper/git.mk for
> +# example.
> +#
> +
> +git-all: git-mk-install
> +
> +git-mk-install:
> + @echo Installing git makefile
> + @any_failed=; \
> + find "`test -z "$(top_srcdir)" && echo . || echo "$(top_srcdir)"`" -name Makefile.am | while read x; do \
> + if grep 'include .*/git.mk' $$x >/dev/null; then \
> + echo $$x already includes git.mk; \
> + else \
> + failed=; \
> + echo "Updating $$x"; \
> + { cat $$x; \
> + echo ''; \
> + echo '-include $$(top_srcdir)/git.mk'; \
> + } > $$x.tmp || failed=1; \
> + if test x$$failed = x; then \
> + mv $$x.tmp $$x || failed=1; \
> + fi; \
> + if test x$$failed = x; then : else \
> + echo Failed updating $$x; >&2 \
> + any_failed=1; \
> + fi; \
> + fi; done; test -z "$$any_failed"
> +
> +.PHONY: git-all git-mk-install
> +
> +
> +### .gitignore generation
> +
> +$(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
> + $(AM_V_GEN) \
> + { \
> + if test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x; then :; else \
> + for x in \
> + $(DOC_MODULE)-decl-list.txt \
> + $(DOC_MODULE)-decl.txt \
> + tmpl/$(DOC_MODULE)-unused.sgml \
> + "tmpl/*.bak" \
> + xml html \
> + ; do echo /$$x; done; \
> + fi; \
> + if test "x$(DOC_MODULE)$(DOC_ID)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \
> + for x in \
> + $(_DOC_C_DOCS) \
> + $(_DOC_LC_DOCS) \
> + $(_DOC_OMF_ALL) \
> + $(_DOC_DSK_ALL) \
> + $(_DOC_HTML_ALL) \
> + $(_DOC_MOFILES) \
> + $(_DOC_POFILES) \
> + $(DOC_H_FILE) \
> + "*/.xml2po.mo" \
> + "*/*.omf.out" \
> + ; do echo /$$x; done; \
> + fi; \
> + if test "x$(HELP_ID)" = x -o "x$(HELP_LINGUAS)" = x; then :; else \
> + for x in \
> + $(_HELP_LC_FILES) \
> + $(_HELP_LC_STAMPS) \
> + $(_HELP_MOFILES) \
> + ; do echo /$$x; done; \
> + fi; \
> + if test "x$(gsettings_SCHEMAS)" = x; then :; else \
> + for x in \
> + $(gsettings_SCHEMAS:.xml=.valid) \
> + $(gsettings__enum_file) \
> + ; do echo /$$x; done; \
> + fi; \
> + if test -f $(srcdir)/po/Makefile.in.in; then \
> + for x in \
> + po/Makefile.in.in \
> + po/Makefile.in \
> + po/Makefile \
> + po/POTFILES \
> + po/stamp-it \
> + po/.intltool-merge-cache \
> + "po/*.gmo" \
> + "po/*.mo" \
> + po/$(GETTEXT_PACKAGE).pot \
> + intltool-extract.in \
> + intltool-merge.in \
> + intltool-update.in \
> + ; do echo /$$x; done; \
> + fi; \
> + if test -f $(srcdir)/configure; then \
> + for x in \
> + autom4te.cache \
> + configure \
> + config.h \
> + stamp-h1 \
> + libtool \
> + config.lt \
> + ; do echo /$$x; done; \
> + fi; \
> + if test "x$(DEJATOOL)" = x; then :; else \
> + for x in \
> + $(DEJATOOL) \
> + ; do echo /$$x.sum; echo /$$x.log; done; \
> + echo /site.exp; \
> + fi; \
> + for x in \
> + .gitignore \
> + $(GITIGNOREFILES) \
> + $(CLEANFILES) \
> + $(PROGRAMS) \
> + $(check_PROGRAMS) \
> + $(EXTRA_PROGRAMS) \
> + $(LTLIBRARIES) \
> + so_locations \
> + .libs _libs \
> + $(MOSTLYCLEANFILES) \
> + "*.$(OBJEXT)" \
> + "*.lo" \
> + $(DISTCLEANFILES) \
> + $(am__CONFIG_DISTCLEAN_FILES) \
> + $(CONFIG_CLEAN_FILES) \
> + TAGS ID GTAGS GRTAGS GSYMS GPATH tags \
> + "*.tab.c" \
> + $(MAINTAINERCLEANFILES) \
> + $(BUILT_SOURCES) \
> + $(DEPDIR) \
> + Makefile \
> + Makefile.in \
> + "*.orig" \
> + "*.rej" \
> + "*.bak" \
> + "*~" \
> + ".*.sw[nop]" \
> + ".dirstamp" \
> + ; do echo /$$x; done; \
> + } | \
> + sed "s@^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \
> + sed 's@/[.]/@/@g' | \
> + LC_ALL=C sort | uniq > $@.tmp && \
> + mv $@.tmp $@;
> +
> +all: $(srcdir)/.gitignore gitignore-recurse-maybe
> +gitignore-recurse-maybe:
> + @if test "x$(SUBDIRS)" = "x$(DIST_SUBDIRS)"; then :; else \
> + $(MAKE) $(AM_MAKEFLAGS) gitignore-recurse; \
> + fi;
> +gitignore-recurse:
> + @for subdir in $(DIST_SUBDIRS); do \
> + case " $(SUBDIRS) " in \
> + *" $$subdir "*) :;; \
> + *) test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse || echo "Skipping $$subdir");; \
> + esac; \
> + done
> +gitignore: $(srcdir)/.gitignore gitignore-recurse
> +
> +maintainer-clean: gitignore-clean
> +gitignore-clean:
> + -rm -f $(srcdir)/.gitignore
> +
> +.PHONY: gitignore-clean gitignore gitignore-recurse gitignore-recurse-maybe
> diff --git a/spice/Makefile.am b/spice/Makefile.am
> index 87d0bc9..167b69c 100644
> --- a/spice/Makefile.am
> +++ b/spice/Makefile.am
> @@ -1,21 +1,23 @@
> NULL =
>
> -spice_protocol_includedir=$(includedir)/spice-1/spice
> +spice_protocol_includedir = $(includedir)/spice-1/spice
>
> -spice_protocol_include_HEADERS= \
> - barrier.h \
> - controller_prot.h \
> - end-packed.h \
> - enums.h \
> - error_codes.h \
> - foreign_menu_prot.h \
> - ipc_ring.h \
> - protocol.h \
> - macros.h \
> - qxl_dev.h \
> - start-packed.h \
> - stats.h \
> - types.h \
> - vd_agent.h \
> - vdi_dev.h \
> +spice_protocol_include_HEADERS = \
> + barrier.h \
> + controller_prot.h \
> + end-packed.h \
> + enums.h \
> + error_codes.h \
> + foreign_menu_prot.h \
> + ipc_ring.h \
> + macros.h \
> + protocol.h \
> + qxl_dev.h \
> + start-packed.h \
> + stats.h \
> + types.h \
> + vd_agent.h \
> + vdi_dev.h \
> $(NULL)
> +
> +-include $(top_srcdir)/git.mk
> --
> 1.7.7.6
>
> _______________________________________________
> Spice-devel mailing list
> Spice-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/spice-devel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/spice-devel/attachments/20120320/b9daa538/attachment-0001.pgp>
More information about the Spice-devel
mailing list