summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2003-07-10 04:59:59 (UTC)
committer llornkcor <llornkcor>2003-07-10 04:59:59 (UTC)
commit6abb84fb644b6746ad35e48c67f46e33de99bad2 (patch) (unidiff)
tree43331a89fec5b13dc81cf8af4fe383d4ac781a73
parent155d68c1e7d7dc0fed2534ac43d6d77ce2781f55 (diff)
downloadopie-6abb84fb644b6746ad35e48c67f46e33de99bad2.zip
opie-6abb84fb644b6746ad35e48c67f46e33de99bad2.tar.gz
opie-6abb84fb644b6746ad35e48c67f46e33de99bad2.tar.bz2
add PLATFORM... bleh
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Vars.make16
-rw-r--r--include.pro4
2 files changed, 18 insertions, 2 deletions
diff --git a/Vars.make b/Vars.make
index 788ebf5..cc463d3 100644
--- a/Vars.make
+++ b/Vars.make
@@ -1,65 +1,81 @@
1ifndef QTDIR 1ifndef QTDIR
2$(error QTDIR not set) 2$(error QTDIR not set)
3endif 3endif
4 4
5prefix=/opt/QtPalmtop 5prefix=/opt/QtPalmtop
6 6
7ifeq ($(OPIEDIR),) 7ifeq ($(OPIEDIR),)
8 export OPIEDIR:=$(TOPDIR) 8 export OPIEDIR:=$(TOPDIR)
9endif 9endif
10ifeq ($(IPK_DIR),) 10ifeq ($(IPK_DIR),)
11 export IPK_DIR:=$(OPIEDIR) 11 export IPK_DIR:=$(OPIEDIR)
12endif 12endif
13 13
14ifneq ($(wildcard $(TOPDIR)/.config),) 14ifneq ($(wildcard $(TOPDIR)/.config),)
15 include $(TOPDIR)/.config 15 include $(TOPDIR)/.config
16endif 16endif
17 17
18ifdef CONFIG_TARGET_X86
19 PLATFORM=x86-linux
20endif
21ifdef CONFIG_TARGET_SHARP
22 PLATFORM=sharp-linux
23endif
24ifdef CONFIG_TARGET_IPAQ
25 PLATFORM=ipaq-linux
26endif
27ifdef CONFIG_TARGET_RAMSES
28 PLATFORM=ramses-linux
29endif
30ifdef CONFIG_TARGET_SIMPAD
31 PLATFORM=simpad-linux
32endif
33
18export QMAKE:=$(OPIEDIR)/qmake/qmake 34export QMAKE:=$(OPIEDIR)/qmake/qmake
19export QMAKESPECSDIR=$(OPIEDIR)/mkspecs 35export QMAKESPECSDIR=$(OPIEDIR)/mkspecs
20 36
21ifeq ($(QPE_VERSION),) 37ifeq ($(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
30endif 46endif
31export QPE_VERSION 47export QPE_VERSION
32 48
33SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h)) 49SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h))
34ifeq ($(VERSION_CVS),) 50ifeq ($(VERSION_CVS),)
35 VERSION_CVS:=$(shell date +%Y%m%d) 51 VERSION_CVS:=$(shell date +%Y%m%d)
36endif 52endif
37ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),) 53ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),)
38 SUB_VERSION:=$(VERSION_CVS) 54 SUB_VERSION:=$(VERSION_CVS)
39endif 55endif
40export SUB_VERSION 56export SUB_VERSION
41 57
42ifeq ($(QTE_REVISION),) 58ifeq ($(QTE_REVISION),)
43 QTE_REVISION=5 59 QTE_REVISION=5
44endif 60endif
45export QTE_REVISION 61export QTE_REVISION
46 62
47export DEB_VERSION=2.0 63export DEB_VERSION=2.0
48 64
49ifeq ($(QTE_BASEVERSION),) 65ifeq ($(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
55endif 71endif
56export QTE_BASEVERSION 72export QTE_BASEVERSION
57 73
58ifeq ($(QTE_VERSION),) 74ifeq ($(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
64endif 80endif
65export QTE_VERSION 81export 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
30init.path = /etc/init.d 30init.path = /etc/init.d
31init.files = init.d/* 31init.files = init.d/*
32INSTALLS += init 32INSTALLS += init
33 33
34# data, default path is /usr/share/$$TARGET 34# data, default path is /usr/share/$$TARGET
35data.path = /usr/share/$$TARGET 35data.path = /usr/share/$$TARGET
36data.files = share/* 36data.files = share/*
37INSTALLS += data 37INSTALLS += data
38 38
39etc.path = $$prefix/etc/ 39etc.path = $$prefix/etc/
40etc.files = etc/* 40etc.files = etc/*
41INSTALLS += etc 41INSTALLS += etc
42 42
43apps.path = $$prefix/apps/ 43apps.path = $$prefix/apps/
44apps.files = apps/* 44apps.files = apps/*
45INSTALLS += apps 45INSTALLS += apps
46 46
47# sounds, default path is $$prefix/sounds/$$TARGET 47# sounds, default path is $$prefix/sounds/$$TARGET
48sounds.path = $$prefix/sounds/$$TARGET 48sounds.path = $$prefix/sounds/$$TARGET
49sounds.files = sounds/* 49sounds.files = sounds/*
50INSTALLS += sounds 50INSTALLS += sounds
51 51
52# anything in nonstandard paths 52# anything in nonstandard paths
53root.path = / 53root.path = /
54root.files = root/* 54root.files = root/*
55INSTALLS += root 55INSTALLS += root
56 56
57# new targets 57# new targets
58opie-lupdate.target = opie-lupdate 58opie-lupdate.target = opie-lupdate
59opie-lupdate.commands = opie-lupdate -noobsolete $(PRO) 59opie-lupdate.commands = opie-lupdate -noobsolete $(PRO)
60 60
61opie-lrelease.target = opie-lrelease 61opie-lrelease.target = opie-lrelease
62opie-lrelease.commands = opie-lrelease $(PRO) 62opie-lrelease.commands = opie-lrelease $(PRO)
63 63
64lupdate.target = lupdate 64lupdate.target = lupdate
65lupdate.commands = lupdate -noobsolete $(PRO) 65lupdate.commands = lupdate -noobsolete $(PRO)
66 66
67lrelease.target = lrelease 67lrelease.target = lrelease
68lrelease.commands = lrelease $(PRO) 68lrelease.commands = lrelease $(PRO)
69 69
70ipk.target = ipk 70ipk.target = ipk
71ipk.commands = tmp=`mktemp -d /tmp/ipkg-opie.XXXXXXXXXX` && ( $(MAKE) INSTALL_ROOT="$$$$tmp" install && ipkg-build $$$$tmp; rm -rf $$$$tmp; ) 71ipk.commands = tmp=`mktemp -d /tmp/ipkg-opie.XXXXXXXXXX` && ( $(MAKE) INSTALL_ROOT="$$$$tmp" install && ipkg-build $$$$tmp; rm -rf $$$$tmp; )
72 72
73QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk opie-lupdate opie-lrelease 73QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk opie-lupdate opie-lrelease
74QMAKE_LFLAGS += -Wl,-rpath=$$prefix/lib 74QMAKE_LFLAGS += -Wl,-rpath=$$prefix/lib
75QMAKE_LIBDIR += $(OPIEDIR)/lib 75QMAKE_LIBDIR += $(OPIEDIR)/lib
76 76
77MOC_DIR=.moc/$$PLATFORM 77MOC_DIR=.moc/$(PLATFORM)
78OBJECTS_DIR=.obj/$$PLATFORM 78OBJECTS_DIR=.obj/$(PLATFORM)
79 79
80include ( $(OPIEDIR)/gen.pro ) 80include ( $(OPIEDIR)/gen.pro )