[vinagre] Remove unused marshaller generation rules
- From: David King <davidk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vinagre] Remove unused marshaller generation rules
- Date: Sat, 12 Mar 2011 11:54:24 +0000 (UTC)
commit fc95818484c289db8bccb17319526fcbe551cad1
Author: David King <amigadave amigadave com>
Date: Sat Mar 12 10:12:55 2011 +0100
Remove unused marshaller generation rules
.gitignore | 1 -
Makefile.am | 28 +---------------------------
configure.ac | 7 -------
3 files changed, 1 insertions(+), 35 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b66e9e0..8e1a55d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -87,5 +87,4 @@ Makefile.in
/vinagre/view/.libs
/vinagre/vinagre
/vinagre/vinagre-enums.*
-/vinagre/vinagre-marshal.*
/xmldocs.make
diff --git a/Makefile.am b/Makefile.am
index 6548979..505695d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,7 +40,6 @@ noinst_vinagreh_headers = \
vinagre/view/drawer.h \
vinagre/view/ovBox.h \
vinagre/vinagre-enums.h \
- vinagre/vinagre-marshal.h \
vinagre/vinagre-plugin-dialog.h \
vinagre/vinagre-window-private.h \
vinagre/pty_open.h
@@ -107,7 +106,6 @@ handwritten_sources = \
libvinagre_la_SOURCES = \
vinagre/vinagre-enums.c \
- vinagre/vinagre-marshal.c \
$(handwritten_sources) \
$(noinst_vinagreh_headers) \
$(vinagreh_HEADERS)
@@ -178,8 +176,6 @@ vinagre_applet_SOURCES = \
vinagre/vinagre-fav.c \
vinagre/vinagre-connect.h \
vinagre/vinagre-connect.c \
- vinagre/vinagre-marshal.h \
- vinagre/vinagre-marshal.c \
vinagre/pty_open.h \
vinagre/pty_open.c \
vinagre/vinagre-ssh.h \
@@ -235,30 +231,9 @@ vinagre/vinagre-enums.h: $(vinagre_enum_headers)
--eprod "GType @enum_name _get_type (void);\n" \
$(vinagre_enum_headers) > $@
-vinagre/vinagre-marshal.list: $(handwritten_sources) Makefile.am
- $(AM_V_GEN)( cd $(srcdir) && \
- $(SED) -n -e 's/.*vinagre_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \
- $(handwritten_sources) ) \
- | $(SED) -e 's/__/:/' -e 'y/_/,/' | sort -u > $ tmp && \
- if cmp -s $ tmp $@; then \
- rm $ tmp; \
- else \
- mv $ tmp $@; \
- fi
-
-%-marshal.h: %-marshal.list Makefile
- $(AM_V_GEN)$(GLIB_GENMARSHAL) --header --prefix=_$(subst -,_,$*)_marshal $< > $*-marshal.h
-
-%-marshal.c: %-marshal.list Makefile
- $(AM_V_GEN)echo "#include \"vinagre-marshal.h\"" > $@ && \
- $(GLIB_GENMARSHAL) --body --prefix=_$(subst -,_,$*)_marshal $< >> $*-marshal.c
-
BUILT_SOURCES = \
vinagre/vinagre-enums.c \
- vinagre/vinagre-enums.h \
- vinagre/vinagre-marshal.list \
- vinagre/vinagre-marshal.c \
- vinagre/vinagre-marshal.h
+ vinagre/vinagre-enums.h
# Telepathy stuff
if VINAGRE_HAVE_TELEPATHY_GLIB
@@ -554,7 +529,6 @@ dist_noinst_DATA = \
intltool-update.in \
$(plugin_in_files) \
vinagre/GNOME_VinagreApplet.server.in.in \
- vinagre/vinagre-marshal.list \
vinagre.doap
CLEANFILES += \
diff --git a/configure.ac b/configure.ac
index d63e932..73cab1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,13 +37,6 @@ GTK_VNC_DEPS="gtk-vnc-2.0 >= 0.4.3"
XML2_DEPS="libxml-2.0 >= 2.6.31"
PEAS_DEPS="libpeas-1.0 >= 0.7.2 libpeas-gtk-1.0 >= 0.7.2"
-AC_MSG_CHECKING([for glib-genmarshal script])
-GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
-AS_IF([test "x$GLIB_GENMARSHAL" = "x"],
- [AC_MSG_ERROR([glib-genmarshal not listed in glib-2.0 pkg-config file])],
- [AC_SUBST([GLIB_GENMARSHAL])
- AC_MSG_RESULT([$GLIB_GENMARSHAL])])
-
AC_MSG_CHECKING([for glib-mkenums script])
GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
AS_IF([test "x$GLIB_MKENUMS" = "x"],
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]