[Spice-commits] 3 commits - gtk/Makefile.am gtk/controller

Hans de Goede jwrdegoede at kemper.freedesktop.org
Fri Sep 2 05:28:19 PDT 2011


 gtk/Makefile.am            |   71 ++++++++++++++++++++++++++++++---------------
 gtk/controller/Makefile.am |    4 ++
 2 files changed, 52 insertions(+), 23 deletions(-)

New commits:
commit ec3079ef593688cd1429f82133c375c67789bb8c
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Fri Sep 2 11:13:51 2011 +0200

    gtk/controller/Makefile.am: Add explicit rules for autogenerated files
    
    The autogenerated files are part of make dist, without these explicit
    rules doing "./autogen.sh && make dist" on a clean git checkout
    will fail because it wants them but does not know how to build them.
    
    Signed-off-by: Hans de Goede <hdegoede at redhat.com>

diff --git a/gtk/controller/Makefile.am b/gtk/controller/Makefile.am
index 6c2a91d..2d5c5af 100644
--- a/gtk/controller/Makefile.am
+++ b/gtk/controller/Makefile.am
@@ -67,6 +67,10 @@ controller.vala.stamp: $(libspice_controller_la_VALASOURCES) custom.vapi
 	$(VALA_V)$(VALAC) $(VALAFLAGS) $(AM_VALAFLAGS) $(libspice_controller_la_VALASOURCES) -H spice-controller.h
 	@touch $@
 
+spice-controller.h: controller.vala.stamp
+menu.c: controller.vala.stamp
+controller.c: controller.vala.stamp
+
 EXTRA_DIST =					\
 	$(libspice_controller_la_VALASOURCES)	\
 	controller.vala.stamp			\
commit b30306a393d844bb0465e9c231879af44723e8a0
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Fri Sep 2 11:30:07 2011 +0200

    gtk/Makefile.am: Remove a bunch of .c files from EXTRA_DIST
    
    automake is smart enough to add _SOURCES files to make dist's result even
    if there compilation is depending on an AM conditional, and we are already
    depending on this for the smartcard / usb files, so lets depend on it for
    the other ones too.
    
    Signed-off-by: Hans de Goede <hdegoede at redhat.com>

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 1667608..c21af16 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -10,10 +10,6 @@ EXTRA_DIST =					\
 	keymap-gen.pl				\
 	keymaps.csv				\
 	decode-glz-tmpl.c			\
-	coroutine_gthread.c			\
-	coroutine_ucontext.c			\
-	coroutine_winfibers.c			\
-	continuation.h continuation.c		\
 	map-file				\
 	generated_demarshallers.c		\
 	generated_demarshallers1.c		\
@@ -22,7 +18,6 @@ EXTRA_DIST =					\
 	gusb/README.txt				\
 	spice-client-gtk.override		\
 	spice-client-gtk-manual.defs		\
-	spice-client-gtk-module.c		\
 	$(NULL)
 
 bin_PROGRAMS = spicy snappy spicy-stats
commit 5851e83ef5cb9e0097a939f22cfa3a84f8f217fb
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Fri Sep 2 11:12:31 2011 +0200

    gtk/Makefile.am: Don't include auto-generated files into make dist tarbal
    
    We have various files which are auto-generated which currently get included
    into the tarbal, yet they are part of CLEANFILES, so the first make clean
    removes them, which is rather weird. Use nodist_foo_SOURCES to make them
    not end up in the tarbal.
    
    generated_[de]marshallers[1].c, are special as autogenerating those on
    end user builds would mean requiring the end user to have pyparser installed,
    so we add them to EXTRA_DIST and remove them from CLEANFILES. It may seem
    weird to have them in nodist_... and then add them to EXTRA_DIST,
    but this patch also adds an explict depenency on the autogenerated files
    to the non autogerated ones:
    $(libspice_client_glib_2_0_la_SOURCES): spice-glib-enums.h
    
    Leaving generated_[de]marshallers[1].c in libspice_client_glib_2_0_la_SOURCES,
    would cause it to get a dep on autogenerated files, and thus get regenerated
    itself no matter what, defeating the purpose of having them in dist in the
    first place.
    
    Signed-off-by: Hans de Goede <hdegoede at redhat.com>

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 6759d45..1667608 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -15,6 +15,10 @@ EXTRA_DIST =					\
 	coroutine_winfibers.c			\
 	continuation.h continuation.c		\
 	map-file				\
+	generated_demarshallers.c		\
+	generated_demarshallers1.c		\
+	generated_marshallers.c			\
+	generated_marshallers1.c		\
 	gusb/README.txt				\
 	spice-client-gtk.override		\
 	spice-client-gtk-manual.defs		\
@@ -99,16 +103,17 @@ SPICE_GTK_LIBADD_COMMON =		\
 
 SPICE_GTK_SOURCES_COMMON =		\
 	spice-widget.c			\
-	spice-widget.h			\
 	spice-widget-priv.h		\
-	spice-widget-enums.c		\
-	spice-widget-enums.h		\
 	vncdisplaykeymap.c		\
 	vncdisplaykeymap.h		\
 	spice-grabsequence.c		\
 	spice-grabsequence.h		\
 	$(NULL)
 
+nodist_SPICE_GTK_SOURCES_COMMON =	\
+	spice-widget-enums.c		\
+	$(NULL)
+
 if WITH_X11
 SPICE_GTK_SOURCES_COMMON +=		\
 	spice-widget-x11.c		\
@@ -123,20 +128,25 @@ if HAVE_GTK_2
 libspice_client_gtk_2_0_la_LDFLAGS = $(SPICE_GTK_LDFLAGS_COMMON)
 libspice_client_gtk_2_0_la_LIBADD = $(SPICE_GTK_LIBADD_COMMON)
 libspice_client_gtk_2_0_la_SOURCES = $(SPICE_GTK_SOURCES_COMMON)
+nodist_libspice_client_gtk_2_0_la_SOURCES = $(nodist_SPICE_GTK_SOURCES_COMMON)
 else
 libspice_client_gtk_3_0_la_LDFLAGS = $(SPICE_GTK_LDFLAGS_COMMON)
 libspice_client_gtk_3_0_la_LIBADD = $(SPICE_GTK_LIBADD_COMMON)
 libspice_client_gtk_3_0_la_SOURCES = $(SPICE_GTK_SOURCES_COMMON)
+nodist_libspice_client_gtk_3_0_la_SOURCES = $(nodist_SPICE_GTK_SOURCES_COMMON)
 endif
 
 
 libspice_client_gtkincludedir = $(includedir)/spice-client-gtk-$(SPICE_GTK_API_VERSION)
 libspice_client_gtkinclude_HEADERS =	\
 	spice-widget.h			\
-	spice-widget-enums.h		\
 	spice-grabsequence.h		\
 	$(NULL)
 
+nodist_libspice_client_gtkinclude_HEADERS =	\
+	spice-widget-enums.h		\
+	$(NULL)
+
 libspice_client_glib_2_0_la_LDFLAGS =	\
 	-version-info 4:0:3		\
 	-no-undefined			\
@@ -193,14 +203,7 @@ libspice_client_glib_2_0_la_SOURCES =	\
 	spice-session-priv.h		\
 	spice-channel.c			\
 	spice-channel-cache.h		\
-	spice-glib-enums.c		\
 	spice-channel-priv.h		\
-	spice-marshal.c			\
-	spice-marshal.h			\
-	generated_demarshallers.c	\
-	generated_demarshallers1.c	\
-	generated_marshallers.c		\
-	generated_marshallers1.c	\
 	coroutine.h			\
 	gio-coroutine.c			\
 	gio-coroutine.h			\
@@ -252,6 +255,16 @@ libspice_client_glib_2_0_la_SOURCES =	\
 	$(COMMON_DIR)/ssl_verify.h	\
 	$(NULL)
 
