summaryrefslogtreecommitdiff
authoreilers <eilers>2003-11-03 17:35:14 (UTC)
committer eilers <eilers>2003-11-03 17:35:14 (UTC)
commitd8575540352e69a29ce662feb0a53623a4a89216 (patch) (unidiff)
treeddf7cc9bf62d5f35b4c490b1c9a3c1c8f2200b00
parentd34dc773591a2d467c68875a68a671d6a809f861 (diff)
downloadopie-d8575540352e69a29ce662feb0a53623a4a89216.zip
opie-d8575540352e69a29ce662feb0a53623a4a89216.tar.gz
opie-d8575540352e69a29ce662feb0a53623a4a89216.tar.bz2
Oops.. Removed -ldl wasn't a good idea.. Linux compiles again..
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--include.pro3
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
@@ -54,62 +54,65 @@ INSTALLS += init
54 54
55# data, default path is /usr/share/$$TARGET 55# data, default path is /usr/share/$$TARGET
56data.path = /usr/share/$$TARGET 56data.path = /usr/share/$$TARGET
57data.files = share/* 57data.files = share/*
58INSTALLS += data 58INSTALLS += data
59 59
60etc.path = $$prefix/etc/ 60etc.path = $$prefix/etc/
61etc.files = etc/* 61etc.files = etc/*
62INSTALLS += etc 62INSTALLS += etc
63 63
64apps.path = $$prefix/apps/ 64apps.path = $$prefix/apps/
65apps.files = apps/* 65apps.files = apps/*
66INSTALLS += apps 66INSTALLS += apps
67 67
68# sounds, default path is $$prefix/sounds/$$TARGET 68# sounds, default path is $$prefix/sounds/$$TARGET
69sounds.path = $$prefix/sounds/$$TARGET 69sounds.path = $$prefix/sounds/$$TARGET
70sounds.files = sounds/* 70sounds.files = sounds/*
71INSTALLS += sounds 71INSTALLS += sounds
72 72
73# anything in nonstandard paths 73# anything in nonstandard paths
74root.path = / 74root.path = /
75root.files = root/* 75root.files = root/*
76INSTALLS += root 76INSTALLS += root
77 77
78# new targets 78# new targets
79opie-lupdate.target = opie-lupdate 79opie-lupdate.target = opie-lupdate
80opie-lupdate.commands = opie-lupdate $(PRO) 80opie-lupdate.commands = opie-lupdate $(PRO)
81 81
82opie-lrelease.target = opie-lrelease 82opie-lrelease.target = opie-lrelease
83opie-lrelease.commands = opie-lrelease $(PRO) 83opie-lrelease.commands = opie-lrelease $(PRO)
84 84
85lupdate.target = lupdate 85lupdate.target = lupdate
86lupdate.commands = lupdate -noobsolete $(PRO) 86lupdate.commands = lupdate -noobsolete $(PRO)
87 87
88lrelease.target = lrelease 88lrelease.target = lrelease
89lrelease.commands = lrelease $(PRO) 89lrelease.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
92messages.target = messages 92messages.target = messages
93messages.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' 93messages.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
95ipk.target = ipk 95ipk.target = ipk
96ipk.commands = tmp=`mktemp -d /tmp/ipkg-opie.XXXXXXXXXX` && ( $(MAKE) INSTALL_ROOT="$$$$tmp" install && ipkg-build $$$$tmp; rm -rf $$$$tmp; ) 96ipk.commands = tmp=`mktemp -d /tmp/ipkg-opie.XXXXXXXXXX` && ( $(MAKE) INSTALL_ROOT="$$$$tmp" install && ipkg-build $$$$tmp; rm -rf $$$$tmp; )
97 97
98QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk opie-lupdate opie-lrelease messages 98QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk opie-lupdate opie-lrelease messages
99CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX ) 99CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX )
100contains( CONFTEST, y ){ 100contains( CONFTEST, y ){
101QMAKE_LFLAGS += -Wl 101QMAKE_LFLAGS += -Wl
102LIBS -= -ldl
103LIBS -= -lcrypt
104LIBS -= -lm
102} 105}
103else { 106else {
104QMAKE_LFLAGS += -Wl,-rpath=$$prefix/lib 107QMAKE_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
107CONFIG -= plugin 110CONFIG -= plugin
108} 111}
109QMAKE_LIBDIR += $(OPIEDIR)/lib 112QMAKE_LIBDIR += $(OPIEDIR)/lib
110 113
111MOC_DIR=.moc/$(PLATFORM) 114MOC_DIR=.moc/$(PLATFORM)
112OBJECTS_DIR=.obj/$(PLATFORM) 115OBJECTS_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 )