implement the concept of target choice by embedded system or architecture

you can now choose between specific embedded systems like PC Engines
ALIX boards, Foxboard, .. or between generic architecture support like
x86, x86_64, mips, ...
This does reduce the overhead of duplicate configuration files in target
directory. Now qemu, toolchain and ibm x40 support is combined in one target
directory target/x86. Distinguishing between hardware profiles happens
via menu based configuration. (CPU choice for kernel, CFLAGS for package
building, ..). We will see if this is the right direction.

13 files changed, 20 insertions, 19 deletions

diff --git a/package/DirectFB/Makefile b/package/DirectFB/Makefile
index ba0b69a03..056fbb350 100644
--- a/package/DirectFB/Makefile
+++ b/package/DirectFB/Makefile
@@ -27,7 +27,7 @@ CONFIGURE_ARGS+=	--with-inputdrivers=linuxinput,keyboard,ps2mouse \
 # which then chooses the wrong default emulation (which is
 # probably the real problem here). LDEMULATION overrides ld's
 # wrong choice.
-ifeq (${ADK_LINUX_MIPS64_LEMOTE},y)
+ifeq (${ADK_HARDWARE_LEMOTE_YEELONG},y)
 XAKE_FLAGS+=		LDEMULATION=elf64ltsmip
 endif
 
diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile
index e62b08f33..000c3c9e5 100644
--- a/package/MesaLib/Makefile
+++ b/package/MesaLib/Makefile
@@ -22,7 +22,7 @@ PKGSD_GLXGEARS:=	Nice little OpenGL demo application
 PKGSC_GLXGEARS:=	x11/apps
 
 PKG_HOST_DEPENDS:=	!cygwin !darwin
-PKG_TARGET_DEPENDS:=	x86 lemote
+PKG_TARGET_DEPENDS:=	x86 x86_64 mips mipsel mips64 mips64el
 
 WRKDIST=		${WRKDIR}/Mesa-${PKG_VERSION}
 
@@ -32,7 +32,7 @@ $(eval $(call PKG_template,MESALIB,mesalib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_D
 $(eval $(call PKG_template,GLXINFO,glxinfo,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_GLXINFO},${PKGSC_GLXINFO}))
 $(eval $(call PKG_template,GLXGEARS,glxgears,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_GLXGEARS},${PKGSC_GLXGEARS}))
 
-ifeq (${ADK_HARDWARE_IBMX40},y)
+ifeq (${ADK_HARDWARE_IBM_X40},y)
 DRI_DRIVERS:=i915
 endif
 
@@ -63,7 +63,7 @@ post-install:
 	$(INSTALL_DIR) $(IDIR_MESALIB)/usr/lib/dri
 	$(CP) $(WRKINST)/usr/lib/libGL*.so* \
 		$(IDIR_MESALIB)/usr/lib
-ifeq (${ADK_HARDWARE_IBMX40},y)
+ifeq (${ADK_HARDWARE_IBM_X40},y)
 	${CP} $(WRKINST)/usr/lib/dri/i915_dri.so \
 		${IDIR_MESALIB}/usr/lib/dri/
 endif
diff --git a/package/dillo/Makefile b/package/dillo/Makefile
index f98b709ba..5c2134dd2 100644
--- a/package/dillo/Makefile
+++ b/package/dillo/Makefile
@@ -16,7 +16,7 @@ PKG_URL:=		http://www.dillo.org/
 PKG_SITES:=		http://www.dillo.org/download/
 
 PKG_HOST_DEPENDS:=	!cygwin
-PKG_TARGET_DEPENDS:=	x86 lemote
+PKG_TARGET_DEPENDS:=	x86 x86_64 mips mipsel mips64 mips64el
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile
index fddcc13c1..69538bc8e 100644
--- a/package/ffmpeg/Makefile
+++ b/package/ffmpeg/Makefile
@@ -38,7 +38,7 @@ CONFIGURE_CPU_OPTS:=	--disable-ssse3 \
 			--enable-amd3dnowext \
 			--enable-mmx \
 			--enable-mmx2
-else ifeq ($(ADK_HARDWARE_IBMX40),y)
+else ifeq ($(ADK_HARDWARE_IBM_X40),y)
 CONFIGURE_CPU_OPTS:=	--disable-ssse3 \
 			--enable-sse \
 			--disable-amd3dnow \
diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index 494811607..35fea912d 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -17,7 +17,7 @@ PKG_BUILDDEP+=		nspr nss jpeg libXt fontconfig sqlite
 PKG_URL:=		http://www.mozilla.org/
 PKG_SITES:=		http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PKG_VERSION}/source/
 
-PKG_TARGET_DEPENDS:=	alix x86 x86_64 lemote
+PKG_TARGET_DEPENDS:=	alix x86 x86_64 mips mipsel mips64 mips64el
 PKG_HOST_DEPENDS:=	!netbsd !freebsd !openbsd !cygwin !darwin
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.source.tar.bz2
@@ -27,7 +27,7 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,FIREFOX,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-ifeq (${ADK_LINUX_MIPS64_LEMOTE},y)
+ifeq (${ADK_LINUX_MIPS64EL},y)
 CONFIGURE_ARGS+=	--disable-ipc
 else ifeq (${ADK_TARGET_LIB_UCLIBC},y)
 CONFIGURE_ARGS+=	--disable-ipc
diff --git a/package/fltk/Makefile b/package/fltk/Makefile
index 37a426eee..39b9a3bb6 100644
--- a/package/fltk/Makefile
+++ b/package/fltk/Makefile
@@ -14,7 +14,7 @@ PKG_URL:=		http://www.fltk.org/
 PKG_SITES:=		http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/fltk/snapshots/
 
 PKG_SUBPKGS:=		LIBFLTK
