This makes building with mingw much more convenient.
---
 Makefile.am  |   37 +++++++++++
 configure.ac |   87 +++++++++++++++++++++++++
 git.mk       |  200 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 324 insertions(+), 0 deletions(-)
 create mode 100644 Makefile.am
 create mode 100644 configure.ac
 create mode 100644 git.mk

diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..0aa0328
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,37 @@
+INCLUDES =                             \
+       -I$(top_srcdir)/common          \
+       $(SPICE_PROTOCOL_CFLAGS)
+
+bin_PROGRAMS = vdagent vdservice
+
+vdagent_SOURCES =                      \
+       common/vdcommon.h               \
+       common/vdlog.cpp                \
+       common/vdlog.h                  \
+       vdagent/desktop_layout.cpp      \
+       vdagent/desktop_layout.h        \
+       vdagent/display_setting.cpp     \
+       vdagent/display_setting.h       \
+       vdagent/vdagent.cpp
+
+vdservice_SOURCES =                    \
+       common/stdint.h                 \
+       common/vdcommon.h               \
+       common/vdlog.cpp                \
+       common/vdlog.h                  \
+       vdservice/vdservice.cpp         \
+       vdservice/pci_vdi_port.cpp      \
+       vdservice/pci_vdi_port.h        \
+       vdservice/vdi_port.h            \
+       vdservice/vdi_port.cpp          \
+       vdservice/virtio_vdi_port.h     \
+       vdservice/virtio_vdi_port.cpp
+
+# -lversion is needed for the GetFileVersion* API which is used by
+# vdlog.cpp
+LIBS = -lversion
+vdservice_LDADD = -lwtsapi32
+vdagent_LDADD = $(CXIMAGE_LIBS)
+vdagent_CXXFLAGS = $(CXIMAGE_CFLAGS)
+
+-include $(top_srcdir)/git.mk
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..77d5c25
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,87 @@
+# Copyright (C) 2010 Richard Hughes <rich...@hughsie.com>
+# Copyright (C) 2011 Christophe Fergeau <cferg...@redhat.com>
+AC_PREREQ(2.63)
+
+m4_define([vdagent_major_version], [0])
+m4_define([vdagent_minor_version], [0])
+m4_define([vdagent_micro_version], [1])
+m4_define([vdagent_version],
+          [vdagent_major_version.vdagent_minor_version.vdagent_micro_version])
+
+AC_INIT([vdagent-win],[vdagent_version])
+AC_CONFIG_SRCDIR([vdagent])
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_AUX_DIR([build-aux])
+
+AM_INIT_AUTOMAKE([1.11 subdir-objects no-dist-gzip dist-xz tar-ustar])
+
+AM_SILENT_RULES([yes])
+
+# Check for programs
+AC_PROG_CC
+AC_PROG_CXX
+AM_PROG_CC_C_O
+AC_PROG_INSTALL
+
+dnl ---------------------------------------------------------------------------
+dnl - Extra verbose warning switches
+dnl ---------------------------------------------------------------------------
+
+if test "$GCC" = "yes"; then
+       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wall"
+       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wcast-align -Wno-uninitialized"
+       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wmissing-declarations"
+       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wpointer-arith"
+       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wcast-align"
+       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wwrite-strings"
+       WARNINGFLAGS_C="$WARNINGFLAGS_C -Winit-self"
+       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wreturn-type"
+       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wformat-nonliteral"
+       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wformat-security"
+       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wmissing-include-dirs"
+       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wmissing-format-attribute"
+       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wclobbered"
+       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wempty-body"
+       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wignored-qualifiers"
+       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wsign-compare"
+       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wtype-limits"
+       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wuninitialized"
+       WARNINGFLAGS_C="$WARNINGFLAGS_C -Waggregate-return"
+       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wdeclaration-after-statement"
+       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wshadow"
+       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wno-strict-aliasing"
+       WARNINGFLAGS_C="$WARNINGFLAGS_C -Winline"
+       WARNINGFLAGS_C="$WARNINGFLAGS_C -Wmissing-parameter-type"
+       WARNINGFLAGS_C="$WARNINGFLAGS_C -Woverride-init"
+else
+       WARNINGFLAGS_C=""
+fi
+AC_SUBST(WARNINGFLAGS_C)
+
+dnl ---------------------------------------------------------------------------
+dnl - Check library dependencies
+dnl ---------------------------------------------------------------------------
+
+PKG_CHECK_MODULES(SPICE_PROTOCOL, [spice-protocol])
+PKG_CHECK_MODULES(CXIMAGE, [cximage])
+
+dnl ---------------------------------------------------------------------------
+dnl - Makefiles, etc.
+dnl ---------------------------------------------------------------------------
+AC_CONFIG_FILES([
+Makefile
+])
+AC_OUTPUT
+
+dnl ==========================================================================
+echo "
+                  vdagent-win $VERSION
+                  ================
+
+        prefix:                    ${prefix}
+        datadir:                   ${datadir}
+        compiler:                  ${CXX}
+        cxxflags:                  ${CXXFLAGS}
+        cppflags:                  ${CPPFLAGS}
+"
diff --git a/git.mk b/git.mk
new file mode 100644
index 0000000..abd6c0a
--- /dev/null
+++ b/git.mk
@@ -0,0 +1,200 @@
+# git.mk
+#
+# Copyright 2009, Red Hat, Inc.
+# Written by Behdad Esfahbod
+#
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.
+#
+# The canonical source for this file is pango/git.mk, or whereever the
+# header of pango/git.mk suggests in the future.
+#
+# 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.
+#
+# 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.
+#
+# 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.
+#
+# For a list of toplevel files that should be in MAINTAINERCLEANFILES, see
+# pango/Makefile.am.
+#
+# 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, mallard, intltool, gsettings.
+#
+#
+# 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.
+#
+# ChangeLog
+#
+# - 2010-12-06 Add support for Mallard docs
+# - 2010-12-06 Start this change log
+
+git-all: git-mk-install
+
+git-mk-install:
+       @echo Installing git makefile
+       @any_failed=; find $(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$(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; \
+               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
-- 
1.7.7.6

_______________________________________________
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/spice-devel

Reply via email to