@@ -44,7 +44,7 @@ CFLAGS ?= -O2 -Wall -Wundef \
$(call cc-option,-Wunused-parameter) \
$(call cc-option,-Wvla)
-override CPPFLAGS := -D_FILE_OFFSET_BITS=64 $(CPPFLAGS)
+override CPPFLAGS := -Iinclude -D_FILE_OFFSET_BITS=64 $(CPPFLAGS)
ifneq ($(V),1)
QUIET_CC = @echo ' CC ' $@;
@@ -182,7 +182,7 @@ install:all
install -m644 libfsverity.a $(DESTDIR)$(LIBDIR)
install -m755 libfsverity.so.$(SOVERSION) $(DESTDIR)$(LIBDIR)
ln -sf libfsverity.so.$(SOVERSION) $(DESTDIR)$(LIBDIR)/libfsverity.so
- install -m644 common/libfsverity.h $(DESTDIR)$(INCDIR)
+ install -m644 include/libfsverity.h $(DESTDIR)$(INCDIR)
uninstall:
rm -f $(DESTDIR)$(BINDIR)/fsverity
similarity index 100%
rename from common/libfsverity.h
rename to include/libfsverity.h
@@ -11,7 +11,7 @@
#ifndef LIB_LIB_PRIVATE_H
#define LIB_LIB_PRIVATE_H
-#include "../common/libfsverity.h"
+#include "libfsverity.h"
#include "../common/common_defs.h"
#include "../common/fsverity_uapi.h"
@@ -11,7 +11,7 @@
#ifndef PROGRAMS_UTILS_H
#define PROGRAMS_UTILS_H
-#include "../common/libfsverity.h"
+#include "libfsverity.h"
#include "../common/common_defs.h"
#include <stdio.h>
@@ -27,7 +27,7 @@ major=$(echo "$VERS" | cut -d. -f1)
minor=$(echo "$VERS" | cut -d. -f2)
sed -E -i -e "/FSVERITY_UTILS_MAJOR_VERSION/s/[0-9]+/$major/" \
-e "/FSVERITY_UTILS_MINOR_VERSION/s/[0-9]+/$minor/" \
- common/libfsverity.h
+ include/libfsverity.h
git commit -a --signoff --message="v$VERS"
git tag --sign "v$VERS" --message="$PKG"
@@ -10,5 +10,5 @@ set -e -u -o pipefail
find . -name '*.c' | while read -r file; do
sparse "$file" -gcc-base-dir "$(gcc --print-file-name=)" \
- -D_FILE_OFFSET_BITS=64 -I. -Wbitwise
+ -D_FILE_OFFSET_BITS=64 -Iinclude -Wbitwise
done
@@ -71,7 +71,7 @@ int main()
std::cout << libfsverity_get_digest_size(FS_VERITY_HASH_ALG_SHA256) << std::endl;
}
EOF
-c++ -Wall -Werror "$TMPDIR/test.cc" -Icommon -L. -lfsverity -o "$TMPDIR/test"
+c++ -Wall -Werror "$TMPDIR/test.cc" -Iinclude -L. -lfsverity -o "$TMPDIR/test"
[ "$(LD_LIBRARY_PATH=. "$TMPDIR/test")" = "32" ]
rm "${TMPDIR:?}"/*