changed package building and some lib names

12 files changed, 13 insertions, 17 deletions

diff --git a/kabc/formats/binary/kabcformat_binaryE.pro b/kabc/formats/binary/kabcformat_binaryE.pro
index 2d9594d..6d300eb 100644
--- a/kabc/formats/binary/kabcformat_binaryE.pro
+++ b/kabc/formats/binary/kabcformat_binaryE.pro
@@ -1,21 +1,21 @@
 TEMPLATE	= lib
 CONFIG += qt warn_on release
 #release debug
 
 TARGET = microkabcformat_binary
 #INCLUDEPATH += . ./vcard/include ./vcard/include/generated ../microkde ../microkde/kdecore ../microkde/kdeui ../microkde/kio/kfile ../qtcompat
 INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../qtcompat
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc
 DESTDIR = $(QPEDIR)/lib
-LIBS += -lmicrokde -lmicrokabc
+LIBS += -lmicrokde -lkamicrokabc
 LIBS += -L$(QPEDIR)/lib
 DEFINES += KAB_EMBEDDED
 
 INTERFACES = \
 
 HEADERS = \
  binaryformat.h
  
 SOURCES = \
  binaryformat.cpp
diff --git a/kabc/kabcE.pro b/kabc/kabcE.pro
index b360e8c..0a26e0b 100644
--- a/kabc/kabcE.pro
+++ b/kabc/kabcE.pro
@@ -1,67 +1,67 @@
 TEMPLATE	= lib
 CONFIG += qt warn_on 
-TARGET = microkabc
+TARGET = kamicrokabc
 
 
 INCLUDEPATH += . $(KDEPIMDIR) vcard/include vcard/include/generated $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kdeui $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/libkdepim $(KDEPIMDIR)/qtcompat $(QPEDIR)/include
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
 LIBS += -lmicrokde 
 LIBS += -lmicrokdepim 
 #LIBS += -lldap
 LIBS += -L$(QPEDIR)/lib
 DEFINES += KAB_EMBEDDED
 
 INTERFACES = \
 
 HEADERS = \
  address.h \
  addressbook.h \
  addressee.h \
  addresseedialog.h \
  addresseelist.h \
  addresseeview.h \
  agent.h \
  distributionlist.h \
  distributionlistdialog.h \
  distributionlisteditor.h \
  field.h \
  formatfactory.h \
  formatplugin.h \
  geo.h \
  key.h \
  phonenumber.h \
  picture.h \
  plugin.h \
  resource.h \
  secrecy.h \
  sound.h \
  stdaddressbook.h \
  syncprefwidget.h \
  timezone.h \
  tmpaddressbook.h \
  vcardconverter.h \
  vcard21parser.h \
  vcardformatimpl.h \
  vcardformatplugin.h \
  vcardparser/vcardline.h \
  vcardparser/vcard.h \
  vcardparser/vcardtool.h \
  vcardparser/vcardparser.h \
  vcard/include/VCardAdrParam.h \
  vcard/include/VCardAdrValue.h \
  vcard/include/VCardAgentParam.h \
  vcard/include/VCardContentLine.h \
  vcard/include/VCardDateParam.h \
  vcard/include/VCardDateValue.h \
  vcard/include/VCardEmailParam.h \
  vcard/include/VCardGeoValue.h \
  vcard/include/VCardGroup.h \
  vcard/include/VCardImageParam.h \
  vcard/include/VCardImageValue.h \
  vcard/include/VCardLangValue.h \
  vcard/include/VCardNValue.h \
  vcard/include/VCardParam.h \
  vcard/include/VCardPhoneNumberValue.h \
  vcard/include/VCardSourceParam.h \
diff --git a/kabc/plugins/dir/dirE.pro b/kabc/plugins/dir/dirE.pro
index cda4e2f..3c5e87f 100644
--- a/kabc/plugins/dir/dirE.pro
+++ b/kabc/plugins/dir/dirE.pro
@@ -1,21 +1,21 @@
 TEMPLATE	= lib
 CONFIG += qt warn_on release
 #release debug
 
 TARGET = microkabc_dir
 INCLUDEPATH += $(KDEPIMDIR)/kabc $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
