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 | |||
@@ -94,16 +94,19 @@ messages.commands = xgettext -C -n -ktr -kQT_TRANSLATE_NOOP $$HEADERS $$SOURCES | |||
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 |