From 5e6ce0ba567dd9c8ae33353fcf1d0554b34241e8 Mon Sep 17 00:00:00 2001 From: mickeyl Date: Mon, 15 Nov 2004 14:29:41 +0000 Subject: this improves Opie build system playing more nice with OE. instructions later... alert me if this breaks the non-oe work (which i doubt) --- (limited to 'Vars.make') diff --git a/Vars.make b/Vars.make index 5e2cd7b..238918f 100644 --- a/Vars.make +++ b/Vars.make @@ -1,7 +1,3 @@ -ifndef QTDIR -$(error QTDIR not set) -endif - prefix=/opt/QtPalmtop ifeq ($(OPIEDIR),) @@ -15,6 +11,18 @@ ifneq ($(wildcard $(TOPDIR)/.config),) include $(TOPDIR)/.config endif +ifndef CONFIG_TARGET_OE + ifndef QTDIR + $(error QTDIR not set) + endif +else + OEDIR:=$(CONFIG_OE_BUILD_DIR) + QTDIR:=$(OEDIR)/tmp/staging/arm-linux/qt2 + $(shell mkdir -p $(QTDIR)/src/moc) + $(shell echo -e "all: \n\t" >>$(QTDIR)/src/moc/Makefile) + PLATFORM=sharp-linux +endif + ifdef CONFIG_TARGET_X86 PLATFORM=x86-linux endif -- cgit v0.9.0.2