-LIBS += -lmicrokde -lmicrokabc
+LIBS += -lmicrokde -lkamicrokabc
 LIBS += -L$(QPEDIR)/lib
 
 INTERFACES = \
 
 HEADERS = \
  resourcedir.h \
  resourcedirconfig.h
  
 SOURCES = \
  resourcedir.cpp \
  resourcedirconfig.cpp
diff --git a/kabc/plugins/file/fileE.pro b/kabc/plugins/file/fileE.pro
index 16707e5..438076e 100644
--- a/kabc/plugins/file/fileE.pro
+++ b/kabc/plugins/file/fileE.pro
@@ -1,21 +1,21 @@
 TEMPLATE	= lib
 CONFIG += qt warn_on release
 #release debug
 
 TARGET = microkabc_file
 INCLUDEPATH += $(KDEPIMDIR)/kabc $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
-LIBS += -lmicrokde -lmicrokabc
+LIBS += -lmicrokde -lkamicrokabc
 LIBS += -L$(QPEDIR)/lib
 
 INTERFACES = \
 
 HEADERS = \
  resourcefile.h \
  resourcefileconfig.h
  
 SOURCES = \
  resourcefile.cpp \
  resourcefileconfig.cpp
diff --git a/kabc/plugins/opie/opieE.pro b/kabc/plugins/opie/opieE.pro
index b7ecbc0..c506477 100644
--- a/kabc/plugins/opie/opieE.pro
+++ b/kabc/plugins/opie/opieE.pro
@@ -1,31 +1,31 @@
 TEMPLATE	= lib
 CONFIG += qt warn_on
 #release debug
 TARGET = microkabc_opie
 
 INCLUDEPATH += $(KDEPIMDIR)/kabc $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat $(QPEDIR)/include $(OPIEDIR)/include
 
 
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
 LIBS += -lmicrokde 
-LIBS += -lmicrokabc
+LIBS += -lkamicrokabc
 LIBS += -L$(QPEDIR)/lib
 LIBS += -L$(OPIEDIR)/lib
 LIBS += -lopie
 LIBS += -lqpe
 LIBS += -lqte
 
 INTERFACES = \
 
 HEADERS = \
  resourceopie.h \
  resourceopieconfig.h \
  opieconverter.h \
  
 SOURCES = \
  resourceopie.cpp \
  resourceopieconfig.cpp \
  opieconverter.cpp \
 
diff --git a/kabc/plugins/qtopia/qtopiaE.pro b/kabc/plugins/qtopia/qtopiaE.pro
index c0aa960..a15e9ba 100644
--- a/kabc/plugins/qtopia/qtopiaE.pro
+++ b/kabc/plugins/qtopia/qtopiaE.pro
@@ -1,27 +1,27 @@
 TEMPLATE	= lib
 CONFIG += qt warn_on
 
 TARGET = microkabc_qtopia
 
 INCLUDEPATH += $(KDEPIMDIR) $(KDEPIMDIR)/kabc $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat $(QPEDIR)/include
 
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
 LIBS += -lmicrokde 
-LIBS += -lmicrokabc
+LIBS += -lkamicrokabc
 LIBS += -L$(QPEDIR)/lib
 LIBS += -lqpepim
 LIBS += -lqpe
 
 INTERFACES = \
 
 HEADERS = \
  resourceqtopia.h \
  resourceqtopiaconfig.h \
  qtopiaconverter.h
 
 SOURCES = \
  resourceqtopia.cpp \
  resourceqtopiaconfig.cpp \
  qtopiaconverter.cpp 
