summaryrefslogtreecommitdiff
authorMichael Krelin <hacker@klever.net>2007-07-15 18:42:06 (UTC)
committer Michael Krelin <hacker@klever.net>2007-07-15 18:42:06 (UTC)
commit655a28b22bfb5cb2b8080eaf8f3c3d0ef769882e (patch) (unidiff)
tree833271e2817983b585d2e062de51e45adc571d00
parent9dacb2c97939fad573446c0858f6b536b3d7bf15 (diff)
downloadopie-655a28b22bfb5cb2b8080eaf8f3c3d0ef769882e.zip
opie-655a28b22bfb5cb2b8080eaf8f3c3d0ef769882e.tar.gz
opie-655a28b22bfb5cb2b8080eaf8f3c3d0ef769882e.tar.bz2
link against openobex regardless of bluetooth being enabled
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/obex/obex.pro4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/obex/obex.pro b/core/obex/obex.pro
index 05118ab..2372d12 100644
--- a/core/obex/obex.pro
+++ b/core/obex/obex.pro
@@ -2,23 +2,23 @@ TEMPLATE = lib
2 CONFIG += qt warn_on 2 CONFIG += qt warn_on
3 HEADERS= obex.h obexhandler.h obexsend.h receiver.h obeximpl.h obexbase.h obexserver.h 3 HEADERS= obex.h obexhandler.h obexsend.h receiver.h obeximpl.h obexbase.h obexserver.h
4 SOURCES= obex.cpp obexsend.cpp obexhandler.cpp receiver.cpp obeximpl.cpp obexbase.cpp obexserver.cpp 4 SOURCES= obex.cpp obexsend.cpp obexhandler.cpp receiver.cpp obeximpl.cpp obexbase.cpp obexserver.cpp
5 TARGET = opieobex 5 TARGET = opieobex
6 DESTDIR = $(OPIEDIR)/plugins/obex 6 DESTDIR = $(OPIEDIR)/plugins/obex
7INTERFACES = obexsendbase.ui 7INTERFACES = obexsendbase.ui
8INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/core/launcher 8INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/core/launcher
9DEPENDPATH += 9DEPENDPATH +=
10LIBS += -lqpe -lopiecore2 10LIBS += -lqpe -lopiecore2 -lopenobex
11 VERSION = 0.0.4 11 VERSION = 0.0.4
12 12
13include( $(OPIEDIR)/include.pro ) 13include( $(OPIEDIR)/include.pro )
14target.path = $$prefix/plugins/applets 14target.path = $$prefix/plugins/applets
15 15
16#FIXME: These parameters are used if bluetooth is used 16#FIXME: These parameters are used if bluetooth is used
17CONFTEST = $$system( echo $CONFIG_LIBOPIETOOTH ) 17CONFTEST = $$system( echo $CONFIG_LIBOPIETOOTH )
18contains( CONFTEST, y ){ 18contains( CONFTEST, y ){
19HEADERS += btobex.h 19HEADERS += btobex.h
20SOURCES += btobex.cpp 20SOURCES += btobex.cpp
21INCLUDEPATH += $(OPIEDIR)/noncore/net/opietooth/lib 21INCLUDEPATH += $(OPIEDIR)/noncore/net/opietooth/lib
22LIBS += -lopietooth1 -lbluetooth -lopenobex 22LIBS += -lopietooth1 -lbluetooth
23DEFINES += BLUETOOTH 23DEFINES += BLUETOOTH
24} 24}