9 files changed, 8 insertions, 15 deletions
diff --git a/package/alix-switch/Makefile b/package/alix-switch/Makefile
index ea7ae6a73..8fa705bb9 100644
--- a/package/alix-switch/Makefile
+++ b/package/alix-switch/Makefile
@@ -5,13 +5,12 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		alix-switch
 PKG_VERSION:=		1.0
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_DESCR:=		daemon listening on button events
 PKG_SECTION:=		base
-PKG_URL:=		http://www.openadk.org/
+PKG_URL:=		http://openadk.org/
 
-PKG_TARGET_DEPENDS:=	alix2d alix2d13
-PKG_DFLT_ALIX_SWITCH:=	y
+PKG_TARGET_DEPENDS:=	alix
 
 NO_DISTFILES:=		1
 
diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile
index f0140d916..cae31cc1e 100644
--- a/package/ffmpeg/Makefile
+++ b/package/ffmpeg/Makefile
@@ -31,7 +31,7 @@ SUB_INSTALLS-y:=
 SUB_INSTALLS-m:=
 SUB_INSTALLS-${ADK_PACKAGE_FFPLAY}+=	ffplay-install
 
-ifeq ($(ADK_TARGET),alix1c)
+ifeq ($(ADK_TARGET),alix)
 CONFIGURE_CPU_OPTS:=	--disable-ssse3 \
 			--disable-sse \
 			--enable-amd3dnow \
diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index f3c13c704..163d740f6 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -17,7 +17,7 @@ PKG_BUILDDEP+=		nspr nss jpeg libXt fontconfig
 PKG_URL:=		http://www.mozilla.org/
 PKG_SITES:=		http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PKG_VERSION}/source/
 
-PKG_TARGET_DEPENDS:=	alix1c x86_qemu x86_64_qemu shuttle ibmx40 lemote
+PKG_TARGET_DEPENDS:=	alix x86_qemu x86_64_qemu shuttle ibmx40 lemote
 PKG_HOST_DEPENDS:=	!netbsd !freebsd !openbsd !cygwin !darwin
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.source.tar.bz2
diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile
index ab22f18d3..62b3cdbc1 100644
--- a/package/mplayer/Makefile
+++ b/package/mplayer/Makefile
@@ -18,13 +18,13 @@ PKG_URL:=		http://www.mplayerhq.hu/
 PKG_SITES:=		http://openadk.org/distfiles/
 
 PKG_HOST_DEPENDS:=	!darwin
+PKG_TARGET_DEPENDS:=	alix x86_qemu x86_64_qemu shuttle lemote
 
 PKG_FLAVOURS:=		WITH_DIRECTFB
 PKGFD_WITH_DIRECTFB:=	enable DirectFB video output support
 PKGFS_WITH_DIRECTFB:=	directfb
 PKGFB_WITH_DIRECTFB:=	DirectFB
 
-PKG_TARGET_DEPENDS:=	alix1c x86_qemu x86_64_qemu shuttle lemote
 
 include ${TOPDIR}/mk/package.mk
 
diff --git a/package/xf86-input-evtouch/Makefile b/package/xf86-input-evtouch/Makefile
index f5f2b22dd..aa959167f 100644
--- a/package/xf86-input-evtouch/Makefile
+++ b/package/xf86-input-evtouch/Makefile
@@ -13,8 +13,6 @@ PKG_DEPENDS:=		xorg-server kmod-input-evdev
 PKG_BUILDDEP:=		xorg-server
 PKG_SITES:=		http://www.conan.de/touchscreen/
 
-PKG_TARGET_DEPENDS:=	alix1c
-
 DISTFILES:= 		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include $(TOPDIR)/mk/package.mk
diff --git a/package/xf86-input-keyboard/Makefile b/package/xf86-input-keyboard/Makefile
index dbd52876d..49d31a193 100644
--- a/package/xf86-input-keyboard/Makefile
+++ b/package/xf86-input-keyboard/Makefile
@@ -13,8 +13,6 @@ PKG_DEPENDS:=		xorg-server
 PKG_BUILDDEP:=		xorg-server
 PKG_SITES:=		${MASTER_SITE_XORG}
 
-PKG_TARGET_DEPENDS:=	alix1c lemote ibmx40 shuttle
-
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,XF86_INPUT_KEYBOARD,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/xf86-input-mouse/Makefile b/package/xf86-input-mouse/Makefile
index cfaa9619e..2deb25175 100644
--- a/package/xf86-input-mouse/Makefile
+++ b/package/xf86-input-mouse/Makefile
@@ -13,8 +13,6 @@ PKG_DEPENDS:=		xorg-server
 PKG_BUILDDEP:=		xorg-server
 PKG_SITES:=		${MASTER_SITE_XORG}
 
-PKG_TARGET_DEPENDS:=	alix1c lemote ibmx40 shuttle
-
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,XF86_INPUT_MOUSE,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/xf86-video-fbdev/Makefile b/package/xf86-video-fbdev/Makefile
index 7d3ca9f76..4a4ca5dec 100644
--- a/package/xf86-video-fbdev/Makefile
+++ b/package/xf86-video-fbdev/Makefile
@@ -13,7 +13,7 @@ PKG_DEPENDS:=		xorg-server
 PKG_BUILDDEP:=		xorg-server
 PKG_SITES:=		http://xorg.freedesktop.org/releases/individual/driver/
 
-PKG_TARGET_DEPENDS:=	alix1c lemote ibmx40
+PKG_CFLINE_XF86_VIDEO_FBDEV:=	depends on ADK_TARGET_WITH_VGA
 
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/xf86-video-geode/Makefile b/package/xf86-video-geode/Makefile
index e41a83584..ee657309e 100644
--- a/package/xf86-video-geode/Makefile
+++ b/package/xf86-video-geode/Makefile
@@ -13,7 +13,7 @@ PKG_DEPENDS:=		xorg-server
 PKG_BUILDDEP:=		xorg-server
 PKG_SITES:=		http://xorg.freedesktop.org/releases/individual/driver/
 
-PKG_TARGET_DEPENDS:=	alix1c
+PKG_CFLINE_XF86_VIDEO_GEODE:=	depends on ADK_TARGET_WITH_VGA
 
 include $(TOPDIR)/mk/package.mk