author | eilers <eilers> | 2003-11-03 17:35:14 (UTC) |
---|---|---|
committer | eilers <eilers> | 2003-11-03 17:35:14 (UTC) |
commit | d8575540352e69a29ce662feb0a53623a4a89216 (patch) (unidiff) | |
tree | ddf7cc9bf62d5f35b4c490b1c9a3c1c8f2200b00 | |
parent | d34dc773591a2d467c68875a68a671d6a809f861 (diff) | |
download | opie-d8575540352e69a29ce662feb0a53623a4a89216.zip opie-d8575540352e69a29ce662feb0a53623a4a89216.tar.gz opie-d8575540352e69a29ce662feb0a53623a4a89216.tar.bz2 |
Oops.. Removed -ldl wasn't a good idea.. Linux compiles again..
-rw-r--r-- | include.pro | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include.pro b/include.pro index 4bdcaa7..ef8661c 100644 --- a/include.pro +++ b/include.pro | |||
@@ -1,115 +1,118 @@ | |||
1 | include ( $(OPIEDIR)/gen.pro ) | 1 | include ( $(OPIEDIR)/gen.pro ) |
2 | 2 | ||
3 | # base opie install path | 3 | # base opie install path |
4 | # prefix = /opt/QtPalmtop ??? Why here (eilers) ??? | 4 | # prefix = /opt/QtPalmtop ??? Why here (eilers) ??? |
5 | prefix = $(OPIEDIR) | 5 | prefix = $(OPIEDIR) |
6 | 6 | ||
7 | contains( CONFIG, quick-app-lib ) { | 7 | contains( CONFIG, quick-app-lib ) { |
8 | TEMPLATE = lib | 8 | TEMPLATE = lib |
9 | DESTDIR = $(OPIEDIR)/plugins/application | 9 | DESTDIR = $(OPIEDIR)/plugins/application |
10 | DEFINES += OPIE_APP_INTERFACE | 10 | DEFINES += OPIE_APP_INTERFACE |
11 | !contains( TARGET, launcher ) { | 11 | !contains( TARGET, launcher ) { |
12 | message( Linking $$TARGET to quicklauncher ) | 12 | message( Linking $$TARGET to quicklauncher ) |
13 | system( rm -f $$(OPIEDIR)/bin/$$TARGET ) | 13 | system( rm -f $$(OPIEDIR)/bin/$$TARGET ) |
14 | system( ln -s quicklauncher $$(OPIEDIR)/bin/$$TARGET ) | 14 | system( ln -s quicklauncher $$(OPIEDIR)/bin/$$TARGET ) |
15 | } | 15 | } |
16 | } | 16 | } |
17 | 17 | ||
18 | contains ( CONFIG, quick-app-bin ) { | 18 | contains ( CONFIG, quick-app-bin ) { |
19 | TEMPLATE = app | 19 | TEMPLATE = app |
20 | DESTDIR = $(OPIEDIR)/bin | 20 | DESTDIR = $(OPIEDIR)/bin |
21 | DEFINES -= OPIE_APP_INTERFACE | 21 | DEFINES -= OPIE_APP_INTERFACE |
22 | message( Touching plugins/application/lib$${TARGET}.so ) | 22 | message( Touching plugins/application/lib$${TARGET}.so ) |
23 | system( touch $$(OPIEDIR)/plugins/application/lib$${TARGET}.so ) | 23 | system( touch $$(OPIEDIR)/plugins/application/lib$${TARGET}.so ) |
24 | } | 24 | } |
25 | 25 | ||
26 | 26 | ||
27 | contains( TEMPLATE, lib ) { | 27 | contains( TEMPLATE, lib ) { |
28 | target.path = $$prefix/lib | 28 | target.path = $$prefix/lib |
29 | } | 29 | } |
30 | !contains( TEMPLATE, lib ) { | 30 | !contains( TEMPLATE, lib ) { |
31 | target.path = $$prefix/bin | 31 | target.path = $$prefix/bin |
32 | } | 32 | } |
33 | INSTALLS += target | 33 | INSTALLS += target |
34 | 34 | ||
35 | # ipkg control files | 35 | # ipkg control files |
36 | control.path = /CONTROL | 36 | control.path = /CONTROL |
37 | control.files = control postinst prerm postrm preinst conffiles | 37 | control.files = control postinst prerm postrm preinst conffiles |
38 | INSTALLS += control | 38 | INSTALLS += control |
39 | 39 | ||
40 | # images, default is $$prefix/pics/$$TARGET | 40 | # images, default is $$prefix/pics/$$TARGET |
41 | pics.path = $$prefix/pics/$$TARGET | 41 | pics.path = $$prefix/pics/$$TARGET |
42 | pics.files = pics/* | 42 | pics.files = pics/* |
43 | INSTALLS += pics | 43 | INSTALLS += pics |
44 | 44 | ||
45 | # sounds, default path is $$prefix/sounds/$$TARGET | 45 | # sounds, default path is $$prefix/sounds/$$TARGET |
46 | sounds.path = $$prefix/sounds/$$TARGET | 46 | sounds.path = $$prefix/sounds/$$TARGET |
47 | sounds.files = sounds/* | 47 | sounds.files = sounds/* |
48 | INSTALLS += sounds | 48 | INSTALLS += sounds |
49 | 49 | ||
50 | # init scripts, default path is /etc/init.d | 50 | # init scripts, default path is /etc/init.d |
51 | init.path = /etc/init.d | 51 | init.path = /etc/init.d |
52 | init.files = init.d/* | 52 | init.files = init.d/* |
53 | INSTALLS += init | 53 | INSTALLS += init |
54 | 54 | ||
55 | # data, default path is /usr/share/$$TARGET | 55 | # data, default path is /usr/share/$$TARGET |
56 | data.path = /usr/share/$$TARGET | 56 | data.path = /usr/share/$$TARGET |
57 | data.files = share/* | 57 | data.files = share/* |
58 | INSTALLS += data | 58 | INSTALLS += data |
59 | 59 | ||
60 | etc.path = $$prefix/etc/ | 60 | etc.path = $$prefix/etc/ |
61 | etc.files = etc/* | 61 | etc.files = etc/* |
62 | INSTALLS += etc | 62 | INSTALLS += etc |
63 | 63 | ||
64 | apps.path = $$prefix/apps/ | 64 | apps.path = $$prefix/apps/ |
65 | apps.files = apps/* | 65 | apps.files = apps/* |
66 | INSTALLS += apps | 66 | INSTALLS += apps |
67 | 67 | ||
68 | # sounds, default path is $$prefix/sounds/$$TARGET | 68 | # sounds, default path is $$prefix/sounds/$$TARGET |
69 | sounds.path = $$prefix/sounds/$$TARGET | 69 | sounds.path = $$prefix/sounds/$$TARGET |
70 | sounds.files = sounds/* | 70 | sounds.files = sounds/* |
71 | INSTALLS += sounds | 71 | INSTALLS += sounds |
72 | 72 | ||
73 | # anything in nonstandard paths | 73 | # anything in nonstandard paths |
74 | root.path = / | 74 | root.path = / |
75 | root.files = root/* | 75 | root.files = root/* |
76 | INSTALLS += root | 76 | INSTALLS += root |
77 | 77 | ||
78 | # new targets | 78 | # new targets |
79 | opie-lupdate.target = opie-lupdate | 79 | opie-lupdate.target = opie-lupdate |
80 | opie-lupdate.commands = opie-lupdate $(PRO) | 80 | opie-lupdate.commands = opie-lupdate $(PRO) |
81 | 81 | ||
82 | opie-lrelease.target = opie-lrelease | 82 | opie-lrelease.target = opie-lrelease |
83 | opie-lrelease.commands = opie-lrelease $(PRO) | 83 | opie-lrelease.commands = opie-lrelease $(PRO) |
84 | 84 | ||
85 | lupdate.target = lupdate | 85 | lupdate.target = lupdate |
86 | lupdate.commands = lupdate -noobsolete $(PRO) | 86 | lupdate.commands = lupdate -noobsolete $(PRO) |
87 | 87 | ||
88 | lrelease.target = lrelease | 88 | lrelease.target = lrelease |
89 | lrelease.commands = lrelease $(PRO) | 89 | lrelease.commands = lrelease $(PRO) |
90 | 90 | ||
91 | # new message target to get all strings from the apps with and without tr | 91 | # new message target to get all strings from the apps with and without tr |
92 | messages.target = messages | 92 | messages.target = messages |
93 | messages.commands = xgettext -C -n -ktr -kQT_TRANSLATE_NOOP $$HEADERS $$SOURCES -o '$(OPIEDIR)/messages-$(QMAKE_TARGET)-tr.po' && xgettext -C -n -a $$HEADERS $$SOURCES -o '$(OPIEDIR)/messages-$(QMAKE_TARGET)-allstrings.po' | 93 | messages.commands = xgettext -C -n -ktr -kQT_TRANSLATE_NOOP $$HEADERS $$SOURCES -o '$(OPIEDIR)/messages-$(QMAKE_TARGET)-tr.po' && xgettext -C -n -a $$HEADERS $$SOURCES -o '$(OPIEDIR)/messages-$(QMAKE_TARGET)-allstrings.po' |
94 | 94 | ||
95 | ipk.target = ipk | 95 | ipk.target = ipk |
96 | ipk.commands = tmp=`mktemp -d /tmp/ipkg-opie.XXXXXXXXXX` && ( $(MAKE) INSTALL_ROOT="$$$$tmp" install && ipkg-build $$$$tmp; rm -rf $$$$tmp; ) | 96 | ipk.commands = tmp=`mktemp -d /tmp/ipkg-opie.XXXXXXXXXX` && ( $(MAKE) INSTALL_ROOT="$$$$tmp" install && ipkg-build $$$$tmp; rm -rf $$$$tmp; ) |
97 | 97 | ||
98 | QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk opie-lupdate opie-lrelease messages | 98 | QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk opie-lupdate opie-lrelease messages |
99 | CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX ) | 99 | CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX ) |
100 | contains( CONFTEST, y ){ | 100 | contains( CONFTEST, y ){ |
101 | QMAKE_LFLAGS += -Wl | 101 | QMAKE_LFLAGS += -Wl |
102 | LIBS -= -ldl | ||
103 | LIBS -= -lcrypt | ||
104 | LIBS -= -lm | ||
102 | } | 105 | } |
103 | else { | 106 | else { |
104 | QMAKE_LFLAGS += -Wl,-rpath=$$prefix/lib | 107 | QMAKE_LFLAGS += -Wl,-rpath=$$prefix/lib |
105 | # I am not sure whether it is a good idea to change the way plugins is build | 108 | # I am not sure whether it is a good idea to change the way plugins is build |
106 | # on linux. Therefore I remove the "plugin" term, which is needed by MacOS-X | 109 | # on linux. Therefore I remove the "plugin" term, which is needed by MacOS-X |
107 | CONFIG -= plugin | 110 | CONFIG -= plugin |
108 | } | 111 | } |
109 | QMAKE_LIBDIR += $(OPIEDIR)/lib | 112 | QMAKE_LIBDIR += $(OPIEDIR)/lib |
110 | 113 | ||
111 | MOC_DIR=.moc/$(PLATFORM) | 114 | MOC_DIR=.moc/$(PLATFORM) |
112 | OBJECTS_DIR=.obj/$(PLATFORM) | 115 | OBJECTS_DIR=.obj/$(PLATFORM) |
113 | 116 | ||
114 | #was here now at thetop | 117 | #was here now at thetop |
115 | #include ( $(OPIEDIR)/gen.pro ) | 118 | #include ( $(OPIEDIR)/gen.pro ) |