-rw-r--r-- | Vars.make | 16 | ||||
-rw-r--r-- | include.pro | 4 |
2 files changed, 18 insertions, 2 deletions
@@ -1,65 +1,81 @@ | |||
1 | ifndef QTDIR | 1 | ifndef QTDIR |
2 | $(error QTDIR not set) | 2 | $(error QTDIR not set) |
3 | endif | 3 | endif |
4 | 4 | ||
5 | prefix=/opt/QtPalmtop | 5 | prefix=/opt/QtPalmtop |
6 | 6 | ||
7 | ifeq ($(OPIEDIR),) | 7 | ifeq ($(OPIEDIR),) |
8 | export OPIEDIR:=$(TOPDIR) | 8 | export OPIEDIR:=$(TOPDIR) |
9 | endif | 9 | endif |
10 | ifeq ($(IPK_DIR),) | 10 | ifeq ($(IPK_DIR),) |
11 | export IPK_DIR:=$(OPIEDIR) | 11 | export IPK_DIR:=$(OPIEDIR) |
12 | endif | 12 | endif |
13 | 13 | ||
14 | ifneq ($(wildcard $(TOPDIR)/.config),) | 14 | ifneq ($(wildcard $(TOPDIR)/.config),) |
15 | include $(TOPDIR)/.config | 15 | include $(TOPDIR)/.config |
16 | endif | 16 | endif |
17 | 17 | ||
18 | ifdef CONFIG_TARGET_X86 | ||
19 | PLATFORM=x86-linux | ||
20 | endif | ||
21 | ifdef CONFIG_TARGET_SHARP | ||
22 | PLATFORM=sharp-linux | ||
23 | endif | ||
24 | ifdef CONFIG_TARGET_IPAQ | ||
25 | PLATFORM=ipaq-linux | ||
26 | endif | ||
27 | ifdef CONFIG_TARGET_RAMSES | ||
28 | PLATFORM=ramses-linux | ||
29 | endif | ||
30 | ifdef CONFIG_TARGET_SIMPAD | ||
31 | PLATFORM=simpad-linux | ||
32 | endif | ||
33 | |||
18 | export QMAKE:=$(OPIEDIR)/qmake/qmake | 34 | export QMAKE:=$(OPIEDIR)/qmake/qmake |
19 | export QMAKESPECSDIR=$(OPIEDIR)/mkspecs | 35 | export QMAKESPECSDIR=$(OPIEDIR)/mkspecs |
20 | 36 | ||
21 | ifeq ($(QPE_VERSION),) | 37 | ifeq ($(QPE_VERSION),) |
22 | VERSION_MAJ:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) | 38 | VERSION_MAJ:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) |
23 | VERSION_MIN:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) | 39 | VERSION_MIN:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) |
24 | VERSION_PAT:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$(OPIEDIR)/library/version.h)) | 40 | VERSION_PAT:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$(OPIEDIR)/library/version.h)) |
25 | QPE_VERSION:=$(VERSION_MAJ).$(VERSION_MIN).$(VERSION_PAT) | 41 | QPE_VERSION:=$(VERSION_MAJ).$(VERSION_MIN).$(VERSION_PAT) |
26 | 42 | ||
27 | ifeq ($(QPE_VERSION),..) | 43 | ifeq ($(QPE_VERSION),..) |
28 | QPE_VERSION=0.9.3 | 44 | QPE_VERSION=0.9.3 |
29 | endif | 45 | endif |
30 | endif | 46 | endif |
31 | export QPE_VERSION | 47 | export QPE_VERSION |
32 | 48 | ||
33 | SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h)) | 49 | SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h)) |
34 | ifeq ($(VERSION_CVS),) | 50 | ifeq ($(VERSION_CVS),) |
35 | VERSION_CVS:=$(shell date +%Y%m%d) | 51 | VERSION_CVS:=$(shell date +%Y%m%d) |
36 | endif | 52 | endif |
37 | ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),) | 53 | ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),) |
38 | SUB_VERSION:=$(VERSION_CVS) | 54 | SUB_VERSION:=$(VERSION_CVS) |
39 | endif | 55 | endif |
40 | export SUB_VERSION | 56 | export SUB_VERSION |
41 | 57 | ||
42 | ifeq ($(QTE_REVISION),) | 58 | ifeq ($(QTE_REVISION),) |
43 | QTE_REVISION=5 | 59 | QTE_REVISION=5 |
44 | endif | 60 | endif |
45 | export QTE_REVISION | 61 | export QTE_REVISION |
46 | 62 | ||
47 | export DEB_VERSION=2.0 | 63 | export DEB_VERSION=2.0 |
48 | 64 | ||
49 | ifeq ($(QTE_BASEVERSION),) | 65 | ifeq ($(QTE_BASEVERSION),) |
50 | ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) | 66 | ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) |
51 | QTE_BASEVERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION'|grep -v STR|sed -e 's/\#define QT_VERSION\t*//; s/.*\([0-9]\)\([0-9]\)\([0-9]\).*/\1.\2.\3/;') | 67 | QTE_BASEVERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION'|grep -v STR|sed -e 's/\#define QT_VERSION\t*//; s/.*\([0-9]\)\([0-9]\)\([0-9]\).*/\1.\2.\3/;') |
52 | else | 68 | else |
53 | QTE_BASEVERSION=2.3.5 | 69 | QTE_BASEVERSION=2.3.5 |
54 | endif | 70 | endif |
55 | endif | 71 | endif |
56 | export QTE_BASEVERSION | 72 | export QTE_BASEVERSION |
57 | 73 | ||
58 | ifeq ($(QTE_VERSION),) | 74 | ifeq ($(QTE_VERSION),) |
59 | ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) | 75 | ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) |
60 | QTE_VERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION_STR'|sed -e 's/\#define QT_VERSION_STR\t*//;' -e 's/.*"\([^"]*\)".*/\1/;') | 76 | QTE_VERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION_STR'|sed -e 's/\#define QT_VERSION_STR\t*//;' -e 's/.*"\([^"]*\)".*/\1/;') |
61 | else | 77 | else |
62 | QTE_VERSION=2.3.5 | 78 | QTE_VERSION=2.3.5 |
63 | endif | 79 | endif |
64 | endif | 80 | endif |
65 | export QTE_VERSION | 81 | export QTE_VERSION |
diff --git a/include.pro b/include.pro index 38294d4..3ba8776 100644 --- a/include.pro +++ b/include.pro | |||
@@ -29,52 +29,52 @@ INSTALLS += sounds | |||
29 | # init scripts, default path is /etc/init.d | 29 | # init scripts, default path is /etc/init.d |
30 | init.path = /etc/init.d | 30 | init.path = /etc/init.d |
31 | init.files = init.d/* | 31 | init.files = init.d/* |
32 | INSTALLS += init | 32 | INSTALLS += init |
33 | 33 | ||
34 | # data, default path is /usr/share/$$TARGET | 34 | # data, default path is /usr/share/$$TARGET |
35 | data.path = /usr/share/$$TARGET | 35 | data.path = /usr/share/$$TARGET |
36 | data.files = share/* | 36 | data.files = share/* |
37 | INSTALLS += data | 37 | INSTALLS += data |
38 | 38 | ||
39 | etc.path = $$prefix/etc/ | 39 | etc.path = $$prefix/etc/ |
40 | etc.files = etc/* | 40 | etc.files = etc/* |
41 | INSTALLS += etc | 41 | INSTALLS += etc |
42 | 42 | ||
43 | apps.path = $$prefix/apps/ | 43 | apps.path = $$prefix/apps/ |
44 | apps.files = apps/* | 44 | apps.files = apps/* |
45 | INSTALLS += apps | 45 | INSTALLS += apps |
46 | 46 | ||
47 | # sounds, default path is $$prefix/sounds/$$TARGET | 47 | # sounds, default path is $$prefix/sounds/$$TARGET |
48 | sounds.path = $$prefix/sounds/$$TARGET | 48 | sounds.path = $$prefix/sounds/$$TARGET |
49 | sounds.files = sounds/* | 49 | sounds.files = sounds/* |
50 | INSTALLS += sounds | 50 | INSTALLS += sounds |
51 | 51 | ||
52 | # anything in nonstandard paths | 52 | # anything in nonstandard paths |
53 | root.path = / | 53 | root.path = / |
54 | root.files = root/* | 54 | root.files = root/* |
55 | INSTALLS += root | 55 | INSTALLS += root |
56 | 56 | ||
57 | # new targets | 57 | # new targets |
58 | opie-lupdate.target = opie-lupdate | 58 | opie-lupdate.target = opie-lupdate |
59 | opie-lupdate.commands = opie-lupdate -noobsolete $(PRO) | 59 | opie-lupdate.commands = opie-lupdate -noobsolete $(PRO) |
60 | 60 | ||
61 | opie-lrelease.target = opie-lrelease | 61 | opie-lrelease.target = opie-lrelease |
62 | opie-lrelease.commands = opie-lrelease $(PRO) | 62 | opie-lrelease.commands = opie-lrelease $(PRO) |
63 | 63 | ||
64 | lupdate.target = lupdate | 64 | lupdate.target = lupdate |
65 | lupdate.commands = lupdate -noobsolete $(PRO) | 65 | lupdate.commands = lupdate -noobsolete $(PRO) |
66 | 66 | ||
67 | lrelease.target = lrelease | 67 | lrelease.target = lrelease |
68 | lrelease.commands = lrelease $(PRO) | 68 | lrelease.commands = lrelease $(PRO) |
69 | 69 | ||
70 | ipk.target = ipk | 70 | ipk.target = ipk |
71 | ipk.commands = tmp=`mktemp -d /tmp/ipkg-opie.XXXXXXXXXX` && ( $(MAKE) INSTALL_ROOT="$$$$tmp" install && ipkg-build $$$$tmp; rm -rf $$$$tmp; ) | 71 | ipk.commands = tmp=`mktemp -d /tmp/ipkg-opie.XXXXXXXXXX` && ( $(MAKE) INSTALL_ROOT="$$$$tmp" install && ipkg-build $$$$tmp; rm -rf $$$$tmp; ) |
72 | 72 | ||
73 | QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk opie-lupdate opie-lrelease | 73 | QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk opie-lupdate opie-lrelease |
74 | QMAKE_LFLAGS += -Wl,-rpath=$$prefix/lib | 74 | QMAKE_LFLAGS += -Wl,-rpath=$$prefix/lib |
75 | QMAKE_LIBDIR += $(OPIEDIR)/lib | 75 | QMAKE_LIBDIR += $(OPIEDIR)/lib |
76 | 76 | ||
77 | MOC_DIR=.moc/$$PLATFORM | 77 | MOC_DIR=.moc/$(PLATFORM) |
78 | OBJECTS_DIR=.obj/$$PLATFORM | 78 | OBJECTS_DIR=.obj/$(PLATFORM) |
79 | 79 | ||
80 | include ( $(OPIEDIR)/gen.pro ) | 80 | include ( $(OPIEDIR)/gen.pro ) |