-PKG_TARGET_DEPENDS:=	x86 lemote
+PKG_TARGET_DEPENDS:=	x86 x86_64 mips mipsel mips64 mips64el
 PKG_HOST_DEPENDS:=	!cygwin !darwin
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.x-r7513.tar.bz2
diff --git a/package/freeglut/Makefile b/package/freeglut/Makefile
index bfd13aa2c..1c9c5b336 100644
--- a/package/freeglut/Makefile
+++ b/package/freeglut/Makefile
@@ -14,7 +14,7 @@ PKG_URL:=		http://freeglut.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=freeglut/}
 
 PKG_HOST_DEPENDS:=	!cygwin !darwin
-PKG_TARGET_DEPENDS:=	x86 lemote
+PKG_TARGET_DEPENDS:=	x86 x86_64 mips mipsel mips64 mips64el
 
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/iw/Makefile b/package/iw/Makefile
index aec09b219..fd552a4ba 100644
--- a/package/iw/Makefile
+++ b/package/iw/Makefile
@@ -14,7 +14,7 @@ PKG_BUILDDEP:=		libnl
 PKG_URL:=		http://wireless.kernel.org/en/users/Documentation/iw
 PKG_SITES:=		http://wireless.kernel.org/download/iw/
 
-PKG_DFLT_IW:=		y if ADK_HARDWARE_IBMX40
+PKG_DFLT_IW:=		y if ADK_HARDWARE_IBM_X40
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include ${TOPDIR}/mk/package.mk
diff --git a/package/jamvm/Makefile b/package/jamvm/Makefile
index 06c6d8040..2d5854425 100644
--- a/package/jamvm/Makefile
+++ b/package/jamvm/Makefile
@@ -14,7 +14,7 @@ PKG_BUILDDEP:=		libffi zlib
 PKG_URL:=		http://jamvm.sourceforge.net
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=jamvm/}
 
-PKG_TARGET_DEPENDS:=	!foxboard !lemote
+PKG_TARGET_DEPENDS:=	!foxboard
 
 include ${TOPDIR}/mk/package.mk
 
diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile
index 5f38f19f7..60fc830d7 100644
--- a/package/mplayer/Makefile
+++ b/package/mplayer/Makefile
@@ -18,7 +18,7 @@ PKG_URL:=		http://www.mplayerhq.hu/
 PKG_SITES:=		http://openadk.org/distfiles/
 
 PKG_HOST_DEPENDS:=	!darwin
-PKG_TARGET_DEPENDS:=	alix x86 x86_64 lemote
+PKG_TARGET_DEPENDS:=	alix x86 x86_64 mips mipsel mips64 mips64el
 
 PKG_FLAVOURS:=		WITH_DIRECTFB
 PKGFD_WITH_DIRECTFB:=	enable DirectFB video output support
@@ -37,7 +37,10 @@ CONFIG_STYLE:=		minimal
 
 FAKE_FLAGS+=		INSTALLSTRIP=''
 
-ifeq (${ADK_LINUX_MIPS64_LEMOTE},y)
+ifeq (${ADK_LINUX_MIPS64EL},y)
+EXTRA_CFLAGS:=		-DARCH_MIPS64
+endif
+ifeq (${ADK_LINUX_MIPS64},y)
 EXTRA_CFLAGS:=		-DARCH_MIPS64
 endif
 
@@ -57,7 +60,7 @@ CONFIGURE_CPU_OPTS:=	--disable-ssse3 \
 			--enable-mmx \
 			--enable-3dnowext \
 			--enable-3dnow
-else ifeq (${ADK_HARDWARE_IBMX40},y)
+else ifeq (${ADK_HARDWARE_IBM_X40},y)
 CONFIGURE_CPU_OPTS:=	--disable-ssse3 \
 			--enable-sse2 \
 			--enable-sse \
diff --git a/package/wpa_supplicant/Makefile b/package/wpa_supplicant/Makefile
index 9ccacb3a2..78277a05e 100644
--- a/package/wpa_supplicant/Makefile
+++ b/package/wpa_supplicant/Makefile
@@ -13,7 +13,7 @@ PKG_DEPENDS:=		libnl
 PKG_BUILDDEP:=		libnl
 PKG_SITES:=		http://hostap.epitest.fi/releases/
 
-PKG_DFLT_WPA_SUPPLICANT:=	y if ADK_HARDWARE_IBMX40
+PKG_DFLT_WPA_SUPPLICANT:=	y if ADK_HARDWARE_IBM_X40
 
 WRKSRC=			${WRKDIST}/${PKG_NAME}
 
diff --git a/package/xf86-video-siliconmotion/Makefile b/package/xf86-video-siliconmotion/Makefile
index 64e818667..89b137d43 100644
--- a/package/xf86-video-siliconmotion/Makefile
+++ b/package/xf86-video-siliconmotion/Makefile
@@ -13,8 +13,6 @@ PKG_DEPENDS:=		xorg-server
 PKG_BUILDDEP:=		xorg-server
 PKG_SITES:=		http://xorg.freedesktop.org/releases/individual/driver/
 
-PKG_TARGET_DEPENDS:=	lemote native
-
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,XF86_VIDEO_SILICONMOTION,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile
index 351d96371..465ffb99a 100644
--- a/package/xorg-server/Makefile
+++ b/package/xorg-server/Makefile
@@ -66,7 +66,7 @@ else
 CONFIGURE_ARGS+=	--disable-dri --disable-dri2 --disable-glx
 endif
 
-ifeq (${ADK_LINUX_MIPS64_LEMOTE},y)
+ifeq (${ADK_HARDWARE_LEMOTE_YEELONG},y)
 CONFIGURE_ARGS+=	--with-int10=stub
 endif