len0rd/dtc
1
0
Fork 0
mirror of https://github.com/dgibson/dtc.git synced 2025-10-13 16:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove broken objdir / srcdir support

Browse source 
The dtc makefiles have support for building into a separate directory from
the sources... except that it's broken and probably always has been.

Remove the pretense.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
David Gibson 2018-11-23 21:58:42 +11:00
parent 5182b5e6f2
commit f9c0a425b6
3 changed files with 19 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Makefile
View file

@ -182,23 +182,22 @@ endif
# #
# Rules for libfdt # Rules for libfdt
# #
LIBFDT_objdir = libfdt LIBFDT_dir = libfdt
LIBFDT_srcdir = libfdt LIBFDT_archive = $(LIBFDT_dir)/libfdt.a
LIBFDT_archive = $(LIBFDT_objdir)/libfdt.a LIBFDT_lib = $(LIBFDT_dir)/libfdt-$(DTC_VERSION).$(SHAREDLIB_EXT)
LIBFDT_lib = $(LIBFDT_objdir)/libfdt-$(DTC_VERSION).$(SHAREDLIB_EXT) LIBFDT_include = $(addprefix $(LIBFDT_dir)/,$(LIBFDT_INCLUDES))
LIBFDT_include = $(addprefix $(LIBFDT_srcdir)/,$(LIBFDT_INCLUDES)) LIBFDT_version = $(addprefix $(LIBFDT_dir)/,$(LIBFDT_VERSION))
LIBFDT_version = $(addprefix $(LIBFDT_srcdir)/,$(LIBFDT_VERSION))
include $(LIBFDT_srcdir)/Makefile.libfdt include $(LIBFDT_dir)/Makefile.libfdt
.PHONY: libfdt .PHONY: libfdt
libfdt: $(LIBFDT_archive) $(LIBFDT_lib) libfdt: $(LIBFDT_archive) $(LIBFDT_lib)
$(LIBFDT_archive): $(addprefix $(LIBFDT_objdir)/,$(LIBFDT_OBJS)) $(LIBFDT_archive): $(addprefix $(LIBFDT_dir)/,$(LIBFDT_OBJS))
$(LIBFDT_lib): $(addprefix $(LIBFDT_objdir)/,$(LIBFDT_OBJS)) $(LIBFDT_lib): $(addprefix $(LIBFDT_dir)/,$(LIBFDT_OBJS))
ifneq ($(DEPTARGETS),) ifneq ($(DEPTARGETS),)
-include $(LIBFDT_OBJS:%.o=$(LIBFDT_objdir)/%.d) -include $(LIBFDT_OBJS:%.o=$(LIBFDT_dir)/%.d)
endif endif
# This stops make from generating the lex and bison output during # This stops make from generating the lex and bison output during
@ -263,13 +262,12 @@ dist:
# #
# Rules for pylibfdt # Rules for pylibfdt
# #
PYLIBFDT_srcdir = pylibfdt PYLIBFDT_dir = pylibfdt
PYLIBFDT_objdir = pylibfdt
include $(PYLIBFDT_srcdir)/Makefile.pylibfdt include $(PYLIBFDT_dir)/Makefile.pylibfdt
.PHONY: pylibfdt .PHONY: pylibfdt
pylibfdt: $(PYLIBFDT_objdir)/_libfdt.so pylibfdt: $(PYLIBFDT_dir)/_libfdt.so
# #
# Release signing and uploading # Release signing and uploading

2
libfdt/Makefile.libfdt
View file

@ -12,4 +12,4 @@ LIBFDT_OBJS = $(LIBFDT_SRCS:%.c=%.o)
libfdt_clean: libfdt_clean:
@$(VECHO) CLEAN "(libfdt)" @$(VECHO) CLEAN "(libfdt)"
rm -f $(STD_CLEANFILES:%=$(LIBFDT_objdir)/%) rm -f $(STD_CLEANFILES:%=$(LIBFDT_dir)/%)

12
pylibfdt/Makefile.pylibfdt
View file

@ -1,14 +1,14 @@
# Makefile.pylibfdt # Makefile.pylibfdt
# #
PYLIBFDT_srcs = $(PYLIBFDT_srcdir)/libfdt.i PYLIBFDT_srcs = $(PYLIBFDT_dir)/libfdt.i
PYMODULE = $(PYLIBFDT_objdir)/_libfdt.so PYMODULE = $(PYLIBFDT_dir)/_libfdt.so
PYLIBFDT_CLEANFILES_L = libfdt_wrap.c libfdt.py *.pyc *.so PYLIBFDT_CLEANFILES_L = libfdt_wrap.c libfdt.py *.pyc *.so
PYLIBFDT_CLEANFILES = $(PYLIBFDT_CLEANFILES_L:%=$(PYLIBFDT_objdir)/%) PYLIBFDT_CLEANFILES = $(PYLIBFDT_CLEANFILES_L:%=$(PYLIBFDT_dir)/%)
PYLIBFDT_CLEANDIRS_L = build __pycache__ PYLIBFDT_CLEANDIRS_L = build __pycache__
PYLIBFDT_CLEANDIRS = $(PYLIBFDT_CLEANDIRS_L:%=$(PYLIBFDT_objdir)/%) PYLIBFDT_CLEANDIRS = $(PYLIBFDT_CLEANDIRS_L:%=$(PYLIBFDT_dir)/%)
SETUP = $(PYLIBFDT_srcdir)/setup.py SETUP = $(PYLIBFDT_dir)/setup.py
SETUPFLAGS = SETUPFLAGS =
ifndef V ifndef V
@ -17,7 +17,7 @@ endif
$(PYMODULE): $(PYLIBFDT_srcs) $(LIBFDT_archive) $(SETUP) $(VERSION_FILE) $(PYMODULE): $(PYLIBFDT_srcs) $(LIBFDT_archive) $(SETUP) $(VERSION_FILE)
@$(VECHO) PYMOD $@ @$(VECHO) PYMOD $@
$(PYTHON) $(SETUP) $(SETUPFLAGS) build_ext --build-lib=../$(PYLIBFDT_objdir) $(PYTHON) $(SETUP) $(SETUPFLAGS) build_ext --build-lib=../$(PYLIBFDT_dir)
install_pylibfdt: $(PYMODULE) install_pylibfdt: $(PYMODULE)
@$(VECHO) INSTALL-PYLIB @$(VECHO) INSTALL-PYLIB