From c0c657bd92911788b96d9670620eabf024453752 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Thu, 30 Sep 2010 22:15:13 +0100
Subject: Split meta-extras and meta-moblin out of the main repository

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---
 .../qmake/qmake-native/linux-oe-qmake.conf         | 82 ----------------------
 meta-moblin/packages/qmake/qmake-native_1.07a.bb   | 47 -------------
 2 files changed, 129 deletions(-)
 delete mode 100644 meta-moblin/packages/qmake/qmake-native/linux-oe-qmake.conf
 delete mode 100644 meta-moblin/packages/qmake/qmake-native_1.07a.bb

(limited to 'meta-moblin/packages/qmake')

diff --git a/meta-moblin/packages/qmake/qmake-native/linux-oe-qmake.conf b/meta-moblin/packages/qmake/qmake-native/linux-oe-qmake.conf
deleted file mode 100644
index 205b693fd..000000000
--- a/meta-moblin/packages/qmake/qmake-native/linux-oe-qmake.conf
+++ /dev/null
@@ -1,82 +0,0 @@
-#
-# qmake configuration for linux-oe-g++ / OpenEmbedded Build System / http://openembedded.org
-#
-
-MAKEFILE_GENERATOR	= UNIX
-TEMPLATE		= app
-CONFIG			+= qt warn_on release
-
-QMAKE_CC		= $(OE_QMAKE_CC)
-QMAKE_LEX		= flex
-QMAKE_LEXFLAGS		=
-QMAKE_YACC		= yacc
-QMAKE_YACCFLAGS		= -d
-QMAKE_CFLAGS		= -pipe $(OE_QMAKE_CFLAGS) $(CFLAGS_EXTRA)
-QMAKE_CFLAGS_WARN_ON	= -Wall -W
-QMAKE_CFLAGS_WARN_OFF	=
-QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
-QMAKE_CFLAGS_DEBUG	= -g
-QMAKE_CFLAGS_SHLIB	= -fPIC
-QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
-QMAKE_CFLAGS_THREAD	= -D_REENTRANT
-
-QMAKE_CXX		= $(OE_QMAKE_CXX)
-QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS) $(CXXFLAGS_EXTRA)
-QMAKE_CXXFLAGS_WARN_ON	= $$QMAKE_CFLAGS_WARN_ON
-QMAKE_CXXFLAGS_WARN_OFF	= $$QMAKE_CFLAGS_WARN_OFF
-QMAKE_CXXFLAGS_RELEASE	= $$QMAKE_CFLAGS_RELEASE
-QMAKE_CXXFLAGS_DEBUG	= $$QMAKE_CFLAGS_DEBUG
-QMAKE_CXXFLAGS_SHLIB	= $$QMAKE_CFLAGS_SHLIB
-QMAKE_CXXFLAGS_YACC	= $$QMAKE_CFLAGS_YACC
-QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
-
-QMAKE_INCDIR		=
-QMAKE_LIBDIR		=
-QMAKE_INCDIR_X11	= 
-QMAKE_LIBDIR_X11	= 
-QMAKE_INCDIR_QT		= $(OE_QMAKE_INCDIR_QT)
-QMAKE_LIBDIR_QT		= $(OE_QMAKE_LIBDIR_QT)
-QMAKE_INCDIR_OPENGL	=
-QMAKE_LIBDIR_OPENGL	=
-
-QMAKE_LINK		= $(OE_QMAKE_LINK)
-QMAKE_LINK_SHLIB	= $(OE_QMAKE_LINK)
-QMAKE_LFLAGS		= $(OE_QMAKE_LDFLAGS) $(LFLAGS_EXTRA)
-QMAKE_LFLAGS_RELEASE	=
-QMAKE_LFLAGS_DEBUG	=
-QMAKE_LFLAGS_SHLIB      = -shared
-QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
-QMAKE_LFLAGS_SONAME     = -Wl,-soname,
-QMAKE_LFLAGS_THREAD     =
-QMAKE_RPATH             = -Wl,-rpath-link,
-
-QMAKE_LIBS		= $(LIBS_EXTRA)
-QMAKE_LIBS_DYNLOAD      = -ldl
-QMAKE_LIBS_X11		= $(OE_QMAKE_LIBS_X11)
-QMAKE_LIBS_X11SM	= 
-QMAKE_LIBS_QT		= -l$(OE_QMAKE_LIBS_QT)
-QMAKE_LIBS_QT_THREAD    = -l$(OE_QMAKE_LIBS_QT)-mt
-QMAKE_LIBS_OPENGL	= $(OE_QMAKE_LIBS_OPENGL)
-QMAKE_LIBS_OPENGL_QT	= $(OE_QMAKE_LIBS_OPENGL_QT)
-QMAKE_LIBS_THREAD       = -lpthread
-
-QMAKE_MOC		= $(OE_QMAKE_MOC)
-QMAKE_UIC		= $(OE_QMAKE_UIC)
-
-QMAKE_AR		= $(OE_QMAKE_AR) cqs
-QMAKE_RANLIB		=
-
-QMAKE_TAR		= tar -cf
-QMAKE_GZIP		= gzip -9f
-
-QMAKE_COPY		= cp -f
-QMAKE_COPY_FILE         = $(COPY)
-QMAKE_COPY_DIR          = $(COPY) -r
-QMAKE_MOVE		= mv -f
-QMAKE_DEL_FILE		= rm -f
-QMAKE_DEL_DIR		= rmdir
-QMAKE_STRIP             = $(OE_QMAKE_STRIP)
-QMAKE_STRIPFLAGS_LIB	+= --strip-unneeded
-QMAKE_CHK_DIR_EXISTS	= test -d
-QMAKE_MKDIR		= mkdir -p
-
diff --git a/meta-moblin/packages/qmake/qmake-native_1.07a.bb b/meta-moblin/packages/qmake/qmake-native_1.07a.bb
deleted file mode 100644
index 82a24968a..000000000
--- a/meta-moblin/packages/qmake/qmake-native_1.07a.bb
+++ /dev/null
@@ -1,47 +0,0 @@
-DESCRIPTION = "TrollTech Makefile Generator"
-PRIORITY = "optional"
-HOMEPAGE = "http://www.trolltech.com"
-SECTION = "devel"
-LICENSE = "GPL QPL"
-PR = "r4"
-
-QTEVER = "qt-embedded-free-3.3.5"
-
-SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/${QTEVER}.tar.bz2 \
-           file://linux-oe-qmake.conf"
-S = "${WORKDIR}/${QTEVER}"
-
-inherit autotools native
-
-export QTDIR = "${S}"
-EXTRA_OEMAKE = "-e"
-
-do_configure() {
-	# Install the OE build templates
-	for template in linux-oe-g++ linux-uclibc-oe-g++ linux-gnueabi-oe-g++
-	do
-		install -d ${S}/mkspecs/$template
-		install -m 0644 ${WORKDIR}/linux-oe-qmake.conf ${S}/mkspecs/$template/qmake.conf
-		ln -sf ../linux-g++/qplatformdefs.h ${S}/mkspecs/$template/qplatformdefs.h
-	done
-	QMAKESPEC=
-	PLATFORM=${HOST_OS}-oe-g++
-	export PLATFORM
-	oenote ./configure ${EXTRA_OECONF}
-	echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed"
-}
-
-do_compile() {
-	:
-}
-
-do_install() {
-	install -d ${D}${bindir}/
-	install -m 0755 ${S}/bin/qmake ${D}${bindir}/
-	install -d ${D}/qmake/
-	cp -fPR ${S}/mkspecs/* ${D}/qmake/
-}
-
-sysroot_stage_all_append() {
-	sysroot_stage_dir ${D}/qmake ${SYSROOT_DESTDIR}/${QMAKE_MKSPEC_PATH}
-}
-- 
cgit v1.2.3