[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdepim/kaddressbook
From:       Tobias Koenig <tokoe () kde ! org>
Date:       2003-03-31 20:54:57
[Download RAW message or body]

CVS commit by tokoe: 


Moved xxportobject.cpp to libkaddressbook.la to allow plugins in
kdeaddons.


  M +7 -3      Makefile.am   1.104
  M +7 -7      xxport/Makefile.am   1.8


--- kdepim/kaddressbook/Makefile.am  #1.103:1.104
@@ -22,5 +22,6 @@
         $(LIB_KPARTS) $(LIB_KHTML) \
         -lkabc -lkdeprint \
-        ./libkabcommon.la
+        ./libkabcommon.la \
+        ./libkaddressbook.la
 
 libkaddressbookpart_la_SOURCES = \
@@ -34,5 +35,5 @@
  phoneeditwidget.cpp secrecywidget.cpp soundwidget.cpp undo.cpp undocmds.cpp \
  viewconfigurefieldspage.cpp viewconfigurefilterpage.cpp \
- viewconfigurewidget.cpp viewmanager.cpp xxportmanager.cpp xxportobject.cpp \
+ viewconfigurewidget.cpp viewmanager.cpp xxportmanager.cpp \
  xxportselectdialog.cpp
 
@@ -79,6 +80,9 @@
 servicetype_DATA = kaddressbook_extension.desktop kaddressbook_view.desktop \
kaddressbook_xxport.desktop dcopaddressbook.desktop  
-noinst_LTLIBRARIES = libkabcommon.la
+lib_LTLIBRARIES = libkaddressbook.la
+libkaddressbook_la_SOURCES = xxportobject.cpp
+
 
+noinst_LTLIBRARIES = libkabcommon.la
 libkabcommon_la_SOURCES = kabprefs.cpp configurewidget.cpp
 

--- kdepim/kaddressbook/xxport/Makefile.am  #1.7:1.8
@@ -15,23 +15,23 @@
 
 libkaddrbk_csv_xxport_la_SOURCES = csv_xxport.cpp importdialog.cpp
-libkaddrbk_csv_xxport_la_LIBADD = \
$(top_builddir)/kaddressbook/libkaddressbookpart.la +libkaddrbk_csv_xxport_la_LIBADD \
= $(top_builddir)/kaddressbook/libkaddressbook.la  
 libkaddrbk_vcard_xxport_la_SOURCES = vcard_xxport.cpp
-libkaddrbk_vcard_xxport_la_LIBADD = \
$(top_builddir)/kaddressbook/libkaddressbookpart.la \
+libkaddrbk_vcard_xxport_la_LIBADD = $(top_builddir)/kaddressbook/libkaddressbook.la  \
  libkaddrbk_kde2_xxport_la_SOURCES = kde2_xxport.cpp
-libkaddrbk_kde2_xxport_la_LIBADD = \
$(top_builddir)/kaddressbook/libkaddressbookpart.la +libkaddrbk_kde2_xxport_la_LIBADD \
= $(top_builddir)/kaddressbook/libkaddressbook.la  
 libkaddrbk_bookmark_xxport_la_SOURCES = bookmark_xxport.cpp
-libkaddrbk_bookmark_xxport_la_LIBADD = \
$(top_builddir)/kaddressbook/libkaddressbookpart.la \
+libkaddrbk_bookmark_xxport_la_LIBADD = \
$(top_builddir)/kaddressbook/libkaddressbook.la  
 libkaddrbk_eudora_xxport_la_SOURCES = eudora_xxport.cpp
-libkaddrbk_eudora_xxport_la_LIBADD = \
$(top_builddir)/kaddressbook/libkaddressbookpart.la \
+libkaddrbk_eudora_xxport_la_LIBADD = $(top_builddir)/kaddressbook/libkaddressbook.la \
  libkaddrbk_ldif_xxport_la_SOURCES = ldif_xxport.cpp
-libkaddrbk_ldif_xxport_la_LIBADD = \
$(top_builddir)/kaddressbook/libkaddressbookpart.la +libkaddrbk_ldif_xxport_la_LIBADD \
= $(top_builddir)/kaddressbook/libkaddressbook.la  
 libkaddrbk_gnokii_xxport_la_SOURCES = gnokii_xxport.cpp
-libkaddrbk_gnokii_xxport_la_LIBADD = $(XPMLIB) $(LIB_GNOKII) \
$(top_builddir)/kaddressbook/libkaddressbookpart.la \
+libkaddrbk_gnokii_xxport_la_LIBADD = $(XPMLIB) $(LIB_GNOKII) \
$(top_builddir)/kaddressbook/libkaddressbook.la  
 rc_DATA = csv_xxportui.rc vcard_xxportui.rc kde2_xxportui.rc \


[prev in list] [next in list] [prev in thread] [next in thread]