summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Persch <[email protected]>2012-06-14 00:04:18 +0200
committerraveit65 <[email protected]>2018-03-21 06:56:34 +0100
commit9ac0d1a788affc0307d837b8011f533d16974841 (patch)
tree62651d62dcd4d48bf797be4ee8419048ae3d1842
parentcfbab0ad8e12730462bdefdd389cadb43f4c0f0a (diff)
downloadatril-9ac0d1a788affc0307d837b8011f533d16974841.tar.bz2
atril-9ac0d1a788affc0307d837b8011f533d16974841.tar.xz
shell: Remove unused marshalers
Since there was only the one, also remove the whole glib-genmarshal setup. If we ever need another non-stock marshaler, we'll just use the new glib generic marshaler. origin commit: https://git.gnome.org/browse/evince/commit/?h=gnome-3-6&id=fe7f842
-rw-r--r--shell/Makefile.am12
-rw-r--r--shell/ev-marshal.list1
2 files changed, 1 insertions, 12 deletions
diff --git a/shell/Makefile.am b/shell/Makefile.am
index ab91afee..3f0309c8 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -88,8 +88,6 @@ atril_SOURCES= \
main.c
nodist_atril_SOURCES = \
- ev-marshal.c \
- ev-marshal.h \
$(NULL)
if ENABLE_DBUS
@@ -115,7 +113,7 @@ atril_LDADD= \
$(top_builddir)/libmisc/libevmisc.la \
$(SHELL_LIBS)
-BUILT_SOURCES = ev-marshal.h ev-marshal.c
+BUILT_SOURCES =
if ENABLE_DBUS
BUILT_SOURCES += \
@@ -150,17 +148,9 @@ atrild_LDADD= \
endif
EXTRA_DIST = \
- ev-marshal.list \
ev-gdbus.xml \
ev-daemon-gdbus.xml
-ev-marshal.h: $(srcdir)/ev-marshal.list
- $(AM_V_GEN)$(GLIB_GENMARSHAL) --prefix=ev_marshal $(srcdir)/ev-marshal.list --header > ev-marshal.h
-
-ev-marshal.c: $(srcdir)/ev-marshal.list
- echo '#include "ev-marshal.h"' > ev-marshal.c
- $(AM_V_GEN)$(GLIB_GENMARSHAL) --prefix=ev_marshal $(srcdir)/ev-marshal.list --body >> ev-marshal.c
-
ev-gdbus-generated.c ev-gdbus-generated.h: ev-gdbus.xml Makefile
$(AM_V_GEN) $(GDBUS_CODEGEN) \
--interface-prefix=org.mate.atril \
diff --git a/shell/ev-marshal.list b/shell/ev-marshal.list
deleted file mode 100644
index 72f99379..00000000
--- a/shell/ev-marshal.list
+++ /dev/null
@@ -1 +0,0 @@
-VOID:STRING,STRING