author | eilers <eilers> | 2004-03-31 18:09:23 (UTC) |
---|---|---|
committer | eilers <eilers> | 2004-03-31 18:09:23 (UTC) |
commit | 4910b98d6fc0725337b494a03fa05e18209b99e3 (patch) (unidiff) | |
tree | b6b6b18dc31da4d0ed4e4f7ec596a3f9a8599696 /include.pro | |
parent | f878d5938aadaa967800032ab985210f85ad6ae7 (diff) | |
download | opie-4910b98d6fc0725337b494a03fa05e18209b99e3.zip opie-4910b98d6fc0725337b494a03fa05e18209b99e3.tar.gz opie-4910b98d6fc0725337b494a03fa05e18209b99e3.tar.bz2 |
Removed all unnecessary dependencies to libopiedb2 and reimplemented
the conditional compilation of the SQL implementation.
Therefore, it is possible to remove all dependencies of libsqlite and libopiedb2 etc.
just by disabling the SQL support in the configuration !
If disabled, the usual xml-immplementation is used.
Thanks to mickeyl who already fixed the "backends.pro" ..
-rw-r--r-- | include.pro | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/include.pro b/include.pro index c19e2f0..ced5c9f 100644 --- a/include.pro +++ b/include.pro | |||
@@ -54,66 +54,75 @@ 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 | CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX ) | 100 | CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX ) |
101 | contains( CONFTEST, y ){ | 101 | contains( CONFTEST, y ){ |
102 | QMAKE_LFLAGS += -Wl | 102 | QMAKE_LFLAGS += -Wl |
103 | LIBS -= -ldl | 103 | LIBS -= -ldl |
104 | LIBS -= -lcrypt | 104 | LIBS -= -lcrypt |
105 | LIBS -= -lm | 105 | LIBS -= -lm |
106 | |||
107 | # Manual including indirect referenced libraries which are not loaded | ||
108 | # by the mac-linker automatically | ||
109 | CONFTEST = $$system( echo $CONFIG_SQL_PIM_BACKEND ) | ||
110 | contains( CONFTEST, y ){ | ||
111 | LIBS += -lopiedb2 -lqpe | ||
112 | } else { | ||
113 | LIBS += -lqpe | ||
114 | } | ||
106 | } | 115 | } |
107 | else { | 116 | else { |
108 | QMAKE_LFLAGS += -Wl,-rpath=$$prefix/lib | 117 | QMAKE_LFLAGS += -Wl,-rpath=$$prefix/lib |
109 | # I am not sure whether it is a good idea to change the way plugins is build | 118 | # I am not sure whether it is a good idea to change the way plugins is build |
110 | # on linux. Therefore I remove the "plugin" term, which is needed by MacOS-X | 119 | # on linux. Therefore I remove the "plugin" term, which is needed by MacOS-X |
111 | CONFIG -= plugin | 120 | CONFIG -= plugin |
112 | } | 121 | } |
113 | LIBS += -L$(OPIEDIR)/lib | 122 | LIBS += -L$(OPIEDIR)/lib |
114 | 123 | ||
115 | MOC_DIR=.moc/$(PLATFORM) | 124 | MOC_DIR=.moc/$(PLATFORM) |
116 | OBJECTS_DIR=.obj/$(PLATFORM) | 125 | OBJECTS_DIR=.obj/$(PLATFORM) |
117 | 126 | ||
118 | #was here now at thetop | 127 | #was here now at thetop |
119 | #include ( $(OPIEDIR)/gen.pro ) | 128 | #include ( $(OPIEDIR)/gen.pro ) |