From 9d224ca71a918409be0a7dfda3862d27be021407 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Tue, 23 Jan 2024 11:54:31 +0000 Subject: [PATCH] Move the internal headers into src They're never going to be installed, and moving them here makes adding a test-suite (and porting to meson) easier. Signed-off-by: Richard Hughes --- src/Android.mk | 2 +- src/Makefile | 3 --- src/{include => }/efi.h | 0 src/{include => }/efibootmgr.h | 0 src/{include => }/list.h | 0 src/{include => }/parse_loader_data.h | 0 6 files changed, 1 insertion(+), 4 deletions(-) rename src/{include => }/efi.h (100%) rename src/{include => }/efibootmgr.h (100%) rename src/{include => }/list.h (100%) rename src/{include => }/parse_loader_data.h (100%) diff --git a/src/Android.mk b/src/Android.mk index 8e1261e..32adbd1 100644 --- a/src/Android.mk +++ b/src/Android.mk @@ -15,7 +15,7 @@ include $(CLEAR_VARS) include $(LOCAL_PATH)/../Make.version LOCAL_MODULE := efibootmgr -LOCAL_C_INCLUDES := $(LOCAL_PATH)/include +LOCAL_C_INCLUDES := $(LOCAL_PATH) LOCAL_STATIC_LIBRARIES := libefivar LOCAL_MODULE_PATH := $(TARGET_INSTALLER_OUT)/sbin diff --git a/src/Makefile b/src/Makefile index 683f220..2f1bec4 100644 --- a/src/Makefile +++ b/src/Makefile @@ -5,8 +5,6 @@ include $(TOPDIR)/Make.version include $(TOPDIR)/Make.rules include $(TOPDIR)/Make.defaults -SUBDIR_CFLAGS = -I$(SRCDIR)/include - BINTARGETS=efibootmgr efibootdump TARGETS=$(BINTARGETS) efibootmgr.8 efibootdump.8 @@ -35,7 +33,6 @@ deps : PKGS=efivar efiboot popt deps : $(ALL_SOURCES) $(MAKE) -f $(TOPDIR)/Make.deps \ SOURCES="$(ALL_SOURCES)" \ - SUBDIR_CFLAGS="$(SUBDIR_CFLAGS)" \ PKGS="$(PKGS)" \ deps diff --git a/src/include/efi.h b/src/efi.h similarity index 100% rename from src/include/efi.h rename to src/efi.h diff --git a/src/include/efibootmgr.h b/src/efibootmgr.h similarity index 100% rename from src/include/efibootmgr.h rename to src/efibootmgr.h diff --git a/src/include/list.h b/src/list.h similarity index 100% rename from src/include/list.h rename to src/list.h diff --git a/src/include/parse_loader_data.h b/src/parse_loader_data.h similarity index 100% rename from src/include/parse_loader_data.h rename to src/parse_loader_data.h