diff --git a/kabc/plugins/sharpdtm/sharpdtmE.pro b/kabc/plugins/sharpdtm/sharpdtmE.pro
index b80a1da..46fe417 100644
--- a/kabc/plugins/sharpdtm/sharpdtmE.pro
+++ b/kabc/plugins/sharpdtm/sharpdtmE.pro
@@ -1,36 +1,36 @@
 TEMPLATE	= lib
 CONFIG += qt warn_on
 TARGET = microkabc_sharpdtm
 
 INCLUDEPATH += $(KDEPIMDIR) $(KDEPIMDIR)/kabc $(SHARPDTMSDK)/include $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat $(QPEDIR)/include 
 
 
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
 LIBS += -lmicrokde 
-LIBS += -lmicrokabc
+LIBS += -lkamicrokabc
 LIBS += -lmicrokdepim
 LIBS += -lmicroqtcompat
-LIBS += -lmicrokcal
+#LIBS += -lmicrokcal
 LIBS += -L$(QPEDIR)/lib
 LIBS += -ljpeg
 LIBS += -lqpe
 LIBS += -lqte
 LIBS += -lzdtm
 LIBS += -lsl
 
 
 
 INTERFACES = \
 
 HEADERS = \
  resourcesharpdtm.h \
  resourcesharpdtmconfig.h \
  sharpdtmconverter.h 
  
 SOURCES = \
  resourcesharpdtm.cpp \
  resourcesharpdtmconfig.cpp \
  sharpdtmconverter.cpp
 
