summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kabc/converter/sharpdtm/sharpdtmE.pro30
-rw-r--r--kabc/plugins/sharpdtm/sharpdtmE.pro8
-rw-r--r--kabc/plugins/sharpdtm/sharpdtmconverter.cpp (renamed from kabc/converter/sharpdtm/sharpdtmconverter.cpp)0
-rw-r--r--kabc/plugins/sharpdtm/sharpdtmconverter.h (renamed from kabc/converter/sharpdtm/sharpdtmconverter.h)0
4 files changed, 5 insertions, 33 deletions
diff --git a/kabc/converter/sharpdtm/sharpdtmE.pro b/kabc/converter/sharpdtm/sharpdtmE.pro
deleted file mode 100644
index 89b4e64..0000000
--- a/kabc/converter/sharpdtm/sharpdtmE.pro
+++ b/dev/null
@@ -1,30 +0,0 @@
1TEMPLATE = lib
2INCLUDEPATH += . ../.. $(SHARPDTMSDK)/include ../../../microkde ../../../microkde/kdecore $(QPEDIR)/include
3#CONFIG += staticlib
4OBJECTS_DIR = obj/$(PLATFORM)
5MOC_DIR = moc/$(PLATFORM)
6
7#for static linkage, put it here
8#DESTDIR=../../lib/$(PLATFORM)
9
10#for dynamic linkage, put it here
11DESTDIR=$(QPEDIR)/lib
12
13LIBS += -lmicrokde
14LIBS += -lmicrokabc
15LIBS += -L$(QPEDIR)/lib
16#LIBS += -lqpepim
17LIBS += -lqpe
18LIBS += -lzdtm
19
20TARGET = microkabc_sharpdtmconverter
21
22# Input
23
24HEADERS += \
25 sharpdtmconverter.h \
26
27
28SOURCES += \
29 sharpdtmconverter.cpp \
30
diff --git a/kabc/plugins/sharpdtm/sharpdtmE.pro b/kabc/plugins/sharpdtm/sharpdtmE.pro
index a03454f..54ef083 100644
--- a/kabc/plugins/sharpdtm/sharpdtmE.pro
+++ b/kabc/plugins/sharpdtm/sharpdtmE.pro
@@ -1,29 +1,31 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2CONFIG += qt warn_on 2CONFIG += qt warn_on
3TARGET = microkabc_sharpdtm 3TARGET = microkabc_sharpdtm
4 4
5INCLUDEPATH += ../.. $(SHARPDTMSDK)/include ../../converter/sharpdtm ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../qtcompat $(QPEDIR)/include 5INCLUDEPATH += ../.. $(SHARPDTMSDK)/include ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../qtcompat $(QPEDIR)/include
6 6
7 7
8OBJECTS_DIR = obj/$(PLATFORM) 8OBJECTS_DIR = obj/$(PLATFORM)
9MOC_DIR = moc/$(PLATFORM) 9MOC_DIR = moc/$(PLATFORM)
10DESTDIR = $(QPEDIR)/lib 10DESTDIR = $(QPEDIR)/lib
11LIBS += -lmicrokde 11LIBS += -lmicrokde
12LIBS += -lmicrokabc 12LIBS += -lmicrokabc
13LIBS += -L$(QPEDIR)/lib 13LIBS += -L$(QPEDIR)/lib
14LIBS += -lqpe 14LIBS += -lqpe
15LIBS += -lqte 15LIBS += -lqte
16LIBS += -lzdtm 16LIBS += -lzdtm
17LIBS += -lmicrokabc_sharpdtmconverter 17
18 18
19 19
20INTERFACES = \ 20INTERFACES = \
21 21
22HEADERS = \ 22HEADERS = \
23 resourcesharpdtm.h \ 23 resourcesharpdtm.h \
24 resourcesharpdtmconfig.h \ 24 resourcesharpdtmconfig.h \
25 sharpdtmconverter.h
25 26
26SOURCES = \ 27SOURCES = \
27 resourcesharpdtm.cpp \ 28 resourcesharpdtm.cpp \
28 resourcesharpdtmconfig.cpp \ 29 resourcesharpdtmconfig.cpp \
29 30 sharpdtmconverter.cpp
31
diff --git a/kabc/converter/sharpdtm/sharpdtmconverter.cpp b/kabc/plugins/sharpdtm/sharpdtmconverter.cpp
index 8f8334e..8f8334e 100644
--- a/kabc/converter/sharpdtm/sharpdtmconverter.cpp
+++ b/kabc/plugins/sharpdtm/sharpdtmconverter.cpp
diff --git a/kabc/converter/sharpdtm/sharpdtmconverter.h b/kabc/plugins/sharpdtm/sharpdtmconverter.h
index 99e0413..99e0413 100644
--- a/kabc/converter/sharpdtm/sharpdtmconverter.h
+++ b/kabc/plugins/sharpdtm/sharpdtmconverter.h