+nodist_libspice_client_glib_2_0_la_SOURCES =	\
+	generated_demarshallers.c	\
+	generated_demarshallers1.c	\
+	generated_marshallers.c		\
+	generated_marshallers1.c	\
+	spice-glib-enums.c		\
+	spice-marshal.c			\
+	spice-marshal.h			\
+	$(NULL)
+
 libspice_client_glibincludedir = $(includedir)/spice-client-glib-2.0
 libspice_client_glibinclude_HEADERS =	\
 	spice-audio.h			\
@@ -259,7 +272,6 @@ libspice_client_glibinclude_HEADERS =	\
 	spice-types.h			\
 	spice-session.h			\
 	spice-channel.h			\
-	spice-glib-enums.h		\
 	spice-util.h			\
 	spice-option.h			\
 	channel-cursor.h		\
@@ -273,6 +285,10 @@ libspice_client_glibinclude_HEADERS =	\
 	usb-device-manager.h		\
 	$(NULL)
 
+nodist_libspice_client_glibinclude_HEADERS =	\
+	spice-glib-enums.h		\
+	$(NULL)
+
 # file for API compatibility, but we don't want warning during our compilation
 dist_libspice_client_glibinclude_DATA =	\
 	spice-channel-enums.h		\
@@ -379,6 +395,8 @@ spice-marshal.c: spice-marshal.txt
 spice-marshal.h: spice-marshal.txt
 	$(AM_V_GEN)glib-genmarshal --header $< > $@ || (rm -f $@ && exit 1)
 
+$(libspice_client_glib_2_0_la_SOURCES): spice-glib-enums.h
+
 spice-glib-enums.c: spice-channel.h channel-inputs.h spice-session.h
 	$(AM_V_GEN)glib-mkenums --fhead "#include <glib-object.h>\n" \
 			--fhead "#include \"spice-glib-enums.h\"\n\n" \
@@ -405,6 +423,12 @@ spice-glib-enums.h: spice-channel.h channel-inputs.h spice-session.h
 			--eprod "GType @enum_name at _get_type (void);\n" \
 		$^ >  $@
 
+if HAVE_GTK_2
+$(libspice_client_gtk_2_0_la_SOURCES): spice-glib-enums.h spice-widget-enums.h
+else
+$(libspice_client_gtk_3_0_la_SOURCES): spice-glib-enums.h spice-widget-enums.h
+endif
+
 spice-widget-enums.c: spice-widget.h
 	$(AM_V_GEN)glib-mkenums --fhead "#include <glib-object.h>\n" \
 			--fhead "#include \"spice-widget-enums.h\"\n\n" \
@@ -430,6 +454,8 @@ spice-widget-enums.h: spice-widget.h
 		$< >  $@
 
 
+# Note despite being autogenerated these are not part of CLEANFILES, they are
+# actually a part of EXTRA_DIST, to avoid the need for pyparser by end users
 generated_demarshallers.c: $(top_srcdir)/spice.proto
 	$(AM_V_GEN)$(PYTHON) $(top_srcdir)/spice_codegen.py --generate-demarshallers --client --include messages.h $< $@ >/dev/null
 
@@ -446,6 +472,9 @@ vncdisplaykeymap.c: $(KEYMAPS)
 
 $(KEYMAPS): $(KEYMAP_GEN) keymaps.csv
 
+# Note despite being autogenerated these are not part of CLEANFILES, they
+# are actually a part of EXTRA_DIST to avoid the need for perl(Text::CSV) by
+# end users
 vncdisplaykeymap_xorgevdev2xtkbd.c:
 	$(AM_V_GEN)$(KEYMAP_GEN) $(srcdir)/keymaps.csv xorgevdev xtkbd > $@ || rm $@
 
@@ -465,8 +494,6 @@ vncdisplaykeymap_win322xtkbd.c:
 	$(AM_V_GEN)$(KEYMAP_GEN) $(srcdir)/keymaps.csv win32 xtkbd > $@ || rm $@
 
 CLEANFILES = spice-marshal.c spice-marshal.h \
