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

List:       kde-commits
Subject:    kdebase
From:       Oswald Buddenhagen <ossi () kde ! org>
Date:       2004-11-11 21:48:19
Message-ID: 20041111214819.9457316CB3 () office ! kde ! org
[Download RAW message or body]

CVS commit by ossi: 

moving greeter plugins to kdmlib so kdesktop_lock can be used without an
installed kdm.


  A            kdmlib/.cvsignore   1.1
  A            kdmlib/Makefile.am   1.1
  M +1 -1      kdesktop/lock/Makefile.am   1.10
  M +1 -16     kdm/kfrontend/Makefile.am   1.53
  R            kdm/kfrontend/kgreet_classic.cpp   1.26
  R            kdm/kfrontend/kgreet_classic.h   1.7
  R            kdm/kfrontend/kgreet_winbind.cpp   1.2
  R            kdm/kfrontend/kgreet_winbind.h   1.1
  R            kdm/kfrontend/kgreeterplugin.h   1.14


--- kdebase/kdm/kfrontend/Makefile.am  #1.52:1.53
@@ -5,5 +5,5 @@
 
 AM_CPPFLAGS = -I$(srcdir)/../backend -I.. -I$(top_srcdir)/kcontrol/background \
-    $(all_includes) $(XDM_DEFINES)
+    -I$(top_srcdir)/kdmlib $(all_includes) $(XDM_DEFINES)
 
 bin_PROGRAMS = kdm_config kdm_greet krootimage genkdmconf kdmctl
@@ -32,14 +32,4 @@
 krootimage_LDADD = $(top_builddir)/kcontrol/background/libbgnd.la $(LIB_KIO)
 
-kde_module_LTLIBRARIES = kgreet_classic.la kgreet_winbind.la
-
-kgreet_classic_la_SOURCES = kgreet_classic.cpp
-kgreet_classic_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries)
-kgreet_classic_la_LIBADD = $(LIB_KDEUI)
-
-kgreet_winbind_la_SOURCES = kgreet_winbind.cpp
-kgreet_winbind_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries)
-kgreet_winbind_la_LIBADD = $(LIB_KDEUI)
-
 METASOURCES = AUTO
 
@@ -72,11 +62,6 @@
     kgapp.h \
     \
-    kgreet_classic.h \
-    kgreet_winbind.h \
-    \
     krootimage.h 
 
-include_HEADERS = kgreeterplugin.h
-
 kdm_greet_COMPILE_FIRST = ../config.ci
 kdm_config_COMPILE_FIRST = ../config.ci

--- kdebase/kdesktop/lock/Makefile.am  #1.9:1.10
@@ -1,5 +1,5 @@
 ## Makefile.am of kdebase/kdesktop/lock
 
-INCLUDES = -I$(top_srcdir)/kcheckpass -I$(top_srcdir)/kdm/kfrontend $(all_includes)
+INCLUDES = -I$(top_srcdir)/kcheckpass -I$(top_srcdir)/kdmlib $(all_includes)
 kdesktop_lock_LDFLAGS  = $(all_libraries) $(KDE_RPATH)
 kdesktop_lock_LDADD    = $(LIB_KIO) $(LIB_XF86MISC)


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