From 90f603e2be40d996c421ae8e95464e38911eabaf Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 21 Jun 2014 07:41:41 +0200 Subject: s/TOPDIR/ADK_TOPDIR/ to avoid namespace collisions in some packages, rename TOPDIR. Sorry you need to make cleandir && make prereq && make --- toolchain/Makefile | 2 +- toolchain/binutils/Makefile | 8 ++++---- toolchain/gcc/Makefile | 8 ++++---- toolchain/gdb/Makefile | 6 +++--- toolchain/glibc/Makefile | 6 +++--- toolchain/gmp/Makefile | 6 +++--- toolchain/kernel-headers/Makefile | 22 +++++++++++----------- toolchain/libelf/Makefile | 6 +++--- toolchain/mpc/Makefile | 6 +++--- toolchain/mpfr/Makefile | 6 +++--- toolchain/musl/Makefile | 6 +++--- toolchain/uclibc/Makefile | 8 ++++---- 12 files changed, 45 insertions(+), 45 deletions(-) (limited to 'toolchain') diff --git a/toolchain/Makefile b/toolchain/Makefile index 6f672532e..fc35830db 100644 --- a/toolchain/Makefile +++ b/toolchain/Makefile @@ -13,7 +13,7 @@ # 9) rebuild and install full libc (in case of musl/uclibc) # 10) build and install gdb debugger -include $(TOPDIR)/rules.mk +include $(ADK_TOPDIR)/rules.mk TARGETS:=binutils gmp mpfr mpc libelf gcc gdb ifeq ($(ADK_TARGET_LIB_GLIBC),y) diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile index 9edf001cd..b6d4489f9 100644 --- a/toolchain/binutils/Makefile +++ b/toolchain/binutils/Makefile @@ -1,10 +1,10 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -include $(TOPDIR)/rules.mk +include $(ADK_TOPDIR)/rules.mk include Makefile.inc include ../rules.mk -include ${TOPDIR}/mk/buildhlp.mk +include ${ADK_TOPDIR}/mk/buildhlp.mk ifeq ($(ADK_TOOLCHAIN_WITH_SSP),y) CONFOPTS+= --enable-libssp @@ -41,7 +41,7 @@ endif $(WRKBUILD)/.headers: $(WRKBUILD)/.configured: ifeq ($(ADK_LINUX_XTENSA),y) - tar xf $(TOPDIR)/target/xtensa/overlay/xtensa_dc232b.tar \ + tar xf $(ADK_TOPDIR)/target/xtensa/overlay/xtensa_dc232b.tar \ --strip-components=1 -C $(WRKSRC) binutils endif (cd $(WRKBUILD); \ @@ -66,4 +66,4 @@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled $(MAKE) -C $(WRKBUILD) install touch $@ -include ${TOPDIR}/mk/toolchain.mk +include ${ADK_TOPDIR}/mk/toolchain.mk diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index 5c1f14c0b..c6f57f413 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -1,7 +1,7 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -include $(TOPDIR)/rules.mk +include $(ADK_TOPDIR)/rules.mk include ../rules.mk include Makefile.inc @@ -128,7 +128,7 @@ endif LANGUAGES:=c,c++ -include ${TOPDIR}/mk/buildhlp.mk +include ${ADK_TOPDIR}/mk/buildhlp.mk GCC_BUILD_DIR_MINIMAL:= $(WRKBUILD)-minimal GCC_BUILD_DIR_INITIAL:= $(WRKBUILD)-initial @@ -136,7 +136,7 @@ GCC_BUILD_DIR_FINAL:= $(WRKBUILD)-final $(GCC_BUILD_DIR_MINIMAL)/.configured: ifeq ($(ADK_LINUX_XTENSA),y) - tar xf $(TOPDIR)/target/xtensa/overlay/xtensa_dc232b.tar \ + tar xf $(ADK_TOPDIR)/target/xtensa/overlay/xtensa_dc232b.tar \ --strip-components=1 -C $(WRKSRC) gcc endif mkdir -p $(GCC_BUILD_DIR_MINIMAL) @@ -241,4 +241,4 @@ endif rm -rf $(TOOLCHAIN_DIR)/usr/share touch $@ -include ${TOPDIR}/mk/toolchain.mk +include ${ADK_TOPDIR}/mk/toolchain.mk diff --git a/toolchain/gdb/Makefile b/toolchain/gdb/Makefile index d83b7def9..b291c48a2 100644 --- a/toolchain/gdb/Makefile +++ b/toolchain/gdb/Makefile @@ -1,10 +1,10 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -include $(TOPDIR)/rules.mk +include $(ADK_TOPDIR)/rules.mk include ../rules.mk include Makefile.inc -include ${TOPDIR}/mk/buildhlp.mk +include ${ADK_TOPDIR}/mk/buildhlp.mk ifeq (${ADK_MAKE_PARALLEL},y) GDB_MAKEOPTS+= -j${ADK_MAKE_JOBS} @@ -45,4 +45,4 @@ $(WRKBUILD)/.installed: $(INSTALL_BIN) $(WRKBUILD)/gdb/gdb $(TARGET_CROSS)gdb touch $@ -include ${TOPDIR}/mk/toolchain.mk +include ${ADK_TOPDIR}/mk/toolchain.mk diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile index ef7b6e15d..f010386e1 100644 --- a/toolchain/glibc/Makefile +++ b/toolchain/glibc/Makefile @@ -1,7 +1,7 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -include $(TOPDIR)/rules.mk +include $(ADK_TOPDIR)/rules.mk include ../rules.mk # glibc does not compile with Os @@ -11,7 +11,7 @@ TARGET_CFLAGS+= -O2 endif include Makefile.inc -include ${TOPDIR}/mk/buildhlp.mk +include ${ADK_TOPDIR}/mk/buildhlp.mk GLIBC_MAKEOPTS+= cross-compiling=yes ifeq (${ADK_MAKE_PARALLEL},y) @@ -75,4 +75,4 @@ ifeq ($(ADK_TARGET_TOOLCHAIN),y) endif touch $@ -include ${TOPDIR}/mk/toolchain.mk +include ${ADK_TOPDIR}/mk/toolchain.mk diff --git a/toolchain/gmp/Makefile b/toolchain/gmp/Makefile index 3e6e6c626..a8ec71088 100644 --- a/toolchain/gmp/Makefile +++ b/toolchain/gmp/Makefile @@ -1,10 +1,10 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -include $(TOPDIR)/rules.mk +include $(ADK_TOPDIR)/rules.mk include Makefile.inc include ../rules.mk -include ${TOPDIR}/mk/buildhlp.mk +include ${ADK_TOPDIR}/mk/buildhlp.mk ifeq (${ADK_MAKE_PARALLEL},y) GMP_MAKEOPTS+= -j${ADK_MAKE_JOBS} @@ -33,4 +33,4 @@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled $(MAKE) -C $(WRKBUILD) install touch $@ -include ${TOPDIR}/mk/toolchain.mk +include ${ADK_TOPDIR}/mk/toolchain.mk diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile index 0534976fa..0af7347b4 100644 --- a/toolchain/kernel-headers/Makefile +++ b/toolchain/kernel-headers/Makefile @@ -1,38 +1,38 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -include $(TOPDIR)/rules.mk +include $(ADK_TOPDIR)/rules.mk include ../rules.mk -include ${TOPDIR}/mk/kernel-ver.mk -include $(TOPDIR)/mk/linux.mk -include ${TOPDIR}/mk/kernel-vars.mk -include ${TOPDIR}/mk/buildhlp.mk +include ${ADK_TOPDIR}/mk/kernel-ver.mk +include $(ADK_TOPDIR)/mk/linux.mk +include ${ADK_TOPDIR}/mk/kernel-vars.mk +include ${ADK_TOPDIR}/mk/buildhlp.mk $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION)/.patched: ifneq ($(ADK_DISABLE_KERNEL_PATCHES),y) $(TRACE) kernel-patch $(PATCH) $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION) \ - $(TOPDIR)/target/linux/patches/$(KERNEL_VERSION) *.patch $(MAKE_TRACE) + $(ADK_TOPDIR)/target/linux/patches/$(KERNEL_VERSION) *.patch $(MAKE_TRACE) endif ifneq ($(ADK_DISABLE_TARGET_KERNEL_PATCHES),y) $(TRACE) kernel-target-patch $(PATCH) $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION) \ - $(TOPDIR)/target/$(ADK_TARGET_ARCH)/$(ADK_TARGET_SYSTEM)/patches/$(KERNEL_VERSION) *.patch $(MAKE_TRACE) + $(ADK_TOPDIR)/target/$(ADK_TARGET_ARCH)/$(ADK_TARGET_SYSTEM)/patches/$(KERNEL_VERSION) *.patch $(MAKE_TRACE) endif ifeq ($(ADK_KERNEL_ADDON_YAFFS2),y) $(TRACE) yaffs2-kernel-patch $(PATCH) $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION) \ - $(TOPDIR)/target/linux/patches/$(KERNEL_VERSION) patch-yaffs2 $(MAKE_TRACE) + $(ADK_TOPDIR)/target/linux/patches/$(KERNEL_VERSION) patch-yaffs2 $(MAKE_TRACE) endif ifeq ($(ADK_KERNEL_ADDON_GRSEC),y) $(TRACE) grsec-kernel-patch $(PATCH) $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION) \ - $(TOPDIR)/target/linux/patches/$(KERNEL_VERSION) patch-grsec $(MAKE_TRACE) + $(ADK_TOPDIR)/target/linux/patches/$(KERNEL_VERSION) patch-grsec $(MAKE_TRACE) endif ifeq ($(ADK_KERNEL_ADDON_MPTCP),y) $(TRACE) mptcp-kernel-patch $(PATCH) $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/linux-$(KERNEL_VERSION) \ - $(TOPDIR)/target/linux/patches/$(KERNEL_VERSION) patch-mptcp $(MAKE_TRACE) + $(ADK_TOPDIR)/target/linux/patches/$(KERNEL_VERSION) patch-mptcp $(MAKE_TRACE) endif touch $@ @@ -45,4 +45,4 @@ $(WRKBUILD)/.headers: $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_ @-find $(STAGING_TARGET_DIR)/usr/include -name ..install.cmd -delete touch $@ -include ${TOPDIR}/mk/toolchain.mk +include ${ADK_TOPDIR}/mk/toolchain.mk diff --git a/toolchain/libelf/Makefile b/toolchain/libelf/Makefile index 90bf4cb8d..dbb0b9fb8 100644 --- a/toolchain/libelf/Makefile +++ b/toolchain/libelf/Makefile @@ -1,10 +1,10 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -include $(TOPDIR)/rules.mk +include $(ADK_TOPDIR)/rules.mk include Makefile.inc include ../rules.mk -include ${TOPDIR}/mk/buildhlp.mk +include ${ADK_TOPDIR}/mk/buildhlp.mk ifeq (${ADK_MAKE_PARALLEL},y) LIBELF_MAKEOPTS+= -j${ADK_MAKE_JOBS} @@ -29,4 +29,4 @@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled $(MAKE) -C $(WRKBUILD) install touch $@ -include ${TOPDIR}/mk/toolchain.mk +include ${ADK_TOPDIR}/mk/toolchain.mk diff --git a/toolchain/mpc/Makefile b/toolchain/mpc/Makefile index 40e7f615e..fbc6a3a7e 100644 --- a/toolchain/mpc/Makefile +++ b/toolchain/mpc/Makefile @@ -1,10 +1,10 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -include $(TOPDIR)/rules.mk +include $(ADK_TOPDIR)/rules.mk include Makefile.inc include ../rules.mk -include ${TOPDIR}/mk/buildhlp.mk +include ${ADK_TOPDIR}/mk/buildhlp.mk ifeq (${ADK_MAKE_PARALLEL},y) MPC_MAKEOPTS+= -j${ADK_MAKE_JOBS} @@ -29,4 +29,4 @@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled $(MAKE) -C $(WRKBUILD) install touch $@ -include ${TOPDIR}/mk/toolchain.mk +include ${ADK_TOPDIR}/mk/toolchain.mk diff --git a/toolchain/mpfr/Makefile b/toolchain/mpfr/Makefile index 4436d4fcc..17296503d 100644 --- a/toolchain/mpfr/Makefile +++ b/toolchain/mpfr/Makefile @@ -1,10 +1,10 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -include $(TOPDIR)/rules.mk +include $(ADK_TOPDIR)/rules.mk include ../rules.mk include Makefile.inc -include ${TOPDIR}/mk/buildhlp.mk +include ${ADK_TOPDIR}/mk/buildhlp.mk ifeq (${ADK_MAKE_PARALLEL},y) MPFR_MAKEOPTS+= -j${ADK_MAKE_JOBS} @@ -29,4 +29,4 @@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled $(MAKE) -C $(WRKBUILD) install touch $@ -include ${TOPDIR}/mk/toolchain.mk +include ${ADK_TOPDIR}/mk/toolchain.mk diff --git a/toolchain/musl/Makefile b/toolchain/musl/Makefile index 1e916fee4..8c25564cc 100644 --- a/toolchain/musl/Makefile +++ b/toolchain/musl/Makefile @@ -1,10 +1,10 @@ # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. -include $(TOPDIR)/rules.mk +include $(ADK_TOPDIR)/rules.mk include ../rules.mk include Makefile.inc -include ${TOPDIR}/mk/buildhlp.mk +include ${ADK_TOPDIR}/mk/buildhlp.mk ifeq ($(ADK_TARGET_CPU_ARCH),ppc) GNU_TARGET_NAME:= $(subst ppc,powerpc,$(GNU_TARGET_NAME)) @@ -61,4 +61,4 @@ ifeq ($(ADK_TARGET_TOOLCHAIN),y) endif touch $@ -include ${TOPDIR}/mk/toolchain.mk +include ${ADK_TOPDIR}/mk/toolchain.mk diff --git a/toolchain/uclibc/Makefile b/toolchain/uclibc/Makefile index 49050e980..744b1da8f 100644 --- a/toolchain/uclibc/Makefile +++ b/toolchain/uclibc/Makefile @@ -3,10 +3,10 @@ _IN_CVTC= 1 -include $(TOPDIR)/rules.mk +include $(ADK_TOPDIR)/rules.mk include ../rules.mk include Makefile.inc -include ${TOPDIR}/mk/buildhlp.mk +include ${ADK_TOPDIR}/mk/buildhlp.mk TARGET_CFLAGS:=$(filter-out -flto,$(TARGET_CFLAGS)) TARGET_CFLAGS:=$(filter-out -mtext-section-literals,$(TARGET_CFLAGS)) @@ -18,7 +18,7 @@ endif $(WRKBUILD)/.headers: $(SED) 's,^CROSS_COMPILE=.*,CROSS_COMPILE=$(TARGET_CROSS),g' $(WRKBUILD)/Rules.mak sed -e 's^KERNEL_HEADERS.*$$KERNEL_HEADERS=\"${STAGING_TARGET_DIR}/usr/include\"' \ - $(TOPDIR)/target/$(ADK_TARGET_ARCH)/uclibc.config >${WRKBUILD}/.config + $(ADK_TOPDIR)/target/$(ADK_TARGET_ARCH)/uclibc.config >${WRKBUILD}/.config ifeq ($(ADK_TARGET_ENDIAN),little) $(SED) 's/.*\(ARCH_LITTLE_ENDIAN\).*/\1=y/' ${WRKBUILD}/.config $(SED) 's/.*\(ARCH_WANTS_LITTLE_ENDIAN\).*/\1=y/' ${WRKBUILD}/.config @@ -122,4 +122,4 @@ ifeq ($(ADK_TARGET_TOOLCHAIN),y) endif touch $@ -include ${TOPDIR}/mk/toolchain.mk +include ${ADK_TOPDIR}/mk/toolchain.mk -- cgit v1.2.3