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

List:       kde-commits
Subject:    kdepim
From:       Michael Brade <brade () kde ! org>
Date:       2004-08-25 19:24:56
Message-ID: 20040825192456.C442F7AFF () office ! kde ! org
[Download RAW message or body]

CVS commit by brade: 

First things first: Split KNotes into 5 static libs, one of them being
a knotesresources lib. Makes Kontact and friends a lot smaller.


  M +25 -14    knotes/Makefile.am   1.64
  M +3 -1      kresources/egroupware/Makefile.am   1.13
  M +2 -1      kresources/imap/knotes/Makefile.am   1.6


--- kdepim/knotes/Makefile.am  #1.63:1.64
@@ -7,23 +7,34 @@
 include_HEADERS = KNotesIface.h
 noinst_HEADERS  = knotesapp.h knote.h knoteedit.h knotebutton.h knoteconfigdlg.h \
-                                                knoteslegacy.h resourcemanager.h \
                resourcenotes.h resourcelocal.h \
-                                                knotesnetrecv.h knotesnetsend.h \
knotehostdlg.h +                  knoteslegacy.h resourcemanager.h resourcenotes.h \
resourcelocal.h \ +                  knotesnetrecv.h knotesnetsend.h knotehostdlg.h
 
-noinst_LTLIBRARIES = libknotes.la
-libknotes_la_SOURCES = knotesapp.cpp knote.cpp knoteedit.cpp knotebutton.cpp \
-                                                          knoteconfigdlg.cpp \
                knoteconfig.kcfgc knotesglobalconfig.kcfgc \
-                                                          KNotesIface.skel \
                knoteslegacy.cpp \
-                                                          resourcemanager.cpp \
                resourcenotes.cpp resourcelocal.cpp \
-                                                          knotesnetrecv.cpp \
                knotesnetsend.cpp knotehostdlg.cpp
-
-knotes_SOURCES  = main.cpp
-knotes_LDADD    = libknotes.la $(LIB_KIO) -lkresources -lkdeprint \
$(top_builddir)/libkcal/libkcal.la +# Dependencies of the static libraries:
+#   note: all others
+#   network: config [knotesnetsend depends on globalconfig, could be fixed]
+#   editor: ok
+#   resources: config
+#   config: ok
+
+noinst_LTLIBRARIES = libknote.la libknoteseditor.la libknotesresources.la \
+                     libknotesconfig.la libknotesnetwork.la
+
+libknotesconfig_la_SOURCES = knoteslegacy.cpp knoteconfig.kcfgc \
knotesglobalconfig.kcfgc +libknoteseditor_la_SOURCES = knoteedit.cpp
+libknotesnetwork_la_SOURCES = knotesnetrecv.cpp knotesnetsend.cpp
+libknotesresources_la_SOURCES = resourcemanager.cpp resourcenotes.cpp \
resourcelocal.cpp +libknote_la_SOURCES = knote.cpp knotebutton.cpp knoteconfigdlg.cpp \
knotehostdlg.cpp +
+knotes_SOURCES  = main.cpp knotesapp.cpp KNotesIface.skel
+knotes_LDADD    = libknote.la libknoteseditor.la libknotesnetwork.la \
libknotesresources.la \ +                  libknotesconfig.la  \
$(top_builddir)/libkcal/libkcal.la $(LIB_KIO) \ +                  -lkresources \
-lkdeprint  knotes_LDFLAGS  = $(all_libraries) $(KDE_RPATH)
 
-kde_module_LTLIBRARIES = knotes_local.la
+kde_module_LTLIBRARIES  = knotes_local.la
 knotes_local_la_SOURCES = resourcelocal_plugin.cpp
 knotes_local_la_LDFLAGS = $(KDE_LDFLAGS) -module $(KDE_PLUGIN)
-knotes_local_la_LIBADD  = libknotes.la $(top_builddir)/libkcal/libkcal.la -lkdeprint
-
+knotes_local_la_LIBADD  = libknotesresources.la libknotesconfig.la \
+                          $(top_builddir)/libkcal/libkcal.la -lkdeprint
 
 METASOURCES     = AUTO

--- kdepim/kresources/imap/knotes/Makefile.am  #1.5:1.6
@@ -12,5 +12,6 @@
 libknotes_imap_la_LIBADD = -lkresources -lkdeprint \
         $(top_builddir)/kresources/imap/shared/libresourceimapshared.la \
-        $(top_builddir)/knotes/libknotes.la \
+        $(top_builddir)/knotes/libknotesresources.la \
+        $(top_builddir)/knotes/libknotesconfig.la \
         $(top_builddir)/libkcal/libkcal.la
 

--- kdepim/kresources/egroupware/Makefile.am  #1.12:1.13
@@ -28,5 +28,7 @@
 libknotes_xmlrpc_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 \
-no-undefined  libknotes_xmlrpc_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \
                -lkdeprint \
-                             $(top_builddir)/knotes/libknotes.la \
$(top_builddir)/libkdepim/libkdepim.la +                             \
$(top_builddir)/knotes/libknotesresources.la \ +                             \
$(top_builddir)/knotes/libknotesconfig.la \ +                                         \
$(top_builddir)/libkdepim/libkdepim.la  
 kabcincludedir = $(includedir)/kabc


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