diff --git a/kaddressbook.control b/kaddressbook.control
index 542ce1e..6a9855f 100644
--- a/kaddressbook.control
+++ b/kaddressbook.control
@@ -1,14 +1,14 @@
-Files: bin/kapi  apps/Pim/kaddressbook.desktop  pics/kdepim/kaddressbook/*  
+Files: bin/kapi  apps/Pim/kaddressbook.desktop  pics/kdepim/kaddressbook/*  lib/libkamicro*
 
 Priority: optional
 Section: qpe/pim
 Maintainer: Lutz Rogowski <lutz@pi-sync.net>
 Architecture: arm
 Version: $KDEPIM_VERSION
 License: GPL
 Depends: 
 Description: KOrganizer/Pi and Kaddressbook/Pi
  The embedded version of KOrganizer/Platform-independend, 
     the KDE calendar and scheduling program
   optimized for 640x480 and 320x240 resolution
     on Zaurus PDA
diff --git a/kaddressbook/kaddressbookE.pro b/kaddressbook/kaddressbookE.pro
index 7eb85fd..7400251 100644
--- a/kaddressbook/kaddressbookE.pro
+++ b/kaddressbook/kaddressbookE.pro
@@ -1,83 +1,83 @@
 TEMPLATE	= app
 CONFIG		+= qt warn_on 
 
 
 TARGET		= kapi
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR=$(QPEDIR)/bin
 
 INCLUDEPATH += . ./details ./features ./xxport ../libkdepim ../microkde ../microkde/kdecore ../microkde/kutils ../microkde/kio/kfile ../microkde/kio/kio ../microkde/kdeui ../microkde/kresources ../kabc ../qtcompat ../ interfaces $(QPEDIR)/include
 DEFINES += KAB_EMBEDDED KAB_NOSPLITTER
 #DEFINES += KORG_NODND KORG_NOPLUGINS KORG_NOKABC KORG_NOARCHIVE KORG_NOMAIL
 #DEFINES += KORG_NOPRINTER  KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER
 #DEFINES += KORG_NOLVALTERNATION
 LIBS += -lmicrokdepim
 #LIBS += -lmicrokcal
 LIBS += -lmicrokde
 LIBS += -lmicroqtcompat
-LIBS += -lmicrokabc
+LIBS += -lkamicrokabc
 LIBS += -lqpe
 LIBS += -ljpeg
 LIBS += $(QTOPIALIB)
 LIBS += -L$(QPEDIR)/lib
 LIBS += -Wl,-export-dynamic
 LIBS += $(GCC3EXTRALIB1)
 LIBS += $(GCC3EXTRALIB2)
 
 INTERFACES = \
 # filteredit_base.ui \
 # kofilterview_base.ui \
 
 HEADERS = \
 features/mergewidget.h \
 features/distributionlistwidget.h \
 kcmconfigs/addresseewidget.h \
 kcmconfigs/extensionconfigdialog.h \
 kcmconfigs/kcmkabconfig.h \
 kcmconfigs/kabconfigwidget.h \
 addresseeeditordialog.h \
 addresseeeditorwidget.h \
 addresseditwidget.h \
 addresseeconfig.h \
 addresseeutil.h \
 emaileditwidget.h \
 filtereditdialog.h \
 kaddressbookmain.h \
 kabprefs.h \
 kabcore.h \
 viewmanager.h \
 extensionmanager.h \
 extensionwidget.h \
 kaddressbookview.h \
 geowidget.h \
 imagewidget.h \
 incsearchwidget.h \
 jumpbuttonbar.h \
 phoneeditwidget.h \
 secrecywidget.h \
 keywidget.h \
 nameeditdialog.h \
 filter.h \
 addviewdialog.h \
 configurewidget.h \
 viewconfigurewidget.h \
 viewconfigurefieldspage.h \
 viewconfigurefilterpage.h \
 typecombo.h \
 undo.h \
 undocmds.h \
 xxportmanager.h \
 xxportobject.h \
 xxportselectdialog.h \
 details/detailsviewcontainer.h \
 details/look_basic.h \
 details/look_html.h \
 views/kaddressbookiconview.h \
 views/kaddressbooktableview.h \
 views/kaddressbookcardview.h \
 views/configuretableviewdialog.h \
 views/configurecardviewdialog.h \
 views/cardview.h \
 views/colorlistbox.h \
 views/contactlistview.h \
diff --git a/korganizer.control b/korganizer.control
index f66381e..50dbdd2 100644
--- a/korganizer.control
+++ b/korganizer.control
@@ -1,14 +1,14 @@
-Files: bin/kopi  apps/Pim/korganizer.desktop   pics/kdepim/korganizer/*  
+Files: bin/kopi  apps/Pim/korganizer.desktop   pics/kdepim/korganizer/* lib/libkomicro*
 
 Priority: optional
 Section: qpe/pim
 Maintainer: Lutz Rogowski <lutz@pi-sync.net>
 Architecture: arm
 Version: $KDEPIM_VERSION
 License: GPL
 Depends: 
 Description: KOrganizer/Pi and Kaddressbook/Pi
  The embedded version of KOrganizer/Platform-independend, 
     the KDE calendar and scheduling program
   optimized for 640x480 and 320x240 resolution
     on Zaurus PDA
diff --git a/korganizer/korganizerE.pro b/korganizer/korganizerE.pro
index d841193..5cf9778 100644
--- a/korganizer/korganizerE.pro
+++ b/korganizer/korganizerE.pro
@@ -1,87 +1,83 @@
 TEMPLATE	= app
 CONFIG		+= qt warn_on
 TARGET		= kopi
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR=$(QPEDIR)/bin
 
 INCLUDEPATH += $(KDEPIMDIR) $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kdeui $(KDEPIMDIR)/qtcompat $(KDEPIMDIR)/libkdepim interfaces $(KDEPIMDIR)/kabc $(QPEDIR)/include
 
 DEFINES += KORG_NODND KORG_NOPLUGINS  KORG_NOARCHIVE KORG_NOMAIL
 DEFINES += KORG_NOPRINTER  KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER
 DEFINES += KORG_NOLVALTERNATION
 #KORG_NOKABC
 LIBS += -lmicrokdepim
-LIBS += -lmicrokcal
+LIBS += -lkomicrokcal
 LIBS += -lmicrokde
 LIBS += -lmicroqtcompat
 #LIBS += -lmicrokabc
 
-#LIBS +=  $(QPEDIR)/lib/gammu
-#LIBS += -lmicrogammu
-#LIBS += -lbluetooth
-#LIBS += -lsdp
 LIBS += $(GCC3EXTRALIB1)
 LIBS += $(GCC3EXTRALIB2)
 
 
 LIBS += -lqpe
 LIBS += -ljpeg
 LIBS += $(QTOPIALIB)
 LIBS += -L$(QPEDIR)/lib
  
 INTERFACES =  kofilterview_base.ui 
 #filteredit_base.ui
 
 HEADERS = \
  wordsgerman.h \
  filteredit_base.h \
  alarmclient.h \
  calendarview.h \
  customlistviewitem.h \
  datenavigator.h \
  docprefs.h \
  filtereditdialog.h \
  incomingdialog.h \
  incomingdialog_base.h \
  interfaces/korganizer/baseview.h \
  interfaces/korganizer/calendarviewbase.h \
  journalentry.h \
  kdateedit.h \
  kdatenavigator.h \
  koagenda.h \
  koagendaitem.h \
  koagendaview.h \
  kocounterdialog.h \
  kodaymatrix.h \
  kodialogmanager.h \
  koeditordetails.h \
  koeditorgeneral.h \
  koeditorgeneralevent.h \
  koeditorgeneraltodo.h \
  koeditorrecurrence.h \
  koeventeditor.h \
  koeventpopupmenu.h \
  koeventview.h \
  koeventviewer.h \
  koeventviewerdialog.h \
  kofilterview.h \
  koglobals.h \
  koincidenceeditor.h \
  kojournalview.h \
  kolistview.h \
  kolocationbox.h \
  komonthview.h \
  koprefs.h \
  koprefsdialog.h \
  kotimespanview.h \
  kotodoeditor.h \
  kotodoview.h \
  kotodoviewitem.h \
  koviewmanager.h \
  kowhatsnextview.h \
  ktimeedit.h \
  lineview.h \
  mainwindow.h \
  navigatorbar.h \
  outgoingdialog.h \
diff --git a/libkcal/libkcalE.pro b/libkcal/libkcalE.pro
index 1f5ef78..e379b95 100644
--- a/libkcal/libkcalE.pro
+++ b/libkcal/libkcalE.pro
@@ -1,67 +1,67 @@
 TEMPLATE	= lib
 CONFIG		+= qt warn_on
-TARGET		= microkcal
+TARGET		= komicrokcal
 
 INCLUDEPATH += ../microkde ../qtcompat versit ../microkde/kdecore $(QPEDIR)/include
 INCLUDEPATH += ../libical/src/libical
 INCLUDEPATH += ../libical/src/libicalss
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
 LIBS += ../libical/lib/$(PLATFORM)/libical.a
 LIBS += ../libical/lib/$(PLATFORM)/libicalss.a
 
 INTERFACES = \
 
 HEADERS = \
  alarm.h \
  attachment.h \
  attendee.h \
  calendar.h \
  calendarlocal.h \
  calfilter.h \
  calformat.h \
  calstorage.h \
  compat.h \
  customproperties.h \
  dummyscheduler.h \
  duration.h \
  event.h \
  exceptions.h \
  filestorage.h \
  freebusy.h \
  icaldrag.h \
  icalformat.h \
  icalformatimpl.h \
  imipscheduler.h \
  incidence.h \
  incidencebase.h \
 kincidenceformatter.h \
  journal.h \
  period.h \
  person.h \
  qtopiaformat.h \
  sharpformat.h \
  phoneformat.h \
  recurrence.h \
  scheduler.h \
  todo.h \
  vcaldrag.h \
  vcalformat.h \
  versit/port.h \
  versit/vcc.h \
  versit/vobject.h \
 
 SOURCES = \
  alarm.cpp \
  attachment.cpp \
  attendee.cpp \
  calendar.cpp \
  calendarlocal.cpp \
  calfilter.cpp \
  calformat.cpp \
  compat.cpp \
  customproperties.cpp \
  dummyscheduler.cpp \
  duration.cpp \
  event.cpp \