diff options
| -rw-r--r-- | Makefile-libostree.am | 13 | ||||
| -rw-r--r-- | Makefile-man.am | 6 | ||||
| -rw-r--r-- | Makefile-ostree.am | 14 | ||||
| -rw-r--r-- | Makefile-otutil.am | 10 | ||||
| -rw-r--r-- | Makefile.am | 2 |
5 files changed, 36 insertions, 9 deletions
diff --git a/Makefile-libostree.am b/Makefile-libostree.am index 1f1e0bc7..61763f95 100644 --- a/Makefile-libostree.am +++ b/Makefile-libostree.am @@ -126,10 +126,6 @@ libostree_1_la_SOURCES = \ src/libostree/ostree-repo-static-delta-compilation.c \ src/libostree/ostree-repo-static-delta-compilation-analysis.c \ src/libostree/ostree-repo-static-delta-private.h \ - src/libostree/ostree-gpg-verifier.c \ - src/libostree/ostree-gpg-verifier.h \ - src/libostree/ostree-gpg-verify-result.c \ - src/libostree/ostree-gpg-verify-result-private.h \ src/libostree/ostree-autocleanups.h \ src/libostree/ostree-bloom.c \ src/libostree/ostree-bloom-private.h \ @@ -169,6 +165,15 @@ libostree_1_la_SOURCES += \ $(NULL) endif # USE_AVAHI +if USE_GPGME +libostree_1_la_SOURCES += \ + src/libostree/ostree-gpg-verifier.c \ + src/libostree/ostree-gpg-verifier.h \ + src/libostree/ostree-gpg-verify-result.c \ + src/libostree/ostree-gpg-verify-result-private.h \ + $(NULL) +endif # USE_GPGME + symbol_files = $(top_srcdir)/src/libostree/libostree-released.sym if BUILDOPT_IS_DEVEL_BUILD symbol_files += $(top_srcdir)/src/libostree/libostree-devel.sym diff --git a/Makefile-man.am b/Makefile-man.am index 8ccbba8c..c27a9a55 100644 --- a/Makefile-man.am +++ b/Makefile-man.am @@ -28,7 +28,7 @@ ostree-admin-status.1 ostree-admin-set-origin.1 ostree-admin-switch.1 \ ostree-admin-undeploy.1 ostree-admin-upgrade.1 ostree-admin-unlock.1 \ ostree-admin-pin.1 \ ostree-admin.1 ostree-cat.1 ostree-checkout.1 ostree-checksum.1 \ -ostree-commit.1 ostree-create-usb.1 ostree-export.1 ostree-gpg-sign.1 \ +ostree-commit.1 ostree-create-usb.1 ostree-export.1 \ ostree-config.1 ostree-diff.1 ostree-find-remotes.1 ostree-fsck.1 \ ostree-init.1 ostree-log.1 ostree-ls.1 ostree-prune.1 ostree-pull-local.1 \ ostree-pull.1 ostree-refs.1 ostree-remote.1 ostree-reset.1 \ @@ -45,6 +45,10 @@ if BUILDOPT_FUSE man1_files += rofiles-fuse.1 endif +if USE_GPGME +man1_files += ostree-gpg-sign.1 +endif + man5_files = ostree.repo.5 ostree.repo-config.5 man1_MANS = $(addprefix man/,$(man1_files)) diff --git a/Makefile-ostree.am b/Makefile-ostree.am index 92881a31..76f39cad 100644 --- a/Makefile-ostree.am +++ b/Makefile-ostree.am @@ -34,7 +34,6 @@ ostree_SOURCES = src/ostree/main.c \ src/ostree/ot-builtin-export.c \ src/ostree/ot-builtin-find-remotes.c \ src/ostree/ot-builtin-fsck.c \ - src/ostree/ot-builtin-gpg-sign.c \ src/ostree/ot-builtin-init.c \ src/ostree/ot-builtin-pull-local.c \ src/ostree/ot-builtin-log.c \ @@ -65,6 +64,12 @@ ostree_SOURCES += \ $(NULL) endif +if USE_GPGME +ostree_SOURCES += \ + src/ostree/ot-builtin-gpg-sign.c \ + $(NULL) +endif + # Admin subcommand ostree_SOURCES += \ src/ostree/ot-admin-builtin-init-fs.c \ @@ -95,13 +100,18 @@ ostree_SOURCES += \ src/ostree/ot-remote-builtins.h \ src/ostree/ot-remote-builtin-add.c \ src/ostree/ot-remote-builtin-delete.c \ - src/ostree/ot-remote-builtin-gpg-import.c \ src/ostree/ot-remote-builtin-list.c \ src/ostree/ot-remote-builtin-show-url.c \ src/ostree/ot-remote-builtin-refs.c \ src/ostree/ot-remote-builtin-summary.c \ $(NULL) +if USE_GPGME +ostree_SOURCES += \ + src/ostree/ot-remote-builtin-gpg-import.c \ + $(NULL) +endif + if USE_CURL_OR_SOUP ostree_SOURCES += src/ostree/ot-remote-builtin-add-cookie.c \ diff --git a/Makefile-otutil.am b/Makefile-otutil.am index 5bafb2d0..e8901b57 100644 --- a/Makefile-otutil.am +++ b/Makefile-otutil.am @@ -40,11 +40,17 @@ libotutil_la_SOURCES = \ src/libotutil/ot-variant-builder.h \ src/libotutil/ot-gio-utils.c \ src/libotutil/ot-gio-utils.h \ - src/libotutil/ot-gpg-utils.c \ - src/libotutil/ot-gpg-utils.h \ src/libotutil/otutil.h \ src/libotutil/ot-tool-util.c \ src/libotutil/ot-tool-util.h \ $(NULL) + +if USE_GPGME +libotutil_la_SOURCES += \ + src/libotutil/ot-gpg-utils.c \ + src/libotutil/ot-gpg-utils.h \ + $(NULL) +endif + libotutil_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/libglnx -I$(srcdir)/src/libotutil -DLOCALEDIR=\"$(datadir)/locale\" $(OT_INTERNAL_GIO_UNIX_CFLAGS) $(OT_INTERNAL_GPGME_CFLAGS) $(LIBSYSTEMD_CFLAGS) libotutil_la_LIBADD = $(OT_INTERNAL_GIO_UNIX_LIBS) $(OT_INTERNAL_GPGME_LIBS) $(LIBSYSTEMD_LIBS) diff --git a/Makefile.am b/Makefile.am index 4850cddd..cd04a055 100644 --- a/Makefile.am +++ b/Makefile.am @@ -57,8 +57,10 @@ OT_INTERNAL_SOUP_CFLAGS = $(OT_DEP_SOUP_CFLAGS) OT_INTERNAL_SOUP_LIBS = $(OT_DEP_SOUP_LIBS) # This canonicalizes the PKG_CHECK_MODULES or AM_PATH_GPGME results +if USE_GPGME OT_INTERNAL_GPGME_CFLAGS = $(OT_DEP_GPGME_CFLAGS) $(GPGME_PTHREAD_CFLAGS) OT_INTERNAL_GPGME_LIBS = $(OT_DEP_GPGME_LIBS) $(GPGME_PTHREAD_LIBS) +endif if BUILDOPT_INTROSPECTION include $(INTROSPECTION_MAKEFILE) |