mirrors/gnu-efi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make: make TOPDIR actually work and get rid of unused CDIR

Browse Source 
Signed-off-by: Richard Hughes <richard@hughsie.com>
Signed-off-by: Peter Jones <pjones@redhat.com>
This commit is contained in:
Peter Jones 2024-03-18 13:30:16 +00:00 committed by Nigel Croxon
parent 95dbde278c
commit 31913f8489
5 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Make.defaults
View File

@ -34,7 +34,7 @@
# SUCH DAMAGE. # SUCH DAMAGE.
# #
TOPDIR := $(shell if [ "$$PWD" != "" ]; then echo $$PWD; else pwd; fi) TOPDIR ?= $(shell if [ "$$PWD" != "" ]; then echo $$PWD; else pwd; fi)
# #
# Variables below overridable from command-line: # Variables below overridable from command-line:

4
apps/Makefile
View File

@ -37,12 +37,10 @@
SRCDIR = . SRCDIR = .
VPATH = $(SRCDIR) VPATH = $(SRCDIR)
TOPDIR = $(SRCDIR)/..
include $(SRCDIR)/../Make.defaults include $(SRCDIR)/../Make.defaults
TOPDIR = $(SRCDIR)/..
CDIR=$(TOPDIR)/..
LINUX_HEADERS = /usr/src/sys/build LINUX_HEADERS = /usr/src/sys/build
APPSDIR = $(LIBDIR)/gnuefi/apps APPSDIR = $(LIBDIR)/gnuefi/apps
CPPFLAGS += -D__KERNEL__ -I$(LINUX_HEADERS)/include CPPFLAGS += -D__KERNEL__ -I$(LINUX_HEADERS)/include

4
gnuefi/Makefile
View File

@ -37,12 +37,10 @@
SRCDIR = . SRCDIR = .
VPATH = $(SRCDIR) VPATH = $(SRCDIR)
TOPDIR = $(SRCDIR)/..
include $(SRCDIR)/../Make.defaults include $(SRCDIR)/../Make.defaults
TOPDIR = $(SRCDIR)/..
CDIR=$(TOPDIR)/..
PKGCONFIGDIR ?= $(LIBDIR)/pkgconfig PKGCONFIGDIR ?= $(LIBDIR)/pkgconfig
FILES = reloc_$(ARCH) FILES = reloc_$(ARCH)

5
inc/Makefile
View File

@ -1,12 +1,9 @@
SRCDIR = . SRCDIR = .
VPATH = $(SRCDIR) VPATH = $(SRCDIR)
include $(SRCDIR)/../Make.defaults
TOPDIR = $(SRCDIR)/.. TOPDIR = $(SRCDIR)/..
CDIR=$(TOPDIR)/.. include $(SRCDIR)/../Make.defaults
all: all:

4
lib/Makefile
View File

@ -37,12 +37,10 @@
SRCDIR = . SRCDIR = .
VPATH = $(SRCDIR) VPATH = $(SRCDIR)
TOPDIR = $(SRCDIR)/..
include $(SRCDIR)/../Make.defaults include $(SRCDIR)/../Make.defaults
TOPDIR = $(SRCDIR)/..
CDIR = $(TOPDIR)/..
FILES = boxdraw smbios console crc data debug dpath \ FILES = boxdraw smbios console crc data debug dpath \
entry error event exit guid hand hw init lock \ entry error event exit guid hand hw init lock \
misc pause print sread str cmdline\ misc pause print sread str cmdline\