author | mickeyl <mickeyl> | 2004-11-15 14:29:41 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-11-15 14:29:41 (UTC) |
commit | 5e6ce0ba567dd9c8ae33353fcf1d0554b34241e8 (patch) (unidiff) | |
tree | e3903fd3f146c16d3521db20a6f3ca2db8b95121 /Vars.make | |
parent | c9543dc4edd3ea586c04e8114e133296ad9529d9 (diff) | |
download | opie-5e6ce0ba567dd9c8ae33353fcf1d0554b34241e8.zip opie-5e6ce0ba567dd9c8ae33353fcf1d0554b34241e8.tar.gz opie-5e6ce0ba567dd9c8ae33353fcf1d0554b34241e8.tar.bz2 |
this improves Opie build system playing more nice with OE. instructions later...
alert me if this breaks the non-oe work (which i doubt)
-rw-r--r-- | Vars.make | 16 |
1 files changed, 12 insertions, 4 deletions
@@ -1,7 +1,3 @@ | |||
1 | ifndef QTDIR | ||
2 | $(error QTDIR not set) | ||
3 | endif | ||
4 | |||
5 | prefix=/opt/QtPalmtop | 1 | prefix=/opt/QtPalmtop |
6 | 2 | ||
7 | ifeq ($(OPIEDIR),) | 3 | ifeq ($(OPIEDIR),) |
@@ -15,6 +11,18 @@ ifneq ($(wildcard $(TOPDIR)/.config),) | |||
15 | include $(TOPDIR)/.config | 11 | include $(TOPDIR)/.config |
16 | endif | 12 | endif |
17 | 13 | ||
14 | ifndef CONFIG_TARGET_OE | ||
15 | ifndef QTDIR | ||
16 | $(error QTDIR not set) | ||
17 | endif | ||
18 | else | ||
19 | OEDIR:=$(CONFIG_OE_BUILD_DIR) | ||
20 | QTDIR:=$(OEDIR)/tmp/staging/arm-linux/qt2 | ||
21 | $(shell mkdir -p $(QTDIR)/src/moc) | ||
22 | $(shell echo -e "all: \n\t" >>$(QTDIR)/src/moc/Makefile) | ||
23 | PLATFORM=sharp-linux | ||
24 | endif | ||
25 | |||
18 | ifdef CONFIG_TARGET_X86 | 26 | ifdef CONFIG_TARGET_X86 |
19 | PLATFORM=x86-linux | 27 | PLATFORM=x86-linux |
20 | endif | 28 | endif |