[gtk-vnc] Fix GTK3 build on mingw32



commit c0605275812bd0c256d9ef2c30f3a87c295588fe
Author: Daniel P. Berrange <berrange redhat com>
Date:   Fri Nov 4 11:45:12 2011 +0000

    Fix GTK3 build on mingw32
    
    The mingw32 linker does not like .def files with symbols which
    do not exist. Filter out the vnc_image_framebuffer* symbols.
    Also ensure the python module generated files are not included
    in the dist

 src/Makefile.am |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 3658535..c5834cb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,12 +13,20 @@ GVNC_VERSION_FILE = $(srcdir)/libgvnc_sym.version
 GTK_VNC_VERSION_FILE = $(srcdir)/libgtk-vnc_sym.version
 endif
 
-%.def: %.version
+%.def: %.version Makefile
+if HAVE_GTK_2
 	$(AM_V_GEN)rm -f -- $ -tmp $@ ; \
 	printf 'EXPORTS\n' > $ -tmp && \
-	sed -e '/^$$/d; /#/d; /:/d; /\}/d; /\*/d; /LIBVIRT_/d; s/[ \t]*\(.*\)\;/    \1/g' $^ >> $ -tmp && \
+	sed -e '/^$$/d; /#/d; /:/d; /\}/d; /\*/d; /LIBVIRT_/d; s/[ \t]*\(.*\)\;/    \1/g' $< >> $ -tmp && \
 	chmod a-w $ -tmp && \
 	mv $ -tmp $@
+else
+	$(AM_V_GEN)rm -f -- $ -tmp $@ ; \
+	printf 'EXPORTS\n' > $ -tmp && \
+	sed -e '/^$$/d; /#/d; /:/d; /\}/d; /\*/d; /vnc_image_framebuffer_*/d; /LIBVIRT_/d; s/[ \t]*\(.*\)\;/    \1/g' $< >> $ -tmp && \
+	chmod a-w $ -tmp && \
+	mv $ -tmp $@
+endif
 
 
 libgvnc_1_0_la_LIBADD = \
@@ -251,7 +259,9 @@ gtkvnc_la_LIBADD = libgtk-vnc-$(GTK_VNC_API_VERSION).la @PYGTK_LIBS@
 gtkvnc_la_CFLAGS = @GTK_CFLAGS@ @PYTHON_INCLUDES@ \
 		   @PYGTK_CFLAGS@ @WARNING_PYTHON_CFLAGS@
 gtkvnc_la_LDFLAGS = -module -avoid-version -fPIC
-gtkvnc_la_SOURCES = vncmodule.c vncmodule.defs.c
+gtkvnc_la_SOURCES = vncmodule.c
+nodist_gtkvnc_la_SOURCES = vncmodule.defs.c
+BUILT_SOURCES += vncmodule.defs.c
 
 CODEGENDIR = $(shell pkg-config --variable=codegendir pygtk-2.0)
 DEFSDIR = $(shell pkg-config --variable=defsdir pygtk-2.0)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]