Consolidate print backends into one directory

This will let us use GTK_PATH to load them uninstalled, which
is useful for in-tree tests.

23 files changed, 65 insertions, 56 deletions

diff --git a/modules/printbackends/cloudprint/meson.build b/modules/printbackends/cloudprint/meson.build
deleted file mode 100644
index f5217cbc46..0000000000
--- a/modules/printbackends/cloudprint/meson.build
+++ /dev/null
@@ -1,11 +0,0 @@
-shared_module('printbackend-cloudprint',
-              'gtkprintbackendcloudprint.c',
-              'gtkprintercloudprint.c',
-              'gtkcloudprintaccount.c',
-              c_args: [
-                '-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED',
-                '-DGTK_DISABLE_DEPRECATION_WARNINGS',
-              ],
-              dependencies: [ libgtk_dep, rest_dep, json_glib_dep ],
-              install_dir: printbackends_install_dir,
-              install : true)
diff --git a/modules/printbackends/cups/meson.build b/modules/printbackends/cups/meson.build
deleted file mode 100644
index ef7a30ee9a..0000000000
--- a/modules/printbackends/cups/meson.build
+++ /dev/null
@@ -1,22 +0,0 @@
-enable_colord = get_option('colord')
-if enable_colord != 'no'
-  want_colord = enable_colord == 'yes'
-  colord_dep = dependency('colord', version: '>= 0.1.9', required: want_colord)
-  cdata.set('HAVE_COLORD', colord_dep.found())
-else
-  colord_dep = []
-endif
-
-shared_module('printbackend-cups',
-              'gtkprintbackendcups.c',
-              'gtkprintercups.c',
-              'gtkcupsutils.c',
-              'gtkcupssecretsutils.c',
-              c_args: [
-                '-DGTK_COMPILATION',
-                '-DGTK_DISABLE_DEPRECATION_WARNINGS',
-                '-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED',
-              ],
-              dependencies: [libgtk_dep, libcups, colord_dep],
-              install_dir: printbackends_install_dir,
-              install : true)
diff --git a/modules/printbackends/file/meson.build b/modules/printbackends/file/meson.build
deleted file mode 100644
index b1604be0f6..0000000000
--- a/modules/printbackends/file/meson.build
+++ /dev/null
@@ -1,10 +0,0 @@
-shared_module('printbackend-file',
-              'gtkprintbackendfile.c',
-              c_args: [
-                '-DGTK_COMPILATION',
-                '-DGTK_DISABLE_DEPRECATION_WARNINGS',
-                '-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED',
-              ],
-              dependencies: libgtk_dep,
-              install_dir: printbackends_install_dir,
-              install : true)
diff --git a/modules/printbackends/cloudprint/gtkcloudprintaccount.c b/modules/printbackends/gtkcloudprintaccount.c
index ee65a18287..ee65a18287 100644
--- a/modules/printbackends/cloudprint/gtkcloudprintaccount.c
+++ b/modules/printbackends/gtkcloudprintaccount.c
diff --git a/modules/printbackends/cloudprint/gtkcloudprintaccount.h b/modules/printbackends/gtkcloudprintaccount.h
index ef788743d3..ef788743d3 100644
--- a/modules/printbackends/cloudprint/gtkcloudprintaccount.h
+++ b/modules/printbackends/gtkcloudprintaccount.h
diff --git a/modules/printbackends/cups/gtkcupssecretsutils.c b/modules/printbackends/gtkcupssecretsutils.c
index 925f7d561c..925f7d561c 100644
--- a/modules/printbackends/cups/gtkcupssecretsutils.c
+++ b/modules/printbackends/gtkcupssecretsutils.c
diff --git a/modules/printbackends/cups/gtkcupssecretsutils.h b/modules/printbackends/gtkcupssecretsutils.h
index 1a0424a3bf..1a0424a3bf 100644
--- a/modules/printbackends/cups/gtkcupssecretsutils.h
+++ b/modules/printbackends/gtkcupssecretsutils.h
diff --git a/modules/printbackends/cups/gtkcupsutils.c b/modules/printbackends/gtkcupsutils.c
index 54239cad07..54239cad07 100644
--- a/modules/printbackends/cups/gtkcupsutils.c
+++ b/modules/printbackends/gtkcupsutils.c
diff --git a/modules/printbackends/cups/gtkcupsutils.h b/modules/printbackends/gtkcupsutils.h
index 500bb4fecf..500bb4fecf 100644
--- a/modules/printbackends/cups/gtkcupsutils.h
+++ b/modules/printbackends/gtkcupsutils.h
diff --git a/modules/printbackends/cloudprint/gtkprintbackendcloudprint.c b/modules/printbackends/gtkprintbackendcloudprint.c
index b5560343a2..b5560343a2 100644
--- a/modules/printbackends/cloudprint/gtkprintbackendcloudprint.c
+++ b/modules/printbackends/gtkprintbackendcloudprint.c
diff --git a/modules/printbackends/cloudprint/gtkprintbackendcloudprint.h b/modules/printbackends/gtkprintbackendcloudprint.h
index 044ad4b32b..044ad4b32b 100644
--- a/modules/printbackends/cloudprint/gtkprintbackendcloudprint.h
+++ b/modules/printbackends/gtkprintbackendcloudprint.h
diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/gtkprintbackendcups.c
index 09e18b170e..09e18b170e 100644
--- a/modules/printbackends/cups/gtkprintbackendcups.c
+++ b/modules/printbackends/gtkprintbackendcups.c
diff --git a/modules/printbackends/cups/gtkprintbackendcups.h b/modules/printbackends/gtkprintbackendcups.h
index d4e35ddf23..d4e35ddf23 100644
--- a/modules/printbackends/cups/gtkprintbackendcups.h
+++ b/modules/printbackends/gtkprintbackendcups.h
diff --git a/modules/printbackends/file/gtkprintbackendfile.c b/modules/printbackends/gtkprintbackendfile.c
index b568e01395..b568e01395 100644
--- a/modules/printbackends/file/gtkprintbackendfile.c
+++ b/modules/printbackends/gtkprintbackendfile.c
diff --git a/modules/printbackends/file/gtkprintbackendfile.h b/modules/printbackends/gtkprintbackendfile.h
index b4ae41a15c..b4ae41a15c 100644
--- a/modules/printbackends/file/gtkprintbackendfile.h
+++ b/modules/printbackends/gtkprintbackendfile.h
diff --git a/modules/printbackends/lpr/gtkprintbackendlpr.c b/modules/printbackends/gtkprintbackendlpr.c
index aefa921515..aefa921515 100644
--- a/modules/printbackends/lpr/gtkprintbackendlpr.c
+++ b/modules/printbackends/gtkprintbackendlpr.c
diff --git a/modules/printbackends/lpr/gtkprintbackendlpr.h b/modules/printbackends/gtkprintbackendlpr.h
index 0ba195bebd..0ba195bebd 100644
--- a/modules/printbackends/lpr/gtkprintbackendlpr.h
+++ b/modules/printbackends/gtkprintbackendlpr.h
diff --git a/modules/printbackends/cloudprint/gtkprintercloudprint.c b/modules/printbackends/gtkprintercloudprint.c
index 4f299fdcab..4f299fdcab 100644
--- a/modules/printbackends/cloudprint/gtkprintercloudprint.c
+++ b/modules/printbackends/gtkprintercloudprint.c
diff --git a/modules/printbackends/cloudprint/gtkprintercloudprint.h b/modules/printbackends/gtkprintercloudprint.h
index 564fb150be..564fb150be 100644
--- a/modules/printbackends/cloudprint/gtkprintercloudprint.h
+++ b/modules/printbackends/gtkprintercloudprint.h
diff --git a/modules/printbackends/cups/gtkprintercups.c b/modules/printbackends/gtkprintercups.c
index 525382aa8a..525382aa8a 100644
--- a/modules/printbackends/cups/gtkprintercups.c
+++ b/modules/printbackends/gtkprintercups.c
diff --git a/modules/printbackends/cups/gtkprintercups.h b/modules/printbackends/gtkprintercups.h
index f26bbab677..f26bbab677 100644
--- a/modules/printbackends/cups/gtkprintercups.h
+++ b/modules/printbackends/gtkprintercups.h
diff --git a/modules/printbackends/lpr/meson.build b/modules/printbackends/lpr/meson.build
deleted file mode 100644
index 581ca77a48..0000000000
--- a/modules/printbackends/lpr/meson.build
+++ /dev/null
@@ -1,10 +0,0 @@
-shared_module('printbackend-lpr',
-              'gtkprintbackendlpr.c',
-              c_args: [
-                '-DGTK_COMPILATION',
-                '-DGTK_DISABLE_DEPRECATION_WARNINGS',
-                '-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED',
-              ],
-              dependencies: libgtk_dep,
-              install_dir: printbackends_install_dir,
-              install : true)
diff --git a/modules/printbackends/meson.build b/modules/printbackends/meson.build
index f8a363a668..76b5c3789e 100644
--- a/modules/printbackends/meson.build
+++ b/modules/printbackends/meson.build
@@ -84,6 +84,68 @@ printbackends_install_dir = join_paths(get_option('libdir'), printbackends_subdi
 
 cdata.set_quoted('GTK_PRINT_BACKENDS', ','.join(print_backends))
 
-foreach print_backend : print_backends
-  subdir(print_backend)
-endforeach
+
+enable_colord = get_option('colord')
+if enable_colord != 'no'
+  want_colord = enable_colord == 'yes'
+  colord_dep = dependency('colord', version: '>= 0.1.9', required: want_colord)
+  cdata.set('HAVE_COLORD', colord_dep.found())
+else
+  colord_dep = []
+endif
+
+if print_backends.contains('cups')
+  shared_module('printbackend-cups',
+                'gtkprintbackendcups.c',
+                'gtkprintercups.c',
+                'gtkcupsutils.c',
+                'gtkcupssecretsutils.c',
+                c_args: [
+                  '-DGTK_COMPILATION',
+                  '-DGTK_DISABLE_DEPRECATION_WARNINGS',
+                  '-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED',
+                ],
+                dependencies: [libgtk_dep, libcups, colord_dep],
+                install_dir: printbackends_install_dir,
+                install : true)
+endif
+
+if print_backends.contains('cloudprint')
+  shared_module('printbackend-cloudprint',
+                'gtkprintbackendcloudprint.c',
+                'gtkprintercloudprint.c',
+                'gtkcloudprintaccount.c',
+                c_args: [
+                  '-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED',
+                 '-DGTK_DISABLE_DEPRECATION_WARNINGS',
+                ],
+                dependencies: [ libgtk_dep, rest_dep, json_glib_dep ],
+                install_dir: printbackends_install_dir,
+                install : true)
+endif
+
+if print_backends.contains('file')
+  shared_module('printbackend-file',
+                'gtkprintbackendfile.c',
+                c_args: [
+                  '-DGTK_COMPILATION',
+                  '-DGTK_DISABLE_DEPRECATION_WARNINGS',
+                  '-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED',
+                ],
+                dependencies: libgtk_dep,
+                install_dir: printbackends_install_dir,
+                install : true)
+endif
+
+if print_backends.contains('lpr')
+  shared_module('printbackend-lpr',
+                'gtkprintbackendlpr.c',
+                c_args: [
+                  '-DGTK_COMPILATION',
+                  '-DGTK_DISABLE_DEPRECATION_WARNINGS',
+                  '-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED',
+                ],
+                dependencies: libgtk_dep,
+                install_dir: printbackends_install_dir,
+                install : true)
+endif
\ No newline at end of file