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

List:       kde-commits
Subject:    kdelibs/kwallet
From:       George Staikos <staikos () kde ! org>
Date:       2003-08-08 7:28:58
[Download RAW message or body]

CVS commit by staikos: 

finally cleanly separate the two libraries.  I dont' care about the history of
kwalletentry, and if admins want, the rcs files for client/kwalletentry.* can
be wiped out.


  A            backend/kwalletentry.cc   1.1 [LGPL (v2+)]
  A            backend/kwalletentry.h   1.1 [LGPL (v2+)]
  M +4 -2      backend/Makefile.am   1.14
  M +1 -4      client/Makefile.am   1.10
  R            client/kwalletentry.cc   1.11
  R            client/kwalletentry.h   1.10


--- kdelibs/kwallet/backend/Makefile.am  #1.13:1.14
@@ -1,9 +1,9 @@
 
-INCLUDES= -I$(srcdir) -I$(srcdir)/../client $(all_includes)
+INCLUDES= -I$(srcdir) $(all_includes)
 
 lib_LTLIBRARIES = libkwalletbackend.la
 
 libkwalletbackend_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0 -no-undefined
-libkwalletbackend_la_LIBADD = $(LIB_QT) ../../kdecore/libkdecore.la ../client/libkwalletclient.la
+libkwalletbackend_la_LIBADD = $(LIB_QT) ../../kdecore/libkdecore.la
 libkwalletbackend_la_SOURCES = blockcipher.cc           \
                                blowfish.cc              \
@@ -11,4 +11,5 @@
                                hashbase.cc              \
                                sha1.cc                  \
+                               kwalletentry.cc          \
                                kwalletbackend.cc
 
@@ -21,4 +22,5 @@
                  sha1.h                 \
                  blockcipher.h          \
+                 kwalletentry.h         \
                  kwalletbackend.h       \
                  blowfish.h

--- kdelibs/kwallet/client/Makefile.am  #1.9:1.10
@@ -6,6 +6,5 @@
 libkwalletclient_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0 -no-undefined
 libkwalletclient_la_LIBADD = $(LIB_QT) ../../dcop/libDCOP.la
-libkwalletclient_la_SOURCES =   kwalletentry.cc \
-                                kwallet.skel \
+libkwalletclient_la_SOURCES =   kwallet.skel \
                                 kwallet.cc
 
@@ -13,5 +12,3 @@
 
 include_HEADERS = kwallet.h
-
-noinst_HEADERS = kwalletentry.h
 


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