Rework for the post-jose-v8 world

npmccallum · Jun 14, 2017 · 6b3290b · 6b3290b
1 parent 283b321
commit 6b3290b
Show file tree

Hide file tree

Showing 46 changed files with 1,645 additions and 2,654 deletions.
diff --git a/.gitignore b/.gitignore
@@ -31,18 +31,13 @@ depcomp
 install-sh
 libtool
 ltmain.sh
+Makecache
 Makefile.in
 Makefile
 missing
-clevis
-cmd/encrypt
-cmd/decrypt
-cmd/pins/http
-cmd/pins/sss
-cmd/pins/tang
-cmd/pins/test
 tags
 test-driver
-dracut/module-setup.sh
-udisks2/clevis-luks-udisks2
-udisks2/clevis-luks-udisks2.desktop
+src/clevis-encrypt-sss
+src/clevis-decrypt-sss
+src/udisks2/clevis-luks-udisks2
+src/udisks2/clevis-luks-udisks2.desktop
diff --git a/Makefile.am b/Makefile.am
@@ -1,8 +1,3 @@
 DISTCHECK_CONFIGURE_FLAGS = --with-dracutmodulesdir=$$dc_install_base/$(dracutmodulesdir)
-SUBDIRS = . cmd dracut udisks2 tests
-
-AM_CFLAGS = @CLEVIS_CFLAGS@ -DCLEVIS_CMD_DIR=$(libexecdir)/$(PACKAGE_NAME)
-
+SUBDIRS = . src tests
 EXTRA_DIST = COPYING
-
-bin_PROGRAMS = clevis
diff --git a/clevis.c b/clevis.c
diff --git a/cmd/Makefile.am b/cmd/Makefile.am
diff --git a/cmd/bind-luks b/cmd/bind-luks
diff --git a/cmd/decrypt.c b/cmd/decrypt.c
diff --git a/cmd/encrypt.c b/cmd/encrypt.c
diff --git a/cmd/pins/Makefile.am b/cmd/pins/Makefile.am