diff --git a/Makefile.in b/Makefile.in index 5e0b348d8..26b1f9072 100644 --- a/Makefile.in +++ b/Makefile.in @@ -36,12 +36,16 @@ ifeq ("@BUILD_LVMETAD@", "yes") SUBDIRS += libdaemon endif +ifeq ("@VERITYSETUP@", "yes") + SUBDIRS += verity +endif + # FIXME Should use intermediate Makefiles here! ifeq ($(MAKECMDGOALS),distclean) SUBDIRS = doc include man scripts \ libdaemon lib tools daemons libdm \ udev po liblvm test \ - unit-tests/datastruct unit-tests/mm unit-tests/regex + unit-tests/datastruct unit-tests/mm unit-tests/regex verity endif DISTCLEAN_DIRS += lcov_reports* DISTCLEAN_TARGETS += config.cache config.log config.status make.tmpl @@ -53,6 +57,7 @@ lib: libdm libdaemon liblvm: lib daemons: lib libdaemon tools tools: lib libdaemon device-mapper +verity: libdm po: tools daemons lib.device-mapper: include.device-mapper diff --git a/configure b/configure index 274f181c5..8dcfb0fa5 100755 --- a/configure +++ b/configure @@ -10913,7 +10913,7 @@ LVM_LIBAPI=`echo "$VER" | $AWK -F '[()]' '{print $2}'` ################################################################################ -ac_config_files="$ac_config_files Makefile make.tmpl daemons/Makefile daemons/clvmd/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/lvm2/Makefile daemons/dmeventd/plugins/raid/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile daemons/lvmetad/Makefile doc/Makefile doc/example.conf include/.symlinks include/Makefile lib/Makefile lib/format1/Makefile lib/format_pool/Makefile lib/locking/Makefile lib/mirror/Makefile lib/replicator/Makefile lib/misc/lvm-version.h lib/raid/Makefile lib/snapshot/Makefile lib/thin/Makefile libdaemon/Makefile libdaemon/client/Makefile libdaemon/server/Makefile libdm/Makefile libdm/libdevmapper.pc liblvm/Makefile liblvm/liblvm2app.pc man/Makefile po/Makefile scripts/clvmd_init_red_hat scripts/cmirrord_init_red_hat scripts/lvm2_lvmetad_init_red_hat scripts/lvm2_lvmetad_systemd_red_hat.socket scripts/lvm2_lvmetad_systemd_red_hat.service scripts/lvm2_monitoring_init_red_hat scripts/dm_event_systemd_red_hat.service scripts/lvm2_monitoring_systemd_red_hat.service scripts/lvm2_tmpfiles_red_hat.conf scripts/Makefile test/Makefile test/api/Makefile test/unit/Makefile tools/Makefile udev/Makefile unit-tests/datastruct/Makefile unit-tests/regex/Makefile unit-tests/mm/Makefile veritysetup/Makefile" +ac_config_files="$ac_config_files Makefile make.tmpl daemons/Makefile daemons/clvmd/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/lvm2/Makefile daemons/dmeventd/plugins/raid/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile daemons/lvmetad/Makefile doc/Makefile doc/example.conf include/.symlinks include/Makefile lib/Makefile lib/format1/Makefile lib/format_pool/Makefile lib/locking/Makefile lib/mirror/Makefile lib/replicator/Makefile lib/misc/lvm-version.h lib/raid/Makefile lib/snapshot/Makefile lib/thin/Makefile libdaemon/Makefile libdaemon/client/Makefile libdaemon/server/Makefile libdm/Makefile libdm/libdevmapper.pc liblvm/Makefile liblvm/liblvm2app.pc man/Makefile po/Makefile scripts/clvmd_init_red_hat scripts/cmirrord_init_red_hat scripts/lvm2_lvmetad_init_red_hat scripts/lvm2_lvmetad_systemd_red_hat.socket scripts/lvm2_lvmetad_systemd_red_hat.service scripts/lvm2_monitoring_init_red_hat scripts/dm_event_systemd_red_hat.service scripts/lvm2_monitoring_systemd_red_hat.service scripts/lvm2_tmpfiles_red_hat.conf scripts/Makefile test/Makefile test/api/Makefile test/unit/Makefile tools/Makefile udev/Makefile unit-tests/datastruct/Makefile unit-tests/regex/Makefile unit-tests/mm/Makefile verity/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -11657,7 +11657,7 @@ do "unit-tests/datastruct/Makefile") CONFIG_FILES="$CONFIG_FILES unit-tests/datastruct/Makefile" ;; "unit-tests/regex/Makefile") CONFIG_FILES="$CONFIG_FILES unit-tests/regex/Makefile" ;; "unit-tests/mm/Makefile") CONFIG_FILES="$CONFIG_FILES unit-tests/mm/Makefile" ;; - "veritysetup/Makefile") CONFIG_FILES="$CONFIG_FILES veritysetup/Makefile" ;; + "verity/Makefile") CONFIG_FILES="$CONFIG_FILES verity/Makefile" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac diff --git a/configure.in b/configure.in index e7176cb99..32a4886cd 100644 --- a/configure.in +++ b/configure.in @@ -1641,7 +1641,7 @@ udev/Makefile unit-tests/datastruct/Makefile unit-tests/regex/Makefile unit-tests/mm/Makefile -veritysetup/Makefile +verity/Makefile ]) AC_OUTPUT diff --git a/make.tmpl.in b/make.tmpl.in index c729080cc..7643a7a97 100644 --- a/make.tmpl.in +++ b/make.tmpl.in @@ -194,6 +194,7 @@ OBJECTS = $(SOURCES:%.c=%.o) POTFILES = $(SOURCES:%.c=%.pot) .PHONY: all pofile distclean clean cleandir cflow device-mapper +.PHONY: verity install_verity $(SUBDIRS.install_verity) .PHONY: install install_cluster install_device-mapper install_lvm2 .PHONY: install_lib_shared install_dm_plugin install_lvm2_plugin .PHONY: install_ocf @@ -207,6 +208,7 @@ SUBDIRS.install_cluster := $(SUBDIRS:=.install_cluster) SUBDIRS.install_device-mapper := $(SUBDIRS:=.install_device-mapper) SUBDIRS.install_lvm2 := $(SUBDIRS:=.install_lvm2) SUBDIRS.install_ocf := $(SUBDIRS:=.install_ocf) +SUBDIRS.install_verity := $(SUBDIRS:=.install_verity) SUBDIRS.pofile := $(SUBDIRS:=.pofile) SUBDIRS.cflow := $(SUBDIRS:=.cflow) SUBDIRS.clean := $(SUBDIRS:=.clean) diff --git a/veritysetup/Makefile.in b/verity/Makefile.in similarity index 95% rename from veritysetup/Makefile.in rename to verity/Makefile.in index c1ce483d2..b606a40f6 100644 --- a/veritysetup/Makefile.in +++ b/verity/Makefile.in @@ -24,8 +24,10 @@ include $(top_builddir)/make.tmpl VERITYSETUP_LIBS = @VERITYSETUP_LIBS@ +all: veritysetup + veritysetup: $(OBJECTS) $(CC) $(CFLAGS) $(LDFLAGS) -o veritysetup $(OBJECTS) $(VERITYSETUP_LIBS) -install: $(TARGETS) +install_verity: $(TARGETS) $(INSTALL_PROGRAM) -D veritysetup $(sbindir)/veritysetup diff --git a/veritysetup/veritysetup.c b/verity/veritysetup.c similarity index 100% rename from veritysetup/veritysetup.c rename to verity/veritysetup.c