Merge the gtk-printing branch. For more detailed ChangeLog entries, see

[~andy/gtk] / modules / Makefile.am

diff --git a/modules/Makefile.am b/modules/Makefile.am
index 10e4875ad89014ded3e65328608a059acb2d97b9..41dfbb4470969601e6eaf56d332d0def9467ada0 100644 (file)
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -1 +1,6 @@
-SUBDIRS=input engines
+if OS_UNIX
+PRINTBACKENDS_SUBDIR=printbackends
+endif
+
+SUBDIRS=input engines $(PRINTBACKENDS_SUBDIR)
+DIST_SUBDIRS=input engines printbackends