author | wimpie <wimpie> | 2004-04-02 18:39:22 (UTC) |
---|---|---|
committer | wimpie <wimpie> | 2004-04-02 18:39:22 (UTC) |
commit | 4dc16eb2ba783d4f19e2c8c20ce0c128d715c440 (patch) (unidiff) | |
tree | ebe3a8f929251f9cbdabd3523879096fb83c1f2a | |
parent | 38f1377597f88d7bb381b750df53754d0f5b2924 (diff) | |
download | opie-4dc16eb2ba783d4f19e2c8c20ce0c128d715c440.zip opie-4dc16eb2ba783d4f19e2c8c20ce0c128d715c440.tar.gz opie-4dc16eb2ba783d4f19e2c8c20ce0c128d715c440.tar.bz2 |
changed QMAKE flag for non-quicklaunch build from -rpath to -rpath-link
-rw-r--r-- | include.pro | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include.pro b/include.pro index 203f6c3..01e4f3c 100644 --- a/include.pro +++ b/include.pro | |||
@@ -22,108 +22,109 @@ contains ( CONFIG, quick-app-bin ) { | |||
22 | DEFINES -= OPIE_APP_INTERFACE | 22 | DEFINES -= OPIE_APP_INTERFACE |
23 | message( Touching plugins/application/lib$${TARGET}.so.0 ) | 23 | message( Touching plugins/application/lib$${TARGET}.so.0 ) |
24 | system( touch $$(OPIEDIR)/plugins/application/lib$${TARGET}.so.0 ) | 24 | system( touch $$(OPIEDIR)/plugins/application/lib$${TARGET}.so.0 ) |
25 | } | 25 | } |
26 | 26 | ||
27 | 27 | ||
28 | contains( TEMPLATE, lib ) { | 28 | contains( TEMPLATE, lib ) { |
29 | target.path = $$prefix/lib | 29 | target.path = $$prefix/lib |
30 | } | 30 | } |
31 | !contains( TEMPLATE, lib ) { | 31 | !contains( TEMPLATE, lib ) { |
32 | target.path = $$prefix/bin | 32 | target.path = $$prefix/bin |
33 | } | 33 | } |
34 | INSTALLS += target | 34 | INSTALLS += target |
35 | 35 | ||
36 | # ipkg control files | 36 | # ipkg control files |
37 | control.path = /CONTROL | 37 | control.path = /CONTROL |
38 | control.files = control postinst prerm postrm preinst conffiles | 38 | control.files = control postinst prerm postrm preinst conffiles |
39 | INSTALLS += control | 39 | INSTALLS += control |
40 | 40 | ||
41 | # images, default is $$prefix/pics/$$TARGET | 41 | # images, default is $$prefix/pics/$$TARGET |
42 | pics.path = $$prefix/pics/$$TARGET | 42 | pics.path = $$prefix/pics/$$TARGET |
43 | pics.files = pics/* | 43 | pics.files = pics/* |
44 | INSTALLS += pics | 44 | INSTALLS += pics |
45 | 45 | ||
46 | # sounds, default path is $$prefix/sounds/$$TARGET | 46 | # sounds, default path is $$prefix/sounds/$$TARGET |
47 | sounds.path = $$prefix/sounds/$$TARGET | 47 | sounds.path = $$prefix/sounds/$$TARGET |
48 | sounds.files = sounds/* | 48 | sounds.files = sounds/* |
49 | INSTALLS += sounds | 49 | INSTALLS += sounds |
50 | 50 | ||
51 | # init scripts, default path is /etc/init.d | 51 | # init scripts, default path is /etc/init.d |
52 | init.path = /etc/init.d | 52 | init.path = /etc/init.d |
53 | init.files = init.d/* | 53 | init.files = init.d/* |
54 | INSTALLS += init | 54 | INSTALLS += init |
55 | 55 | ||
56 | # data, default path is /usr/share/$$TARGET | 56 | # data, default path is /usr/share/$$TARGET |
57 | data.path = /usr/share/$$TARGET | 57 | data.path = /usr/share/$$TARGET |
58 | data.files = share/* | 58 | data.files = share/* |
59 | INSTALLS += data | 59 | INSTALLS += data |
60 | 60 | ||
61 | etc.path = $$prefix/etc/ | 61 | etc.path = $$prefix/etc/ |
62 | etc.files = etc/* | 62 | etc.files = etc/* |
63 | INSTALLS += etc | 63 | INSTALLS += etc |
64 | 64 | ||
65 | apps.path = $$prefix/apps/ | 65 | apps.path = $$prefix/apps/ |
66 | apps.files = apps/* | 66 | apps.files = apps/* |
67 | INSTALLS += apps | 67 | INSTALLS += apps |
68 | 68 | ||
69 | # sounds, default path is $$prefix/sounds/$$TARGET | 69 | # sounds, default path is $$prefix/sounds/$$TARGET |
70 | sounds.path = $$prefix/sounds/$$TARGET | 70 | sounds.path = $$prefix/sounds/$$TARGET |
71 | sounds.files = sounds/* | 71 | sounds.files = sounds/* |
72 | INSTALLS += sounds | 72 | INSTALLS += sounds |
73 | 73 | ||
74 | # anything in nonstandard paths | 74 | # anything in nonstandard paths |
75 | root.path = / | 75 | root.path = / |
76 | root.files = root/* | 76 | root.files = root/* |
77 | INSTALLS += root | 77 | INSTALLS += root |
78 | 78 | ||
79 | # new targets | 79 | # new targets |
80 | opie-lupdate.target = opie-lupdate | 80 | opie-lupdate.target = opie-lupdate |
81 | opie-lupdate.commands = opie-lupdate $(PRO) | 81 | opie-lupdate.commands = opie-lupdate $(PRO) |
82 | 82 | ||
83 | opie-lrelease.target = opie-lrelease | 83 | opie-lrelease.target = opie-lrelease |
84 | opie-lrelease.commands = opie-lrelease $(PRO) | 84 | opie-lrelease.commands = opie-lrelease $(PRO) |
85 | 85 | ||
86 | lupdate.target = lupdate | 86 | lupdate.target = lupdate |
87 | lupdate.commands = lupdate -noobsolete $(PRO) | 87 | lupdate.commands = lupdate -noobsolete $(PRO) |
88 | 88 | ||
89 | lrelease.target = lrelease | 89 | lrelease.target = lrelease |
90 | lrelease.commands = lrelease $(PRO) | 90 | lrelease.commands = lrelease $(PRO) |
91 | 91 | ||
92 | # new message target to get all strings from the apps with and without tr | 92 | # new message target to get all strings from the apps with and without tr |
93 | messages.target = messages | 93 | messages.target = messages |
94 | 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 | 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' |
95 | 95 | ||
96 | ipk.target = ipk | 96 | ipk.target = ipk |
97 | ipk.commands = tmp=`mktemp -d /tmp/ipkg-opie.XXXXXXXXXX` && ( $(MAKE) INSTALL_ROOT="$$$$tmp" install && ipkg-build $$$$tmp; rm -rf $$$$tmp; ) | 97 | ipk.commands = tmp=`mktemp -d /tmp/ipkg-opie.XXXXXXXXXX` && ( $(MAKE) INSTALL_ROOT="$$$$tmp" install && ipkg-build $$$$tmp; rm -rf $$$$tmp; ) |
98 | 98 | ||
99 | QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk opie-lupdate opie-lrelease messages | 99 | QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk opie-lupdate opie-lrelease messages |
100 | 100 | ||
101 | CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX ) | 101 | CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX ) |
102 | contains( CONFTEST, y ){ | 102 | contains( CONFTEST, y ){ |
103 | QMAKE_LFLAGS += -Wl | 103 | QMAKE_LFLAGS += -Wl |
104 | LIBS -= -ldl | 104 | LIBS -= -ldl |
105 | LIBS -= -lcrypt | 105 | LIBS -= -lcrypt |
106 | LIBS -= -lm | 106 | LIBS -= -lm |
107 | 107 | ||
108 | # Manual including indirect referenced libraries which are not loaded | 108 | # Manual including indirect referenced libraries which are not loaded |
109 | # by the mac-linker automatically | 109 | # by the mac-linker automatically |
110 | CONFTEST = $$system( echo $CONFIG_SQL_PIM_BACKEND ) | 110 | CONFTEST = $$system( echo $CONFIG_SQL_PIM_BACKEND ) |
111 | contains( CONFTEST, y ){ | 111 | contains( CONFTEST, y ){ |
112 | LIBS += -lopiedb2 -lqpe | 112 | LIBS += -lopiedb2 -lqpe |
113 | } else { | 113 | } else { |
114 | LIBS += -lqpe | 114 | LIBS += -lqpe |
115 | } | 115 | } |
116 | } | 116 | } |
117 | else { | 117 | else { |
118 | |||
118 | QMAKE_LFLAGS += -Wl,-rpath-link,$$prefix/lib | 119 | QMAKE_LFLAGS += -Wl,-rpath-link,$$prefix/lib |
119 | # I am not sure whether it is a good idea to change the way plugins is build | 120 | # I am not sure whether it is a good idea to change the way plugins is build |
120 | # on linux. Therefore I remove the "plugin" term, which is needed by MacOS-X | 121 | # on linux. Therefore I remove the "plugin" term, which is needed by MacOS-X |
121 | CONFIG -= plugin | 122 | CONFIG -= plugin |
122 | } | 123 | } |
123 | LIBS += -L$(OPIEDIR)/lib | 124 | LIBS += -L$(OPIEDIR)/lib |
124 | 125 | ||
125 | MOC_DIR=.moc/$(PLATFORM) | 126 | MOC_DIR=.moc/$(PLATFORM) |
126 | OBJECTS_DIR=.obj/$(PLATFORM) | 127 | OBJECTS_DIR=.obj/$(PLATFORM) |
127 | 128 | ||
128 | #was here now at thetop | 129 | #was here now at thetop |
129 | #include ( $(OPIEDIR)/gen.pro ) | 130 | #include ( $(OPIEDIR)/gen.pro ) |