Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove SQL-FS #86

Merged
merged 1 commit into from
Apr 27, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 1 addition & 31 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,8 @@ BINDIR ?= /bin
LIBDIR ?= /lib
INCLUDEDIR ?= /include

CFG_SQL_FS ?= n
CFG_TA_GPROF_SUPPORT ?= n

ifeq ($(CFG_SQL_FS),y)
BUILD-LIBSQLFS = build-libsqlfs
endif

.PHONY: all build build-libteec install copy_export \
clean cscope clean-cscope \
checkpatch-pre-req checkpatch-modified-patch checkpatch-modified-file \
Expand All @@ -36,7 +31,7 @@ build-libteec:
@echo "Building libteec.so"
@$(MAKE) --directory=libteec --no-print-directory --no-builtin-variables

build-tee-supplicant: build-libteec $(BUILD-LIBSQLFS)
build-tee-supplicant: build-libteec
@echo "Building tee-supplicant"
$(MAKE) --directory=tee-supplicant --no-print-directory --no-builtin-variables

Expand Down Expand Up @@ -129,30 +124,5 @@ distclean: clean
copy_export: build
mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(INCLUDEDIR)
cp ${O}/libteec/libteec.so* $(DESTDIR)$(LIBDIR)
if [ "$(BUILD-LIBSQLFS)" ]; then cp ${O}/libsqlfs/libsqlfs.so* $(DESTDIR)$(LIBDIR); fi
cp ${O}/tee-supplicant/tee-supplicant $(DESTDIR)$(BINDIR)
cp public/*.h $(DESTDIR)$(INCLUDEDIR)

ifeq ($(CFG_SQL_FS),y)

.PHONY: build-libsqlite3 build-libsqlfs

build: build-libsqlite3 build-libsqlfs

clean: clean-libsqlite3 clean-libsqlfs

build-libsqlite3:
@echo "Building in libsqlite3"
@$(MAKE) --directory=libsqlite3 --no-print-directory --no-builtin-variables

clean-libsqlite3:
@$(MAKE) --directory=libsqlite3 --no-print-directory clean

build-libsqlfs: build-libsqlite3
@echo "Building in libsqlfs"
@$(MAKE) --directory=libsqlfs --no-print-directory --no-builtin-variables

clean-libsqlfs:
@$(MAKE) --directory=libsqlfs --no-print-directory clean

endif
506 changes: 0 additions & 506 deletions libsqlfs/COPYING

This file was deleted.

65 changes: 0 additions & 65 deletions libsqlfs/Makefile

This file was deleted.

141 changes: 0 additions & 141 deletions libsqlfs/include/sqlfs.h

This file was deleted.

Loading