-	generated_demarshallers.c generated_demarshallers1.c \
-	generated_marshallers.c generated_marshallers1.c \
 	spice-glib-enums.c spice-glib-enums.h \
 	spice-widget-enums.c spice-widget-enums.h
 MAINTAINERCLEANFILES = $(KEYMAPS)
@@ -479,13 +506,14 @@ pyexec_LTLIBRARIES = SpiceClientGtk.la
 SpiceClientGtk_la_LIBADD = libspice-client-gtk-2.0.la libspice-client-glib-2.0.la $(PYGTK_LIBS)
 SpiceClientGtk_la_CFLAGS = $(GTK_CFLAGS) $(PYTHON_INCLUDES) $(PYGTK_CFLAGS)
 SpiceClientGtk_la_LDFLAGS = -module -avoid-version -fPIC
-SpiceClientGtk_la_SOURCES = spice-client-gtk-module.c spice-client-gtk-module.defs.c
+SpiceClientGtk_la_SOURCES = spice-client-gtk-module.c
+nodist_SpiceClientGtk_la_SOURCES = spice-client-gtk-module.defs.c
 
 CODEGENDIR = `pkg-config --variable=codegendir pygtk-2.0`
 DEFSDIR = `pkg-config --variable=defsdir pygtk-2.0`
 
-spice-client-gtk.defs: $(libspice_client_gtkinclude_HEADERS) $(libspice_client_glibinclude_HEADERS)
-	$(AM_V_GEN)$(PYTHON) $(CODEGENDIR)/h2def.py -f spice-client-gtk-manual.defs $(libspice_client_gtkinclude_HEADERS) $(libspice_client_glibinclude_HEADERS) > $@
+spice-client-gtk.defs: $(libspice_client_gtkinclude_HEADERS) $(nodist_libspice_client_gtkinclude_HEADERS) $(libspice_client_glibinclude_HEADERS) $(nodist_libspice_client_glibinclude_HEADERS)
+	$(AM_V_GEN)$(PYTHON) $(CODEGENDIR)/h2def.py -f spice-client-gtk-manual.defs $(libspice_client_gtkinclude_HEADERS) $(nodist_libspice_client_gtkinclude_HEADERS) $(libspice_client_glibinclude_HEADERS) $(nodist_libspice_client_glibinclude_HEADERS) > $@
 
 spice-client-gtk-module.defs.c: spice-client-gtk.override spice-client-gtk.defs spice-client-gtk-manual.defs
 	@cat $(srcdir)/spice-client-gtk.defs $(srcdir)/spice-client-gtk-manual.defs > tmp.defs
@@ -514,6 +542,7 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir)
 if HAVE_INTROSPECTION
 glib_introspection_files =			\
 	$(libspice_client_glibinclude_HEADERS)	\
+	$(nodist_libspice_client_glibinclude_HEADERS)	\
 	spice-audio.c				\
 	spice-client.c				\
 	spice-session.c				\
@@ -533,6 +562,7 @@ glib_introspection_files =			\
 
 gtk_introspection_files =			\
 	$(libspice_client_gtkinclude_HEADERS)	\
+	$(nodist_libspice_client_gtkinclude_HEADERS)	\
 	spice-widget.c				\
 	spice-grabsequence.c			\
 	$(NULL)
@@ -571,7 +601,7 @@ endif
 update-map-file:
 	( echo "SPICEGTK_1 {" ; \
 	  echo "global:" ; \
-	  ctags -f - --c-kinds=p $(libspice_client_gtkinclude_HEADERS) $(libspice_client_glibinclude_HEADERS) | awk '/^spice_/ { print $$1 ";" }' | sort ; \
+	  ctags -f - --c-kinds=p $(libspice_client_gtkinclude_HEADERS) $(nodist_libspice_client_gtkinclude_HEADERS) $(libspice_client_glibinclude_HEADERS) $(nodist_libspice_client_glibinclude_HEADERS) | awk '/^spice_/ { print $$1 ";" }' | sort ; \
 	  echo "local:" ;  \
 	  echo "*;" ; \
 	  echo "};" ) > $(srcdir)/map-file


More information about the Spice-commits mailing list