[Spice-commits] 3 commits - configure.ac data/Makefile.am generator/Makefile.am Makefile.am NEWS

[Peter Hatina]

 Makefile.am           |    6 +-----
 NEWS                  |   11 +++++++++++
 configure.ac          |   10 ++++------
 data/Makefile.am      |    3 ++-
 generator/Makefile.am |   24 +++++++++++++++++-------
 5 files changed, 35 insertions(+), 19 deletions(-)

New commits:
commit 275c85c3530fc54648d95dcaf3c8275217f225cc
Author: Peter Hatina <phatina at redhat.com>
Date:   Tue Nov 20 11:27:35 2012 +0100

    release v2.8

diff --git a/NEWS b/NEWS
index b995ec4..7b35828 100644
--- a/NEWS
+++ b/NEWS
@@ -5,3 +5,14 @@ spice-xpi 2.7
 - simple test.html page
 - build fixes for newer and older xul
 - fix out of tree build
+
+spice-xpi 2.8
+=============
+
+- added smartcard support
+- added ctrl+alt+delete support
+- added DisableEffects and ColorDepth options
+- added ssl channels: ssmartcard, susbredir, stunnel
+- added tcp ports validation support
+- switched from log4cpp to glib debug messages
+- introduced test page generator
commit 262e0c3fb2ccb8bbfa96259f43a4134002f9cf56
Author: Peter Hatina <phatina at redhat.com>
Date:   Tue Nov 20 11:20:42 2012 +0100

    bump spice-xpi version to 2.8

diff --git a/configure.ac b/configure.ac
index 3d94d1f..e49e683 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.57])
-AC_INIT(spice-xpi, [2.8pre], [], spice-xpi)
+AC_INIT(spice-xpi, [2.8], [], spice-xpi)
 
 AC_CONFIG_MACRO_DIR([m4])
 AM_CONFIG_HEADER([config.h])
commit 533c62b200e527522358a1557adeae27f995e615
Author: Peter Hatina <phatina at redhat.com>
Date:   Tue Nov 20 11:20:05 2012 +0100

    fix distcheck when not compiling with test page generator

diff --git a/Makefile.am b/Makefile.am
index e154048..66363b2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,6 @@
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = SpiceXPI
-if BUILD_GENERATOR
-SUBDIRS += generator
-endif
-SUBDIRS += data
+SUBDIRS = SpiceXPI generator data
 DIST_SUBDIRS = spice-protocol $(SUBDIRS)
 
 EXTRA_DIST = m4
diff --git a/configure.ac b/configure.ac
index 9afb1f4..3d94d1f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -91,15 +91,13 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 AC_ARG_ENABLE([generator],
   [AS_HELP_STRING([--enable-generator],
                   [Enable compilation of a test page generator])],
-  [enable_generator="${enableval}"], [enable_generator="no"])
-AM_CONDITIONAL(BUILD_GENERATOR, test "x${enable_generator}" = "xyes")
-if test "x${enable_generator}" = "xyes"; then
-  AC_OUTPUT([generator/Makefile])
-fi
+  [enable_generator=true], [enable_generator=false])
+AM_CONDITIONAL([BUILD_GENERATOR], [test x$enable_generator = xtrue])
 
 AC_OUTPUT([
 Makefile
 data/Makefile
+generator/Makefile
 SpiceXPI/Makefile
 SpiceXPI/src/Makefile
 SpiceXPI/src/plugin/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 1ad42b4..141c73b 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -2,7 +2,8 @@ if BUILD_GENERATOR
 TEST_PAGE         = test.html
 IDL               = $(top_srcdir)/SpiceXPI/src/plugin/nsISpicec.idl
 GENERATOR         = $(top_builddir)/generator/spice-xpi-generator
-dist_pkgdata_DATA = $(TEST_PAGE)
+
+pkgdata_DATA = $(TEST_PAGE)
 
 $(TEST_PAGE): $(IDL)
 	$(AM_V_GEN)$(GENERATOR) -i $< -o $@
diff --git a/generator/Makefile.am b/generator/Makefile.am
index ce7f42c..c066d55 100644
--- a/generator/Makefile.am
+++ b/generator/Makefile.am
@@ -1,8 +1,18 @@
+if BUILD_GENERATOR
 bin_PROGRAMS                = spice-xpi-generator
-spice_xpi_generator_SOURCES =      \
-		generator.cpp      \
-		main.cpp           \
-		options.cpp        \
-		parser.cpp         \
-		redirecthelper.cpp \
-		scanner.cpp
+spice_xpi_generator_SOURCES = \
+	attribute.h           \
+	generator.cpp         \
+	generator.h           \
+	main.cpp              \
+	method.h              \
+	options.cpp           \
+	options.h             \
+	parser.cpp            \
+	parser.h              \
+	redirecthelper.cpp    \
+	redirecthelper.h      \
+	scanner.cpp           \
+	scanner.h             \
+	token.h
+endif