From patchwork Mon Jan 6 21:43:02 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Boibessot X-Patchwork-Id: 307450 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id C77702C00CD for ; Tue, 7 Jan 2014 08:43:26 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1B95C8B775; Mon, 6 Jan 2014 21:43:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mBScyfJbw4ks; Mon, 6 Jan 2014 21:43:25 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id ECB668B784; Mon, 6 Jan 2014 21:43:24 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 2CCAE1BF9EC for ; Mon, 6 Jan 2014 21:43:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 258368A91D for ; Mon, 6 Jan 2014 21:43:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id dSS3PSt1ELBa for ; Mon, 6 Jan 2014 21:43:22 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from smtp3-g21.free.fr (smtp3-g21.free.fr [212.27.42.3]) by whitealder.osuosl.org (Postfix) with ESMTP id 82A908B815 for ; Mon, 6 Jan 2014 21:43:20 +0000 (UTC) Received: from localhost.localdomain (unknown [82.234.232.91]) by smtp3-g21.free.fr (Postfix) with ESMTP id E084DA6257; Mon, 6 Jan 2014 22:43:14 +0100 (CET) From: julien.boibessot@free.fr To: buildroot@busybox.net Date: Mon, 6 Jan 2014 22:43:02 +0100 Message-Id: <1389044582-20123-1-git-send-email-julien.boibessot@free.fr> X-Mailer: git-send-email 1.7.5.4 Cc: Julien Boibessot Subject: [Buildroot] [PATCH] qt4: allow separate build/installation of demos and examples X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net From: Julien Boibessot Signed-off-by: Jeremie Scheer Signed-off-by: Julien Boibessot --- package/qt/Config.in | 8 +++++++- package/qt/qt.mk | 9 +++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/package/qt/Config.in b/package/qt/Config.in index dd2b6d9..926d54c 100644 --- a/package/qt/Config.in +++ b/package/qt/Config.in @@ -21,7 +21,13 @@ config BR2_PACKAGE_QT_DEBUG If unsure, say N. config BR2_PACKAGE_QT_DEMOS - bool "Compile and install demos and examples (with code)" + bool "Compile and install Qt demos (with code)" + select BR2_PACKAGE_QT_GUI_MODULE + help + If unsure, say N. + +config BR2_PACKAGE_QT_EXAMPLES + bool "Compile and install Qt examples (with code)" select BR2_PACKAGE_QT_GUI_MODULE help If unsure, say N. diff --git a/package/qt/qt.mk b/package/qt/qt.mk index 029d317..867b798 100644 --- a/package/qt/qt.mk +++ b/package/qt/qt.mk @@ -59,9 +59,14 @@ QT_CONFIGURE_OPTS += -no-qt3support endif ifeq ($(BR2_PACKAGE_QT_DEMOS),y) -QT_CONFIGURE_OPTS += -examplesdir $(TARGET_DIR)/usr/share/qt/examples -demosdir $(TARGET_DIR)/usr/share/qt/demos +QT_CONFIGURE_OPTS += -demosdir $(TARGET_DIR)/usr/share/qt/demos else -QT_CONFIGURE_OPTS += -nomake examples -nomake demos +QT_CONFIGURE_OPTS += -nomake demos +endif +ifeq ($(BR2_PACKAGE_QT_EXAMPLES),y) +QT_CONFIGURE_OPTS += -examplesdir $(TARGET_DIR)/usr/share/qt/examples +else +QT_CONFIGURE_OPTS += -nomake examples endif # ensure glib is built first if enabled for Qt's glib support