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 <[email protected]>
rhboot · Jan 23, 2024 · 9d224ca · 9d224ca
1 parent 4a8d9c6
commit 9d224ca
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 4 deletions.
diff --git 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
@@ -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 → src/efi.h b/src/include/efi.h → src/efi.h
diff --git a/src/include/efibootmgr.h → src/efibootmgr.h b/src/include/efibootmgr.h → src/efibootmgr.h
diff --git a/src/include/list.h → src/list.h b/src/include/list.h → src/list.h
diff --git a/src/include/parse_loader_data.h → src/parse_loader_data.h b/src/include/parse_loader_data.h → src/parse_loader_data.h