| author | mickeyl <mickeyl> | 2004-03-26 17:36:46 (UTC) |
|---|---|---|
| committer | mickeyl <mickeyl> | 2004-03-26 17:36:46 (UTC) |
| commit | 5df13d7b2acd41c54bed6253afac827bc864ea5a (patch) (side-by-side diff) | |
| tree | 8c3672a0be7f09094c0ec6658f98fd762108c17f | |
| parent | 5d2442fc6e0fb992b9fe3998cc7b9ee6dffb8e2b (diff) | |
| download | opie-5df13d7b2acd41c54bed6253afac827bc864ea5a.zip opie-5df13d7b2acd41c54bed6253afac827bc864ea5a.tar.gz opie-5df13d7b2acd41c54bed6253afac827bc864ea5a.tar.bz2 | |
conditionally link against -lopiedb, i.e. only when ENABLE_SQL_PIM_BACKEND=y
| -rw-r--r-- | Rules.make | 5 | ||||
| -rw-r--r-- | include.pro | 2 | ||||
| -rw-r--r-- | libopie2/opiepim/opiepim.pro | 7 |
3 files changed, 11 insertions, 3 deletions
@@ -27,12 +27,17 @@ ifneq ($(CONFIG_QUICK_LAUNCH),) else echo contains\( CONFIG, quick-app \) \{ >> $@ echo CONFIG -= quick-app >> $@ echo CONFIG += quick-app-bin >> $@ echo \} >> $@ endif +ifeq ($(CONFIG_SQL_PIM_BACKEND),y) + echo ENABLE_SQL_PIM_BACKEND=$(CONFIG_SQL_PIM_BACKEND) >> $@ +else + echo ENABLE_SQL_PIM_BACKEND=n >> $@ +endif ifeq ($(CONFIG_OPIE_NO_OVERRIDE_QT),y) echo CONFIG += no-override >> $@ endif ifeq ($(CONFIG_OPIE_NO_BUILTIN_SHUTDOWN),y) echo DEFINES += OPIE_NO_BUILTIN_SHUTDOWN >> $@ endif diff --git a/include.pro b/include.pro index c0019b0..c19e2f0 100644 --- a/include.pro +++ b/include.pro @@ -107,13 +107,13 @@ LIBS -= -lm else { QMAKE_LFLAGS += -Wl,-rpath=$$prefix/lib # I am not sure whether it is a good idea to change the way plugins is build # on linux. Therefore I remove the "plugin" term, which is needed by MacOS-X CONFIG -= plugin } -QMAKE_LIBDIR += $(OPIEDIR)/lib +LIBS += -L$(OPIEDIR)/lib MOC_DIR=.moc/$(PLATFORM) OBJECTS_DIR=.obj/$(PLATFORM) #was here now at thetop #include ( $(OPIEDIR)/gen.pro ) diff --git a/libopie2/opiepim/opiepim.pro b/libopie2/opiepim/opiepim.pro index b341819..c328315 100644 --- a/libopie2/opiepim/opiepim.pro +++ b/libopie2/opiepim/opiepim.pro @@ -5,21 +5,24 @@ HEADERS = opimcontact.h opimcontactfields.h opimrecord.h opimtodo.h opimnoti opimnotifymanager.h opimevent.h SOURCES = opimcontact.cpp opimcontactfields.cpp opimrecord.cpp opimtodo.cpp opimnotify.cpp \ opimnotifymanager.cpp opimevent.cpp INTERFACES = TARGET = opiepim2 -VERSION = 1.8.3 +VERSION = 1.8.4 INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lopiecore2 -lopiedb2 +LIBS += -lopiecore2 include ( core/core.pro ) include ( core/backends/backends.pro ) include ( ui/ui.pro ) +contains( ENABLE_SQL_PIM_BACKEND, y ) + LIBS += -lopiedb2 + !contains( platform, x11 ) { include ( $(OPIEDIR)/include.pro ) } contains( platform, x11 ) { LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib |