6 files changed, 40 insertions, 10 deletions
diff --git a/backend/djvu/Makefile.am b/backend/djvu/Makefile.am
index 75fde7eb..a25134e8 100644
--- a/backend/djvu/Makefile.am
+++ b/backend/djvu/Makefile.am
@@ -1,7 +1,6 @@
 AM_CPPFLAGS = \
 	-I$(top_srcdir)						\
 	-I$(top_srcdir)/libdocument				\
-	-DMATEICONDIR=\""${prefix}/${DATADIRNAME}/pixmaps"\" 	\
 	-DMATELOCALEDIR=\"$(datadir)/locale\"			\
 	-DATRIL_COMPILATION			\
 	$(BACKEND_CFLAGS)					\
@@ -29,7 +28,11 @@ libdjvudocument_la_LIBADD =				\
 backend_in_files = djvudocument.atril-backend.desktop.in
 backend_DATA = $(backend_in_files:.atril-backend.desktop.in=.atril-backend)
 $(backend_DATA): $(backend_in_files)
+if USE_NLS
 	$(AM_V_GEN) $(MSGFMT) --desktop --keyword=TypeDescription --template $< -d $(top_srcdir)/po -o $@
+else
+	$(AM_V_GEN) cp -f $< $@
+endif
 
 EXTRA_DIST = $(backend_in_files)
 
diff --git a/backend/djvu/djvu-document.c b/backend/djvu/djvu-document.c
index b3e41a8d..9ed327ad 100644
--- a/backend/djvu/djvu-document.c
+++ b/backend/djvu/djvu-document.c
@@ -66,7 +66,6 @@ EV_BACKEND_REGISTER_WITH_CODE (DjvuDocument, djvu_document,
       EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_SELECTION, djvu_selection_iface_init);
      });
 
-
 #define EV_DJVU_ERROR ev_djvu_error_quark ()
 
 static GQuark
@@ -256,7 +255,6 @@ djvu_document_load (EvDocument  *document,
 	return TRUE;
 }
 
-
 static gboolean
 djvu_document_save (EvDocument  *document,
 		    const char  *uri,
@@ -676,7 +674,6 @@ djvu_document_find_find_text (EvDocumentFind   *document,
 		r->y2 = height - tmp * SCALE_FACTOR;
 	}
 
-
 	return matches;
 }
 
diff --git a/backend/djvu/djvu-links.c b/backend/djvu/djvu-links.c
index da871dac..03da5983 100644
--- a/backend/djvu/djvu-links.c
+++ b/backend/djvu/djvu-links.c
@@ -181,7 +181,6 @@ build_tree (const DjvuDocument *djvu_document,
 		if (!string_from_miniexp (miniexp_car (iter), &title)) goto unknown_entry;
 		if (!string_from_miniexp (miniexp_cadr (iter), &link_dest)) goto unknown_entry;
 
-
 		if (!g_utf8_validate (title, -1, NULL)) {
 			utf8_title = str_to_utf8 (title);
 			title_markup = g_markup_escape_text (utf8_title, -1);
@@ -342,7 +341,6 @@ get_djvu_hyperlink_mapping (DjvuDocument     *djvu_document,
 	return NULL;
 }
 
-
 gboolean
 djvu_links_has_document_links (EvDocumentLinks *document_links)
 {
diff --git a/backend/djvu/djvu-text-page.c b/backend/djvu/djvu-text-page.c
index 6cbf54e6..72813bd4 100644
--- a/backend/djvu/djvu-text-page.c
+++ b/backend/djvu/djvu-text-page.c
@@ -23,7 +23,6 @@
 #include <libdjvu/miniexp.h>
 #include "djvu-text-page.h"
 
-
 /**
  * djvu_text_page_selection_process:
  * @page: #DjvuTextPage instance
@@ -117,7 +116,6 @@ djvu_text_page_limits_process (DjvuTextPage *page,
 	}
 }
 
-
 static void
 djvu_text_page_limits (DjvuTextPage *page,
 			  miniexp_t     p,
@@ -404,7 +402,6 @@ djvu_text_page_search (DjvuTextPage *page,
 	g_free (search_text);
 }
 
-
 /**
  * djvu_text_page_prepare_search:
  * @page: #DjvuTextPage instance
diff --git a/backend/djvu/djvu-text-page.h b/backend/djvu/djvu-text-page.h
index a25284f5..ed8f3c7a 100644
--- a/backend/djvu/djvu-text-page.h
+++ b/backend/djvu/djvu-text-page.h
@@ -25,7 +25,6 @@
 #include <glib.h>
 #include <libdjvu/miniexp.h>
 
-
 typedef struct _DjvuTextPage DjvuTextPage;
 typedef struct _DjvuTextLink DjvuTextLink;
 
diff --git a/backend/djvu/meson.build b/backend/djvu/meson.build
new file mode 100644
index 00000000..011503e3
--- /dev/null
+++ b/backend/djvu/meson.build
@@ -0,0 +1,36 @@
+djvu_sources = [
+    'djvu-document.c',
+    'djvu-document.h',
+    'djvu-document-private.h',
+    'djvu-links.c',
+    'djvu-links.h',
+    'djvu-text-page.c',
+    'djvu-text-page.h',
+]
+
+djvu_deps = [
+    cairo,
+    djvu,
+    glib,
+    gtk
+]
+
+shared_module(
+    'djvudocument',
+    djvu_sources,
+    link_with: [libdocument],
+    link_args: ['-Wl,-Bsymbolic', '-Wl,-z,relro', '-Wl,-z,now'],
+    include_directories: include_dirs,
+    dependencies: djvu_deps,
+    install: true,
+    install_dir: backendsdir,
+)
+
+i18n.merge_file(
+  input: 'djvudocument.atril-backend.desktop.in',
+  output: 'djvudocument.atril-backend',
+  type: 'desktop',
+  po_dir: po_dir,
+  install: true,
+  install_dir: backendsdir,
+)