diff options
| author | David Gibson <david@gibson.dropbear.id.au> | 2018-11-23 21:58:42 +1100 |
|---|---|---|
| committer | David Gibson <david@gibson.dropbear.id.au> | 2018-11-23 21:58:42 +1100 |
| commit | f9c0a425b64817ba91563a84d9a7ea9033e3c14f (patch) | |
| tree | c426f71c865c059a0d8d9fa7f47810f6fd6ae6cc | |
| parent | 5182b5e6f28cbe3563ed058988801b90a97b6b70 (diff) | |
| download | device-tree-compiler-f9c0a425b64817ba91563a84d9a7ea9033e3c14f.tar.gz | |
Remove broken objdir / srcdir support
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>
| -rw-r--r-- | Makefile | 26 | ||||
| -rw-r--r-- | libfdt/Makefile.libfdt | 2 | ||||
| -rw-r--r-- | pylibfdt/Makefile.pylibfdt | 12 |
3 files changed, 19 insertions, 21 deletions
@@ -182,23 +182,22 @@ endif # # Rules for libfdt # -LIBFDT_objdir = libfdt -LIBFDT_srcdir = libfdt -LIBFDT_archive = $(LIBFDT_objdir)/libfdt.a -LIBFDT_lib = $(LIBFDT_objdir)/libfdt-$(DTC_VERSION).$(SHAREDLIB_EXT) -LIBFDT_include = $(addprefix $(LIBFDT_srcdir)/,$(LIBFDT_INCLUDES)) -LIBFDT_version = $(addprefix $(LIBFDT_srcdir)/,$(LIBFDT_VERSION)) +LIBFDT_dir = libfdt +LIBFDT_archive = $(LIBFDT_dir)/libfdt.a +LIBFDT_lib = $(LIBFDT_dir)/libfdt-$(DTC_VERSION).$(SHAREDLIB_EXT) +LIBFDT_include = $(addprefix $(LIBFDT_dir)/,$(LIBFDT_INCLUDES)) +LIBFDT_version = $(addprefix $(LIBFDT_dir)/,$(LIBFDT_VERSION)) -include $(LIBFDT_srcdir)/Makefile.libfdt +include $(LIBFDT_dir)/Makefile.libfdt .PHONY: libfdt libfdt: $(LIBFDT_archive) $(LIBFDT_lib) -$(LIBFDT_archive): $(addprefix $(LIBFDT_objdir)/,$(LIBFDT_OBJS)) -$(LIBFDT_lib): $(addprefix $(LIBFDT_objdir)/,$(LIBFDT_OBJS)) +$(LIBFDT_archive): $(addprefix $(LIBFDT_dir)/,$(LIBFDT_OBJS)) +$(LIBFDT_lib): $(addprefix $(LIBFDT_dir)/,$(LIBFDT_OBJS)) ifneq ($(DEPTARGETS),) --include $(LIBFDT_OBJS:%.o=$(LIBFDT_objdir)/%.d) +-include $(LIBFDT_OBJS:%.o=$(LIBFDT_dir)/%.d) endif # This stops make from generating the lex and bison output during @@ -263,13 +262,12 @@ dist: # # Rules for pylibfdt # -PYLIBFDT_srcdir = pylibfdt -PYLIBFDT_objdir = pylibfdt +PYLIBFDT_dir = pylibfdt -include $(PYLIBFDT_srcdir)/Makefile.pylibfdt +include $(PYLIBFDT_dir)/Makefile.pylibfdt .PHONY: pylibfdt -pylibfdt: $(PYLIBFDT_objdir)/_libfdt.so +pylibfdt: $(PYLIBFDT_dir)/_libfdt.so # # Release signing and uploading diff --git a/libfdt/Makefile.libfdt b/libfdt/Makefile.libfdt index 9ec8e2d..3af3656 100644 --- a/libfdt/Makefile.libfdt +++ b/libfdt/Makefile.libfdt @@ -12,4 +12,4 @@ LIBFDT_OBJS = $(LIBFDT_SRCS:%.c=%.o) libfdt_clean: @$(VECHO) CLEAN "(libfdt)" - rm -f $(STD_CLEANFILES:%=$(LIBFDT_objdir)/%) + rm -f $(STD_CLEANFILES:%=$(LIBFDT_dir)/%) diff --git a/pylibfdt/Makefile.pylibfdt b/pylibfdt/Makefile.pylibfdt index 41256fc..3dfe05a 100644 --- a/pylibfdt/Makefile.pylibfdt +++ b/pylibfdt/Makefile.pylibfdt @@ -1,14 +1,14 @@ # Makefile.pylibfdt # -PYLIBFDT_srcs = $(PYLIBFDT_srcdir)/libfdt.i -PYMODULE = $(PYLIBFDT_objdir)/_libfdt.so +PYLIBFDT_srcs = $(PYLIBFDT_dir)/libfdt.i +PYMODULE = $(PYLIBFDT_dir)/_libfdt.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 = $(PYLIBFDT_CLEANDIRS_L:%=$(PYLIBFDT_objdir)/%) +PYLIBFDT_CLEANDIRS = $(PYLIBFDT_CLEANDIRS_L:%=$(PYLIBFDT_dir)/%) -SETUP = $(PYLIBFDT_srcdir)/setup.py +SETUP = $(PYLIBFDT_dir)/setup.py SETUPFLAGS = ifndef V @@ -17,7 +17,7 @@ endif $(PYMODULE): $(PYLIBFDT_srcs) $(LIBFDT_archive) $(SETUP) $(VERSION_FILE) @$(VECHO) PYMOD $@ - $(PYTHON) $(SETUP) $(SETUPFLAGS) build_ext --build-lib=../$(PYLIBFDT_objdir) + $(PYTHON) $(SETUP) $(SETUPFLAGS) build_ext --build-lib=../$(PYLIBFDT_dir) install_pylibfdt: $(PYMODULE) @$(VECHO) INSTALL-PYLIB |