head	1.8;
access;
symbols
	pkgsrc-2013Q2:1.8.0.52
	pkgsrc-2013Q2-base:1.8
	pkgsrc-2012Q4:1.8.0.50
	pkgsrc-2012Q4-base:1.8
	pkgsrc-2011Q4:1.8.0.48
	pkgsrc-2011Q4-base:1.8
	pkgsrc-2011Q2:1.8.0.46
	pkgsrc-2011Q2-base:1.8
	pkgsrc-2009Q4:1.8.0.44
	pkgsrc-2009Q4-base:1.8
	pkgsrc-2008Q4:1.8.0.42
	pkgsrc-2008Q4-base:1.8
	pkgsrc-2008Q3:1.8.0.40
	pkgsrc-2008Q3-base:1.8
	cube-native-xorg:1.8.0.38
	cube-native-xorg-base:1.8
	pkgsrc-2008Q2:1.8.0.36
	pkgsrc-2008Q2-base:1.8
	pkgsrc-2008Q1:1.8.0.34
	pkgsrc-2008Q1-base:1.8
	pkgsrc-2007Q4:1.8.0.32
	pkgsrc-2007Q4-base:1.8
	pkgsrc-2007Q3:1.8.0.30
	pkgsrc-2007Q3-base:1.8
	pkgsrc-2007Q2:1.8.0.28
	pkgsrc-2007Q2-base:1.8
	pkgsrc-2007Q1:1.8.0.26
	pkgsrc-2007Q1-base:1.8
	pkgsrc-2006Q4:1.8.0.24
	pkgsrc-2006Q4-base:1.8
	pkgsrc-2006Q3:1.8.0.22
	pkgsrc-2006Q3-base:1.8
	pkgsrc-2006Q2:1.8.0.20
	pkgsrc-2006Q2-base:1.8
	pkgsrc-2006Q1:1.8.0.18
	pkgsrc-2006Q1-base:1.8
	pkgsrc-2005Q4:1.8.0.16
	pkgsrc-2005Q4-base:1.8
	pkgsrc-2005Q3:1.8.0.14
	pkgsrc-2005Q3-base:1.8
	pkgsrc-2005Q2:1.8.0.12
	pkgsrc-2005Q2-base:1.8
	pkgsrc-2005Q1:1.8.0.10
	pkgsrc-2005Q1-base:1.8
	pkgsrc-2004Q4:1.8.0.8
	pkgsrc-2004Q4-base:1.8
	pkgsrc-2004Q3:1.8.0.6
	pkgsrc-2004Q3-base:1.8
	pkgsrc-2004Q2:1.8.0.4
	pkgsrc-2004Q2-base:1.8
	pkgsrc-2004Q1:1.8.0.2
	pkgsrc-2004Q1-base:1.8
	pkgsrc-2003Q4:1.6.0.2
	pkgsrc-2003Q4-base:1.6
	netbsd-1-6-1:1.3.0.2
	netbsd-1-6-1-base:1.3
	netbsd-1-6:1.1.1.1.0.4
	netbsd-1-6-RELEASE-base:1.1
	pkgviews:1.1.1.1.0.6
	pkgviews-base:1.1
	buildlink2-base:1.1.1.1
	buildlink2:1.1.1.1.0.2
	pkg-base:1.1.1.1
	TNF:1.1.1;
locks; strict;
comment	@# @;


1.8
date	2004.02.04.20.38.00;	author markd;	state dead;
branches;
next	1.7;

1.7
date	2004.01.15.11.12.40;	author markd;	state Exp;
branches;
next	1.6;

1.6
date	2003.07.30.14.24.50;	author markd;	state Exp;
branches;
next	1.5;

1.5
date	2003.05.22.02.57.14;	author markd;	state Exp;
branches;
next	1.4;

1.4
date	2003.03.11.13.22.32;	author markd;	state Exp;
branches;
next	1.3;

1.3
date	2003.01.17.03.34.04;	author markd;	state Exp;
branches;
next	1.2;

1.2
date	2003.01.02.09.12.29;	author skrll;	state Exp;
branches;
next	1.1;

1.1
date	2002.05.31.13.42.36;	author skrll;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2002.05.31.13.42.36;	author skrll;	state Exp;
branches
	1.1.1.1.2.1;
next	;

1.1.1.1.2.1
date	2002.05.31.13.42.36;	author jlam;	state dead;
branches;
next	1.1.1.1.2.2;

1.1.1.1.2.2
date	2002.06.23.18.53.45;	author jlam;	state Exp;
branches;
next	;


desc
@@


1.8
log
@Update to KDE 3.2

Changes:
Utilities

KRegExpEditor
* Create an application on its own from KRegExpEditor (several users
  have requested this) Jesper K. Pedersen
* Add a verifier window where user can try his regular expression
  Jesper K. Pedersen
* Add some warnings on invalid regular expressions (like $^) Jesper
  K. Pedersen
* Ensure predefined regular expressions are correct i18n'ed Jesper K.
  Pedersen
* Add support for Emacs style Regular Expression syntaxes Jesper K. Pedersen

KJots
* XMLUI-ify and improve the interface. Using a treeview for books and
  bookmarks for quick nav. Aaron J. Seigo
* Printing and viewing of entire books. Aaron J. Seigo
* Autosave. Aaron J. Seigo

KMilo
* NEW IN KDE: A generic framework to support special keyboards and
  hardware features, such as those found on laptops. George Staikos
* KMilo support for PowerBooks via pbbuttonsd. George Staikos

KLaptop
* Full Linux ACPI support (suspend etc, throttling, performance
  profiles) Paul Campbell
* Back panel brightness support for some laptops (Sony, Toshiba) Paul
  Campbell
* Recode to run as a KDED daemon Paul Campbell
* Better Thinkpad support Paul Campbell
* Triggers from lid closure (suspend, powerdown etc) - on laptops with
  ACPI support Paul Campbell
* Sony laptop extensions support (/dev/sonypi - scroll wheel, panel
  brightness) Paul Campbell
* Added the ability to auto-disable suspend etc when the load average
  is high Paul Campbell
* Display the state of individual batteries in ACPI systems Paul
  Campbell
* Support for Linux kernel software suspend Paul Campbell
* Added battery charged notification dialog Paul Campbell
* Option to use blank screensaver when in battery mode George Staikos
* Support for the Linux CPUFreq interface. Volker Krause

Kgpg
* NEW IN KDE: frontend for gpg. Jean-Baptiste Mardelle
* Key editing in GUI (changing passphrase, trust, expiration)
* Support for key groups
* Speed up key manager
* Gpg-agent support
* Auto import missing signatures
* improved editor (print, spell check, ...)
* Manage photo id's
* Revocation certificates (print, save)
* Change dialogs to KBaseDialog for ui consistency
* Implement the missing key editing commands in the GUI (adduid,
  deluid,..)
* When encrypting a folder, give a choice of compression scheme
  (zip, tar,...)

KHexEdit2
* NEW IN KDE: A hex edit widget library Friedrich W. H. Kossebau
* move the lib of the new KHexEdit2 widget from kdenonbeta over to
  kdeutils/khexedit/lib Friedrich W. H. Kossebau
* implement interfaces for the KBytesEdit widget part Friedrich W. H.
  Kossebau
@
text
@$NetBSD: patch-ak,v 1.7 2004/01/15 11:12:40 markd Exp $

--- klaptopdaemon/Makefile.in.orig	2003-12-29 11:33:18.000000000 +1300
+++ klaptopdaemon/Makefile.in
@@@@ -91,7 +91,7 @@@@ KDE_USE_FINAL_FALSE = @@KDE_USE_FINAL_FAL
 KDE_USE_FINAL_TRUE = @@KDE_USE_FINAL_TRUE@@
 KDE_XSL_STYLESHEET = @@KDE_XSL_STYLESHEET@@
 
-LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic
+LDFLAGS = $(all_libraries) $(KDE_RPATH) $(EXPORT_SYMBOLS_LDFLAGS)
 LIBCOMPAT = @@LIBCOMPAT@@
 LIBCRYPT = @@LIBCRYPT@@
 LIBDL = @@LIBDL@@
@@@@ -272,20 +272,24 @@@@ target_os = @@target_os@@
 target_vendor = @@target_vendor@@
 x_includes = @@x_includes@@
 x_libraries = @@x_libraries@@
-lib_LTLIBRARIES = klaptopdaemon.la
+lib_LTLIBRARIES = libklaptopdaemon_main.la klaptopdaemon.la
 kde_module_LTLIBRARIES = kcm_laptop.la
 bin_PROGRAMS = klaptopdaemon
 SUBDIRS = pics applnk
 
-klaptopdaemon_la_SOURCES = laptop_daemon.cpp kpcmcia.cpp \
+libklaptopdaemon_main_la_SOURCES = laptop_daemon.cpp kpcmcia.cpp \
 	kpcmciainfo.cpp daemondock.cpp notify.cpp portable.cpp acpi_config.cpp
 
+libklaptopdaemon_main_la_LDFLAGS = $(all_libraries)
+libklaptopdaemon_main_la_LIBADD = $(LIB_KDEUI)
+
+klaptopdaemon_la_SOURCES = klaptopdaemon_main.cpp
 klaptopdaemon_la_LDFLAGS = $(all_libraries) -module -avoid-version
-klaptopdaemon_la_LIBADD = $(LIB_KDEUI)
+klaptopdaemon_la_LIBADD = libklaptopdaemon_main.la
 
-klaptopdaemon_SOURCES = dummy.cpp
+klaptopdaemon_SOURCES = klaptopdaemon_main.cpp
 klaptopdaemon_LDFLAGS = $(all_libraries)
-klaptopdaemon_LDADD = klaptopdaemon.la
+klaptopdaemon_LDADD = libklaptopdaemon_main.la
 
 kcm_laptop_la_SOURCES = battery.cpp main.cpp pcmcia.cpp power.cpp warning.cpp \
 	portable.cpp acpi_config.cpp
@@@@ -313,49 +317,60 @@@@ kcm_laptop_la_nofinal_OBJECTS = battery.
 	warning.lo portable.lo acpi_config.lo
 @@KDE_USE_FINAL_FALSE@@kcm_laptop_la_OBJECTS = $(kcm_laptop_la_nofinal_OBJECTS)
 @@KDE_USE_FINAL_TRUE@@kcm_laptop_la_OBJECTS = $(kcm_laptop_la_final_OBJECTS)
-klaptopdaemon_la_DEPENDENCIES =
-am_klaptopdaemon_la_OBJECTS = laptop_daemon.lo kpcmcia.lo kpcmciainfo.lo \
-	daemondock.lo notify.lo portable.lo acpi_config.lo
+klaptopdaemon_la_DEPENDENCIES = libklaptopdaemon_main.la
+am_klaptopdaemon_la_OBJECTS = klaptopdaemon_main.lo
 #>- klaptopdaemon_la_OBJECTS = $(am_klaptopdaemon_la_OBJECTS)
-#>+ 5
-klaptopdaemon_la_final_OBJECTS = klaptopdaemon_la.all_cpp.lo 
-klaptopdaemon_la_nofinal_OBJECTS = laptop_daemon.lo kpcmcia.lo kpcmciainfo.lo \
-	daemondock.lo notify.lo portable.lo acpi_config.lo
-@@KDE_USE_FINAL_FALSE@@klaptopdaemon_la_OBJECTS = $(klaptopdaemon_la_nofinal_OBJECTS)
-@@KDE_USE_FINAL_TRUE@@klaptopdaemon_la_OBJECTS = $(klaptopdaemon_la_final_OBJECTS)
+#>+ 1
+klaptopdaemon_la_OBJECTS = klaptopdaemon_main.lo
+libklaptopdaemon_main_la_DEPENDENCIES =
+am_libklaptopdaemon_main_la_OBJECTS = laptop_daemon.lo kpcmcia.lo \
+	kpcmciainfo.lo daemondock.lo notify.lo portable.lo \
+	acpi_config.lo
+#>- libklaptopdaemon_main_la_OBJECTS = \
+#>- 	$(am_libklaptopdaemon_main_la_OBJECTS)
+#>+ 6
+libklaptopdaemon_main_la_final_OBJECTS = libklaptopdaemon_main_la.all_cpp.lo 
+libklaptopdaemon_main_la_nofinal_OBJECTS = laptop_daemon.lo kpcmcia.lo \
+	kpcmciainfo.lo daemondock.lo notify.lo portable.lo \
+	acpi_config.lo
+@@KDE_USE_FINAL_FALSE@@libklaptopdaemon_main_la_OBJECTS = $(libklaptopdaemon_main_la_nofinal_OBJECTS)
+@@KDE_USE_FINAL_TRUE@@libklaptopdaemon_main_la_OBJECTS = $(libklaptopdaemon_main_la_final_OBJECTS)
 bin_PROGRAMS = klaptopdaemon$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS)
 
-am_klaptopdaemon_OBJECTS = dummy.$(OBJEXT)
+am_klaptopdaemon_OBJECTS = klaptopdaemon_main.$(OBJEXT)
 #>- klaptopdaemon_OBJECTS = $(am_klaptopdaemon_OBJECTS)
 #>+ 1
-klaptopdaemon_OBJECTS = dummy.$(OBJEXT)
-klaptopdaemon_DEPENDENCIES = klaptopdaemon.la
+klaptopdaemon_OBJECTS = klaptopdaemon_main.$(OBJEXT)
+klaptopdaemon_DEPENDENCIES = libklaptopdaemon_main.la
 
 DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 am__depfiles_maybe = depfiles
 #>- @@AMDEP_TRUE@@DEP_FILES = ./$(DEPDIR)/acpi_config.Plo \
 #>- @@AMDEP_TRUE@@	./$(DEPDIR)/battery.Plo ./$(DEPDIR)/daemondock.Plo \
-#>- @@AMDEP_TRUE@@	./$(DEPDIR)/dummy.Po ./$(DEPDIR)/kpcmcia.Plo \
-#>- @@AMDEP_TRUE@@	./$(DEPDIR)/kpcmciainfo.Plo \
+#>- @@AMDEP_TRUE@@	./$(DEPDIR)/klaptopdaemon_main.Plo \
+#>- @@AMDEP_TRUE@@	./$(DEPDIR)/klaptopdaemon_main.Po \
+#>- @@AMDEP_TRUE@@	./$(DEPDIR)/kpcmcia.Plo ./$(DEPDIR)/kpcmciainfo.Plo \
 #>- @@AMDEP_TRUE@@	./$(DEPDIR)/laptop_daemon.Plo ./$(DEPDIR)/main.Plo \
 #>- @@AMDEP_TRUE@@	./$(DEPDIR)/notify.Plo ./$(DEPDIR)/pcmcia.Plo \
 #>- @@AMDEP_TRUE@@	./$(DEPDIR)/portable.Plo ./$(DEPDIR)/power.Plo \
 #>- @@AMDEP_TRUE@@	./$(DEPDIR)/warning.Plo
-#>+ 17
-@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES =   $(DEPDIR)/kcm_laptop_la.all_cpp.P $(DEPDIR)/klaptopdaemon_la.all_cpp.P  ./$(DEPDIR)/acpi_config.Plo \
+#>+ 19
+@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES =   $(DEPDIR)/kcm_laptop_la.all_cpp.P $(DEPDIR)/libklaptopdaemon_main_la.all_cpp.P  ./$(DEPDIR)/acpi_config.Plo \
 @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@	@@AMDEP_TRUE@@	./$(DEPDIR)/battery.Plo ./$(DEPDIR)/daemondock.Plo \
-@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@	@@AMDEP_TRUE@@	./$(DEPDIR)/dummy.Po ./$(DEPDIR)/kpcmcia.Plo \
-@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@	@@AMDEP_TRUE@@	./$(DEPDIR)/kpcmciainfo.Plo \
+@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@	@@AMDEP_TRUE@@	./$(DEPDIR)/klaptopdaemon_main.Plo \
+@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@	@@AMDEP_TRUE@@	./$(DEPDIR)/klaptopdaemon_main.Po \
+@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@	@@AMDEP_TRUE@@	./$(DEPDIR)/kpcmcia.Plo ./$(DEPDIR)/kpcmciainfo.Plo \
 @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@	@@AMDEP_TRUE@@	./$(DEPDIR)/laptop_daemon.Plo ./$(DEPDIR)/main.Plo \
 @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@	@@AMDEP_TRUE@@	./$(DEPDIR)/notify.Plo ./$(DEPDIR)/pcmcia.Plo \
 @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@	@@AMDEP_TRUE@@	./$(DEPDIR)/portable.Plo ./$(DEPDIR)/power.Plo \
 @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@	@@AMDEP_TRUE@@	./$(DEPDIR)/warning.Plo
 @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@DEP_FILES =   ./$(DEPDIR)/acpi_config.Plo \
 @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@	@@AMDEP_TRUE@@	./$(DEPDIR)/battery.Plo ./$(DEPDIR)/daemondock.Plo \
-@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@	@@AMDEP_TRUE@@	./$(DEPDIR)/dummy.Po ./$(DEPDIR)/kpcmcia.Plo \
-@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@	@@AMDEP_TRUE@@	./$(DEPDIR)/kpcmciainfo.Plo \
+@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@	@@AMDEP_TRUE@@	./$(DEPDIR)/klaptopdaemon_main.Plo \
+@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@	@@AMDEP_TRUE@@	./$(DEPDIR)/klaptopdaemon_main.Po \
+@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@	@@AMDEP_TRUE@@	./$(DEPDIR)/kpcmcia.Plo ./$(DEPDIR)/kpcmciainfo.Plo \
 @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@	@@AMDEP_TRUE@@	./$(DEPDIR)/laptop_daemon.Plo ./$(DEPDIR)/main.Plo \
 @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@	@@AMDEP_TRUE@@	./$(DEPDIR)/notify.Plo ./$(DEPDIR)/pcmcia.Plo \
 @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@	@@AMDEP_TRUE@@	./$(DEPDIR)/portable.Plo ./$(DEPDIR)/power.Plo \
@@@@ -380,7 +395,7 @@@@ CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@@
 DIST_SOURCES = $(kcm_laptop_la_SOURCES) $(klaptopdaemon_la_SOURCES) \
-	$(klaptopdaemon_SOURCES)
+	$(libklaptopdaemon_main_la_SOURCES) $(klaptopdaemon_SOURCES)
 
 RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
 	ps-recursive install-info-recursive uninstall-info-recursive \
@@@@ -389,7 +404,7 @@@@ RECURSIVE_TARGETS = info-recursive dvi-r
 	check-recursive installcheck-recursive
 DIST_COMMON = README Makefile.am Makefile.in
 DIST_SUBDIRS = $(SUBDIRS)
-SOURCES = $(kcm_laptop_la_SOURCES) $(klaptopdaemon_la_SOURCES) $(klaptopdaemon_SOURCES)
+SOURCES = $(kcm_laptop_la_SOURCES) $(klaptopdaemon_la_SOURCES) $(libklaptopdaemon_main_la_SOURCES) $(klaptopdaemon_SOURCES)
 
 #>- all: all-recursive
 #>+ 1
@@@@ -469,6 +484,8 @@@@ clean-libLTLIBRARIES:
 	$(CXXLINK) -rpath $(kde_moduledir) $(kcm_laptop_la_LDFLAGS) $(kcm_laptop_la_OBJECTS) $(kcm_laptop_la_LIBADD) $(LIBS)
 klaptopdaemon.la: $(klaptopdaemon_la_OBJECTS) $(klaptopdaemon_la_DEPENDENCIES) 
 	$(CXXLINK) -rpath $(libdir) $(klaptopdaemon_la_LDFLAGS) $(klaptopdaemon_la_OBJECTS) $(klaptopdaemon_la_LIBADD) $(LIBS)
+libklaptopdaemon_main.la: $(libklaptopdaemon_main_la_OBJECTS) $(libklaptopdaemon_main_la_DEPENDENCIES) 
+	$(CXXLINK) -rpath $(libdir) $(libklaptopdaemon_main_la_LDFLAGS) $(libklaptopdaemon_main_la_OBJECTS) $(libklaptopdaemon_main_la_LIBADD) $(LIBS)
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@@$(NORMAL_INSTALL)
@@@@ -511,7 +528,8 @@@@ distclean-compile:
 @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/acpi_config.Plo@@am__quote@@
 @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/battery.Plo@@am__quote@@
 @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/daemondock.Plo@@am__quote@@
-@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/dummy.Po@@am__quote@@
+@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/klaptopdaemon_main.Plo@@am__quote@@
+@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/klaptopdaemon_main.Po@@am__quote@@
 @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kpcmcia.Plo@@am__quote@@
 @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/kpcmciainfo.Plo@@am__quote@@
 @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/laptop_daemon.Plo@@am__quote@@
@@@@ -693,7 +711,7 @@@@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 #>+ 4
-KDE_DIST=laptop_daemon.h pcmcia.h acpi_config.h warning.h notify.h power.h configure.in.in version.h battery.h portable.h kpcmciainfo.h main.h kpcmcia.h daemondock.h 
+KDE_DIST=power.h warning.h configure.in.in kpcmciainfo.h acpi_config.h battery.h version.h pcmcia.h portable.h daemondock.h main.h Makefile.in.rej kpcmcia.h laptop_daemon.h notify.h 
 
 DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
 
@@@@ -859,9 +877,6 @@@@ uninstall-info: uninstall-info-recursive
 messages:
 	$(XGETTEXT) $(klaptopdaemon_la_SOURCES) -o $(podir)/klaptopdaemon.pot
 	$(XGETTEXT) $(kcm_laptop_la_SOURCES) -o $(podir)/kcmlaptop.pot
-
-dummy.cpp:
-	echo >dummy.cpp
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
@@@@ -876,17 +891,17 @@@@ kcm_laptop.la.closure: $(kcm_laptop_la_O
 
 
 #>+ 3
-pcmcia.moc: $(srcdir)/pcmcia.h
-	$(MOC) $(srcdir)/pcmcia.h -o pcmcia.moc
+kpcmcia.moc: $(srcdir)/kpcmcia.h
+	$(MOC) $(srcdir)/kpcmcia.h -o kpcmcia.moc
 
 #>+ 1
-mocs: pcmcia.moc
+mocs: kpcmcia.moc
 #>+ 3
-battery.moc: $(srcdir)/battery.h
-	$(MOC) $(srcdir)/battery.h -o battery.moc
+pcmcia.moc: $(srcdir)/pcmcia.h
+	$(MOC) $(srcdir)/pcmcia.h -o pcmcia.moc
 
 #>+ 1
-mocs: battery.moc
+mocs: pcmcia.moc
 #>+ 3
 daemondock.moc: $(srcdir)/daemondock.h
 	$(MOC) $(srcdir)/daemondock.h -o daemondock.moc
@@@@ -894,41 +909,35 @@@@ daemondock.moc: $(srcdir)/daemondock.h
 #>+ 1
 mocs: daemondock.moc
 #>+ 3
-acpi_config.moc: $(srcdir)/acpi_config.h
-	$(MOC) $(srcdir)/acpi_config.h -o acpi_config.moc
-
-#>+ 1
-mocs: acpi_config.moc
-#>+ 3
-kpcmcia.moc: $(srcdir)/kpcmcia.h
-	$(MOC) $(srcdir)/kpcmcia.h -o kpcmcia.moc
-
-#>+ 1
-mocs: kpcmcia.moc
-#>+ 3
 notify.moc: $(srcdir)/notify.h
 	$(MOC) $(srcdir)/notify.h -o notify.moc
 
 #>+ 1
 mocs: notify.moc
 #>+ 3
-warning.moc: $(srcdir)/warning.h
-	$(MOC) $(srcdir)/warning.h -o warning.moc
+main.moc: $(srcdir)/main.h
+	$(MOC) $(srcdir)/main.h -o main.moc
 
 #>+ 1
-mocs: warning.moc
+mocs: main.moc
 #>+ 3
-laptop_daemon.moc: $(srcdir)/laptop_daemon.h
-	$(MOC) $(srcdir)/laptop_daemon.h -o laptop_daemon.moc
+kpcmciainfo.moc: $(srcdir)/kpcmciainfo.h
+	$(MOC) $(srcdir)/kpcmciainfo.h -o kpcmciainfo.moc
 
 #>+ 1
-mocs: laptop_daemon.moc
+mocs: kpcmciainfo.moc
 #>+ 3
-main.moc: $(srcdir)/main.h
-	$(MOC) $(srcdir)/main.h -o main.moc
+battery.moc: $(srcdir)/battery.h
+	$(MOC) $(srcdir)/battery.h -o battery.moc
 
 #>+ 1
-mocs: main.moc
+mocs: battery.moc
+#>+ 3
+acpi_config.moc: $(srcdir)/acpi_config.h
+	$(MOC) $(srcdir)/acpi_config.h -o acpi_config.moc
+
+#>+ 1
+mocs: acpi_config.moc
 #>+ 3
 power.moc: $(srcdir)/power.h
 	$(MOC) $(srcdir)/power.h -o power.moc
@@@@ -936,14 +945,20 @@@@ power.moc: $(srcdir)/power.h
 #>+ 1
 mocs: power.moc
 #>+ 3
-kpcmciainfo.moc: $(srcdir)/kpcmciainfo.h
-	$(MOC) $(srcdir)/kpcmciainfo.h -o kpcmciainfo.moc
+warning.moc: $(srcdir)/warning.h
+	$(MOC) $(srcdir)/warning.h -o warning.moc
 
 #>+ 1
-mocs: kpcmciainfo.moc
+mocs: warning.moc
+#>+ 3
+laptop_daemon.moc: $(srcdir)/laptop_daemon.h
+	$(MOC) $(srcdir)/laptop_daemon.h -o laptop_daemon.moc
+
+#>+ 1
+mocs: laptop_daemon.moc
 #>+ 3
 clean-metasources:
-	-rm -f  pcmcia.moc battery.moc daemondock.moc acpi_config.moc kpcmcia.moc notify.moc warning.moc laptop_daemon.moc main.moc power.moc kpcmciainfo.moc
+	-rm -f  kpcmcia.moc pcmcia.moc daemondock.moc notify.moc main.moc kpcmciainfo.moc battery.moc acpi_config.moc power.moc warning.moc laptop_daemon.moc
 
 #>+ 3
 clean-closures:
@@@@ -960,7 +975,7 @@@@ force-reedit:
 
 
 #>+ 11
-kcm_laptop_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/battery.cpp $(srcdir)/main.cpp $(srcdir)/pcmcia.cpp $(srcdir)/power.cpp $(srcdir)/warning.cpp $(srcdir)/portable.cpp $(srcdir)/acpi_config.cpp  pcmcia.moc battery.moc acpi_config.moc warning.moc main.moc power.moc
+kcm_laptop_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/battery.cpp $(srcdir)/main.cpp $(srcdir)/pcmcia.cpp $(srcdir)/power.cpp $(srcdir)/warning.cpp $(srcdir)/portable.cpp $(srcdir)/acpi_config.cpp  pcmcia.moc main.moc battery.moc acpi_config.moc warning.moc power.moc
 	@@echo 'creating kcm_laptop_la.all_cpp.cpp ...'; \
 	rm -f kcm_laptop_la.all_cpp.files kcm_laptop_la.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> kcm_laptop_la.all_cpp.final; \
@@@@ -972,33 +987,33 @@@@ kcm_laptop_la.all_cpp.cpp: $(srcdir)/Mak
 	rm -f kcm_laptop_la.all_cpp.final kcm_laptop_la.all_cpp.files
 
 #>+ 11
-klaptopdaemon_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/laptop_daemon.cpp $(srcdir)/kpcmcia.cpp $(srcdir)/kpcmciainfo.cpp $(srcdir)/daemondock.cpp $(srcdir)/notify.cpp $(srcdir)/portable.cpp $(srcdir)/acpi_config.cpp  daemondock.moc acpi_config.moc kpcmcia.moc notify.moc laptop_daemon.moc kpcmciainfo.moc
-	@@echo 'creating klaptopdaemon_la.all_cpp.cpp ...'; \
-	rm -f klaptopdaemon_la.all_cpp.files klaptopdaemon_la.all_cpp.final; \
-	echo "#define KDE_USE_FINAL 1" >> klaptopdaemon_la.all_cpp.final; \
+libklaptopdaemon_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/laptop_daemon.cpp $(srcdir)/kpcmcia.cpp $(srcdir)/kpcmciainfo.cpp $(srcdir)/daemondock.cpp $(srcdir)/notify.cpp $(srcdir)/portable.cpp $(srcdir)/acpi_config.cpp  daemondock.moc kpcmcia.moc notify.moc kpcmciainfo.moc acpi_config.moc laptop_daemon.moc
+	@@echo 'creating libklaptopdaemon_main_la.all_cpp.cpp ...'; \
+	rm -f libklaptopdaemon_main_la.all_cpp.files libklaptopdaemon_main_la.all_cpp.final; \
+	echo "#define KDE_USE_FINAL 1" >> libklaptopdaemon_main_la.all_cpp.final; \
 	for file in laptop_daemon.cpp kpcmcia.cpp kpcmciainfo.cpp daemondock.cpp notify.cpp portable.cpp acpi_config.cpp ; do \
-	  echo "#include \"$$file\"" >> klaptopdaemon_la.all_cpp.files; \
-	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> klaptopdaemon_la.all_cpp.final; \
+	  echo "#include \"$$file\"" >> libklaptopdaemon_main_la.all_cpp.files; \
+	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libklaptopdaemon_main_la.all_cpp.final; \
 	done; \
-	cat klaptopdaemon_la.all_cpp.final klaptopdaemon_la.all_cpp.files > klaptopdaemon_la.all_cpp.cpp; \
-	rm -f klaptopdaemon_la.all_cpp.final klaptopdaemon_la.all_cpp.files
+	cat libklaptopdaemon_main_la.all_cpp.final libklaptopdaemon_main_la.all_cpp.files > libklaptopdaemon_main_la.all_cpp.cpp; \
+	rm -f libklaptopdaemon_main_la.all_cpp.final libklaptopdaemon_main_la.all_cpp.files
 
 #>+ 3
 clean-final:
-	-rm -f kcm_laptop_la.all_cpp.cpp klaptopdaemon_la.all_cpp.cpp
+	-rm -f kcm_laptop_la.all_cpp.cpp libklaptopdaemon_main_la.all_cpp.cpp
 
 #>+ 2
 final:
-	$(MAKE) kcm_laptop_la_OBJECTS="$(kcm_laptop_la_final_OBJECTS)" klaptopdaemon_la_OBJECTS="$(klaptopdaemon_la_final_OBJECTS)" all-am
+	$(MAKE) kcm_laptop_la_OBJECTS="$(kcm_laptop_la_final_OBJECTS)" libklaptopdaemon_main_la_OBJECTS="$(libklaptopdaemon_main_la_final_OBJECTS)" all-am
 #>+ 2
 final-install:
-	$(MAKE) kcm_laptop_la_OBJECTS="$(kcm_laptop_la_final_OBJECTS)" klaptopdaemon_la_OBJECTS="$(klaptopdaemon_la_final_OBJECTS)" install-am
+	$(MAKE) kcm_laptop_la_OBJECTS="$(kcm_laptop_la_final_OBJECTS)" libklaptopdaemon_main_la_OBJECTS="$(libklaptopdaemon_main_la_final_OBJECTS)" install-am
 #>+ 2
 no-final:
-	$(MAKE) kcm_laptop_la_OBJECTS="$(kcm_laptop_la_nofinal_OBJECTS)" klaptopdaemon_la_OBJECTS="$(klaptopdaemon_la_nofinal_OBJECTS)" all-am
+	$(MAKE) kcm_laptop_la_OBJECTS="$(kcm_laptop_la_nofinal_OBJECTS)" libklaptopdaemon_main_la_OBJECTS="$(libklaptopdaemon_main_la_nofinal_OBJECTS)" all-am
 #>+ 2
 no-final-install:
-	$(MAKE) kcm_laptop_la_OBJECTS="$(kcm_laptop_la_nofinal_OBJECTS)" klaptopdaemon_la_OBJECTS="$(klaptopdaemon_la_nofinal_OBJECTS)" install-am
+	$(MAKE) kcm_laptop_la_OBJECTS="$(kcm_laptop_la_nofinal_OBJECTS)" libklaptopdaemon_main_la_OBJECTS="$(libklaptopdaemon_main_la_nofinal_OBJECTS)" install-am
 #>+ 3
 cvs-clean:
 	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
@@@@ -1008,25 +1023,25 @@@@ kde-rpo-clean:
 	-rm -f *.rpo
 
 #>+ 23
-laptop_daemon.lo: laptop_daemon.moc 
-daemondock.o: daemondock.moc 
-pcmcia.o: pcmcia.moc 
-kpcmciainfo.lo: kpcmciainfo.moc 
-battery.lo: battery.moc 
-power.o: power.moc 
+kpcmcia.o: kpcmcia.moc 
+kpcmcia.lo: kpcmcia.moc 
+laptop_daemon.o: laptop_daemon.moc 
 notify.o: notify.moc 
-power.lo: power.moc 
-daemondock.lo: daemondock.moc 
-pcmcia.lo: pcmcia.moc 
+power.o: power.moc 
+notify.lo: notify.moc 
 warning.lo: warning.moc 
-kpcmcia.o: kpcmcia.moc 
-kpcmciainfo.o: kpcmciainfo.moc 
+warning.o: warning.moc 
 acpi_config.lo: acpi_config.moc 
 main.lo: main.moc 
+laptop_daemon.lo: laptop_daemon.moc 
+kpcmciainfo.o: kpcmciainfo.moc 
+battery.o: battery.moc 
 acpi_config.o: acpi_config.moc 
-notify.lo: notify.moc 
-warning.o: warning.moc 
+pcmcia.lo: pcmcia.moc 
+battery.lo: battery.moc 
+daemondock.lo: daemondock.moc 
+daemondock.o: daemondock.moc 
+pcmcia.o: pcmcia.moc 
 main.o: main.moc 
-battery.o: battery.moc 
-kpcmcia.lo: kpcmcia.moc 
-laptop_daemon.o: laptop_daemon.moc 
+kpcmciainfo.lo: kpcmciainfo.moc 
+power.lo: power.moc 
@


1.7
log
@Update to KDE 3.1.5.

Changes:
* kdf: Fixed mem leak
* khexedit: Fixed 64 bit float big endian decoding
* khexedit: Honour ignore case setting in find next (F3)
* khexedit: Fix crash on systems which need strict alignments for double
  variables (HP-UX)
@
text
@d1 1
a1 1
$NetBSD$
@


1.6
log
@Update kdeutils to 3.1.3.

Changes:
* kcalc: ignore keypresses combined with alt, Meta or Control
* kjots: Fix DnD issues
* kedit: correct overwrite/insert handling
* kedit: fix session management
* ark: fix .rar archive handling.
* klaptopdaemon: icon updates.
* kdf: fix handling of mountpoints with whitespaces
* build system fixes
@
text
@d3 1
a3 1
--- klaptopdaemon/Makefile.in.orig	2003-07-15 22:19:25.000000000 +1200
d14 1
a14 1
@@@@ -271,20 +271,24 @@@@ target_os = @@target_os@@
d44 1
a44 1
@@@@ -311,49 +315,60 @@@@ kcm_laptop_la_nofinal_OBJECTS = battery.
d125 1
a125 1
@@@@ -378,7 +393,7 @@@@ CXXLD = $(CXX)
d134 1
a134 1
@@@@ -387,7 +402,7 @@@@ RECURSIVE_TARGETS = info-recursive dvi-r
d143 1
a143 1
@@@@ -467,6 +482,8 @@@@ clean-libLTLIBRARIES:
d152 1
a152 1
@@@@ -509,7 +526,8 @@@@ distclean-compile:
d162 1
a162 1
@@@@ -685,7 +703,7 @@@@ distclean-tags:
d166 1
a166 1
-KDE_DIST=pcmcia.h power.h portable.h daemondock.h laptop_daemon.h kpcmciainfo.h main.h acpi_config.h warning.h kpcmcia.h notify.h configure.in.in battery.h version.h 
d171 1
a171 1
@@@@ -851,9 +869,6 @@@@ uninstall-info: uninstall-info-recursive
d181 9
a189 1
@@@@ -874,11 +889,23 @@@@ kpcmcia.moc: $(srcdir)/kpcmcia.h
d191 2
a192 1
 mocs: kpcmcia.moc
d194 2
a195 2
-kpcmciainfo.moc: $(srcdir)/kpcmciainfo.h
-	$(MOC) $(srcdir)/kpcmciainfo.h -o kpcmciainfo.moc
d200 1
a200 1
-mocs: kpcmciainfo.moc
a201 12
+#>+ 3
+daemondock.moc: $(srcdir)/daemondock.h
+	$(MOC) $(srcdir)/daemondock.h -o daemondock.moc
+
+#>+ 1
+mocs: daemondock.moc
+#>+ 3
+notify.moc: $(srcdir)/notify.h
+	$(MOC) $(srcdir)/notify.h -o notify.moc
+
+#>+ 1
+mocs: notify.moc
d203 29
a231 3
 main.moc: $(srcdir)/main.h
 	$(MOC) $(srcdir)/main.h -o main.moc
@@@@ -886,17 +913,23 @@@@ main.moc: $(srcdir)/main.h
d233 2
a234 1
 mocs: main.moc
d236 2
d240 3
a242 2
+
+#>+ 1
d244 5
a248 3
+#>+ 3
 battery.moc: $(srcdir)/battery.h
 	$(MOC) $(srcdir)/battery.h -o battery.moc
d251 3
a253 4
 mocs: battery.moc
 #>+ 3
-daemondock.moc: $(srcdir)/daemondock.h
-	$(MOC) $(srcdir)/daemondock.h -o daemondock.moc
d256 2
a257 3
 
 #>+ 1
-mocs: daemondock.moc
d262 1
a262 1
@@@@ -910,32 +943,14 @@@@ warning.moc: $(srcdir)/warning.h
d264 1
a264 1
 mocs: warning.moc
d266 4
a269 14
-pcmcia.moc: $(srcdir)/pcmcia.h
-	$(MOC) $(srcdir)/pcmcia.h -o pcmcia.moc
-
-#>+ 1
-mocs: pcmcia.moc
-#>+ 3
-notify.moc: $(srcdir)/notify.h
-	$(MOC) $(srcdir)/notify.h -o notify.moc
-
-#>+ 1
-mocs: notify.moc
-#>+ 3
 laptop_daemon.moc: $(srcdir)/laptop_daemon.h
 	$(MOC) $(srcdir)/laptop_daemon.h -o laptop_daemon.moc
d272 8
a279 1
 mocs: laptop_daemon.moc
a280 6
-acpi_config.moc: $(srcdir)/acpi_config.h
-	$(MOC) $(srcdir)/acpi_config.h -o acpi_config.moc
-
-#>+ 1
-mocs: acpi_config.moc
-#>+ 3
d282 1
a282 1
-	-rm -f  kpcmcia.moc kpcmciainfo.moc main.moc battery.moc daemondock.moc power.moc warning.moc pcmcia.moc notify.moc laptop_daemon.moc acpi_config.moc
d287 1
a287 1
@@@@ -952,7 +967,7 @@@@ force-reedit:
d291 1
a291 1
-kcm_laptop_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/battery.cpp $(srcdir)/main.cpp $(srcdir)/pcmcia.cpp $(srcdir)/power.cpp $(srcdir)/warning.cpp $(srcdir)/portable.cpp $(srcdir)/acpi_config.cpp  battery.moc pcmcia.moc warning.moc power.moc acpi_config.moc main.moc
d296 1
a296 1
@@@@ -964,33 +979,33 @@@@ kcm_laptop_la.all_cpp.cpp: $(srcdir)/Mak
d300 1
a300 1
-klaptopdaemon_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/laptop_daemon.cpp $(srcdir)/kpcmcia.cpp $(srcdir)/kpcmciainfo.cpp $(srcdir)/daemondock.cpp $(srcdir)/notify.cpp $(srcdir)/portable.cpp $(srcdir)/acpi_config.cpp  daemondock.moc kpcmcia.moc laptop_daemon.moc notify.moc kpcmciainfo.moc acpi_config.moc
d343 2
a344 1
@@@@ -1001,24 +1016,24 @@@@ kde-rpo-clean:
d347 4
a350 1
 kpcmcia.o: kpcmcia.moc 
d352 3
a354 6
-main.lo: main.moc 
-notify.o: notify.moc 
-pcmcia.lo: pcmcia.moc 
 kpcmcia.lo: kpcmcia.moc 
-main.o: main.moc 
-laptop_daemon.lo: laptop_daemon.moc 
d356 1
a356 3
+notify.o: notify.moc 
 power.o: power.moc 
-daemondock.o: daemondock.moc 
d358 7
a364 4
 notify.lo: notify.moc 
-battery.o: battery.moc 
-pcmcia.o: pcmcia.moc 
+warning.lo: warning.moc 
d367 1
a367 2
-daemondock.lo: daemondock.moc 
+main.lo: main.moc 
d372 1
d379 3
a381 2
+main.o: main.moc 
 kpcmciainfo.lo: kpcmciainfo.moc 
d383 1
a383 2
-warning.lo: warning.moc 
-kpcmciainfo.o: kpcmciainfo.moc 
@


1.5
log
@Update KDE to 3.1.2.

Changes:

kdeartwork:
* Fixed a potential printf() format string attack in the slideshow screensaver

kdepim:
* korganizer: Exchange plugin supports secure WebDAV.
* korganizer: Fix timezone handling when timezone names are Unicode strings.

kdeutils:
* kedit: Save immediately when Settings/Save Settings is called.
* khexedit: Fixed insertion of local files.
@
text
@d3 1
a3 1
--- klaptopdaemon/Makefile.in.orig	Thu May  8 00:08:46 2003
d14 1
a14 1
@@@@ -270,20 +270,24 @@@@ target_os = @@target_os@@
d44 1
a44 1
@@@@ -310,49 +314,60 @@@@ kcm_laptop_la_nofinal_OBJECTS = battery.
d125 1
a125 1
@@@@ -377,7 +392,7 @@@@ CXXLD = $(CXX)
d134 1
a134 1
@@@@ -386,7 +401,7 @@@@ RECURSIVE_TARGETS = info-recursive dvi-r
d143 1
a143 1
@@@@ -466,6 +481,8 @@@@ clean-libLTLIBRARIES:
d152 1
a152 1
@@@@ -508,7 +525,8 @@@@ distclean-compile:
d162 1
a162 1
@@@@ -684,7 +702,7 @@@@ distclean-tags:
d167 1
a167 1
+KDE_DIST=power.h warning.h configure.in.in kpcmciainfo.h acpi_config.h battery.h version.h pcmcia.h portable.h daemondock.h main.h kpcmcia.h laptop_daemon.h notify.h 
d171 1
a171 1
@@@@ -850,9 +868,6 @@@@ uninstall-info: uninstall-info-recursive
d181 3
a183 3
@@@@ -871,20 +886,32 @@@@ kpcmcia.moc: $(srcdir)/kpcmcia.h
 	$(MOC) $(srcdir)/kpcmcia.h -o kpcmcia.moc
 
d189 4
a192 1
+
d197 2
d202 3
a204 1
 
d208 3
a210 1
 
d215 2
d221 2
d229 3
d234 4
a237 3
@@@@ -895,24 +922,12 @@@@ warning.moc: $(srcdir)/warning.h
 	$(MOC) $(srcdir)/warning.h -o warning.moc
 
d242 2
d248 2
d254 2
d260 2
d269 1
a269 1
@@@@ -929,7 +944,7 @@@@ force-reedit:
d278 1
a278 1
@@@@ -941,33 +956,33 @@@@ kcm_laptop_la.all_cpp.cpp: $(srcdir)/Mak
d325 1
a325 1
@@@@ -978,24 +993,24 @@@@ kde-rpo-clean:
@


1.4
log
@Update KDE to 3.1.

Many bugfixes and functionality enhancements including:

kdeaddons

 NEW IN KDE: Noatun plugin to search for lyrics of the current song.

kdeadmin

 kcmlinuz: is now a standalone application
 kcmlinuz: Added capability to search for configuration options


kdeedu

 NEW IN KDE: Kiten, a Japanese Reference Tool.
 NEW IN KDE: FlashKard, a vocabulary tool. Is able to read KVTML files which
 were written by KVocTrain.
 NEW IN KDE: started a libkdeedu, which allows interopability and code
 sharing between KDE Educational applications.


kdepim

 libkabc
   Plugin interface for resources and formats.
   Control module for configuring multiple resources.
   Optional directory resource which stores each entry as own file.
   LDAP resource.
   Optional binary storage format for better performance with large
   addressbooks.
   Completed support for vCard entities: sound, geo, key and some more.
   vCard 2.1 import.
   LDAP aware mail address input field.
 KAddressbook
   New card and icon views.
   Multiple configurable views.
   "kab-style" details view for selected entry.
   Customizable view filters.
   Customizable categories for addressbook entries.
   Support for transparently accessing multiple addressbooks.
   Redesigned entry editor widget.
   Printing option supporting two different styles.
   Optional embedded entry and ditribution list editor.
   "Jump bar" for quick alphabetical access of entries.
   Fetch addresses from LDAP servers, including support for multiple servers.
   Importing of vCard 2.1 files.
   Improved CSV import (including template for import from Outlook 2000).
   vCard export.
 KAlarm
   Added option to execute commands in alarms.
   Implemented daily, weekly, monthly and annual recurrences.
   Optionally play audio notification when an alarm triggers.
 KPilot
   Added time conduit
   VCal conduits (TODO and Calendar) have been improved to function properly.
   Addressbook conduit has been ported to use libkabc.
 KOrganizer
   General
     User definable templates for events and TODOs.
     Alarms for TODOs.
     Added support for automatic HTML export on save of a calendar file.
     Time table print view.
     New "location" attribute for events.
     Experimental "Get Hot New Stuff" button for downloading and uploading
     calendar files of common interest.
   Views
     Added new "Next 3 days" view.
     Added selection of time span for a new event in day and week views.
     Direct manipulation of priority, completion status and categories of
     TODOs by context menus added.
     Deletion of individual instances of recurring events.
     Rewritten month view.
     Coloring of events in month view based on categories.
     Coloring of due and overdue todos.
     Improved "What's Next" view.
     Configurable cell height in week and day views
   Group scheduling
     iMIP group scheduling functions for TODOs.
     Publishing of Free/Busy information by iMIP conformant email.
     Improved automatisation of group scheduling.
   Interopability and integration
     Support for "webcal" URLs in Konqueror (known from Apple iCal).
     Support for iCalendar based drag&drop.
     KOrganizer now shares the dialogs for categories with KAddressBook.
     Improved iCalendar conformance.
     Improved right-to-left languages support.
     Bug fixes for non-latin1 encodings.
   Plugins
     New plugin for importing Birthdays of contacts in the KDE address book.
     New plugin for accessing calendar data stored on an Exchange 2000 server.


kdeutils

 Partially ACPI support in KLaptop.
@
text
@d3 1
a3 1
--- klaptopdaemon/Makefile.in.orig	Fri Jan 17 08:58:07 2003
d5 11
a15 2
@@@@ -245,20 +245,24 @@@@ qt_includes = @@qt_includes@@
 qt_libraries = @@qt_libraries@@
d44 1
a44 10
@@@@ -268,7 +272,7 @@@@ kcm_laptop_la_LIBADD = $(LIB_KFILE)
 
 INCLUDES = $(all_includes)
 
-LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic
+LDFLAGS = $(all_libraries) $(KDE_RPATH) $(EXPORT_SYMBOLS_LDFLAGS)
 
 #>- kcm_laptop_la_METASOURCES = AUTO
 subdir = klaptopdaemon
@@@@ -287,24 +291,32 @@@@ kcm_laptop_la_nofinal_OBJECTS = battery.
a86 1
 DEFS = @@DEFS@@
d88 1
a88 1
@@@@ -314,25 +326,28 @@@@ depcomp = $(SHELL) $(top_srcdir)/admin/d
d125 2
a126 1
@@@@ -358,7 +373,7 @@@@ CXXLINK = $(LIBTOOL) --mode=link --tag=C
a127 1
 CXXFLAGS = @@CXXFLAGS@@
d132 4
a135 4
 RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
 	uninstall-info-recursive all-recursive install-data-recursive \
@@@@ -366,7 +381,7 @@@@ RECURSIVE_TARGETS = info-recursive dvi-r
 	uninstall-recursive check-recursive installcheck-recursive
d143 1
a143 1
@@@@ -446,6 +461,8 @@@@ clean-libLTLIBRARIES:
d152 1
a152 1
@@@@ -488,7 +505,8 @@@@ distclean-compile:
d162 2
a163 2
@@@@ -628,7 +646,7 @@@@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
d167 1
a167 1
+KDE_DIST=power.h Makefile.am.rej warning.h configure.in.in kpcmciainfo.h acpi_config.h battery.h version.h pcmcia.h portable.h daemondock.h main.h kpcmcia.h laptop_daemon.h notify.h 
d171 1
a171 1
@@@@ -778,9 +796,6 @@@@ uninstall-info: uninstall-info-recursive
d181 1
a181 1
@@@@ -799,20 +814,32 @@@@ kpcmcia.moc: $(srcdir)/kpcmcia.h
d218 1
a218 1
@@@@ -823,24 +850,12 @@@@ warning.moc: $(srcdir)/warning.h
d244 1
a244 1
@@@@ -857,7 +872,7 @@@@ force-reedit:
d253 1
a253 1
@@@@ -869,33 +884,33 @@@@ kcm_laptop_la.all_cpp.cpp: $(srcdir)/Mak
d300 1
a300 1
@@@@ -906,24 +921,24 @@@@ kde-rpo-clean:
@


1.3
log
@"-export-dynamic" -> "$(EXPORT_SYMBOLS_LDFLAGS)" to build on Solaris.
@
text
@d1 1
a1 1
$NetBSD: patch-ak,v 1.2 2003/01/02 09:12:29 skrll Exp $
d3 1
a3 1
--- klaptopdaemon/Makefile.in.orig	Tue Dec 17 23:55:05 2002
d5 2
a6 1
@@@@ -226,18 +226,22 @@@@ qt_libraries = @@qt_libraries@@
a8 1
 
d15 4
a18 2
-klaptopdaemon_la_SOURCES = laptop_daemon.cpp kpcmcia.cpp kpcmciainfo.cpp daemondock.cpp notify.cpp portable.cpp
+libklaptopdaemon_main_la_SOURCES = laptop_daemon.cpp kpcmcia.cpp kpcmciainfo.cpp daemondock.cpp notify.cpp portable.cpp
d33 3
a35 3
 kcm_laptop_la_SOURCES = battery.cpp  main.cpp  pcmcia.cpp  power.cpp  warning.cpp portable.cpp
 
@@@@ -246,7 +250,7 @@@@
d44 2
a45 2
@@@@ -265,24 +269,30 @@@@ kcm_laptop_la_nofinal_OBJECTS = battery.
 	warning.lo portable.lo
d50 1
a50 1
-	daemondock.lo notify.lo portable.lo
d54 6
d64 2
a65 1
+	kpcmciainfo.lo daemondock.lo notify.lo portable.lo
d68 1
a68 6
 #>+ 5
-klaptopdaemon_la_final_OBJECTS = klaptopdaemon_la.all_cpp.lo 
-klaptopdaemon_la_nofinal_OBJECTS = laptop_daemon.lo kpcmcia.lo kpcmciainfo.lo \
-	daemondock.lo notify.lo portable.lo
-@@KDE_USE_FINAL_FALSE@@klaptopdaemon_la_OBJECTS = $(klaptopdaemon_la_nofinal_OBJECTS)
-@@KDE_USE_FINAL_TRUE@@klaptopdaemon_la_OBJECTS = $(klaptopdaemon_la_final_OBJECTS)
d71 2
a72 1
+	kpcmciainfo.lo daemondock.lo notify.lo portable.lo
d89 38
a126 36
@@@@ -290,23 +300,26 @@@@ CPPFLAGS = @@CPPFLAGS@@
 LIBS = @@LIBS@@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 #>- @@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/battery.Plo $(DEPDIR)/daemondock.Plo \
-#>- @@AMDEP_TRUE@@	$(DEPDIR)/dummy.Po $(DEPDIR)/kpcmcia.Plo \
-#>- @@AMDEP_TRUE@@	$(DEPDIR)/kpcmciainfo.Plo \
+#>- @@AMDEP_TRUE@@	$(DEPDIR)/klaptopdaemon_main.Plo \
+#>- @@AMDEP_TRUE@@	$(DEPDIR)/klaptopdaemon_main.Po \
+#>- @@AMDEP_TRUE@@	$(DEPDIR)/kpcmcia.Plo $(DEPDIR)/kpcmciainfo.Plo \
 #>- @@AMDEP_TRUE@@	$(DEPDIR)/laptop_daemon.Plo $(DEPDIR)/main.Plo \
 #>- @@AMDEP_TRUE@@	$(DEPDIR)/notify.Plo $(DEPDIR)/pcmcia.Plo \
 #>- @@AMDEP_TRUE@@	$(DEPDIR)/portable.Plo $(DEPDIR)/power.Plo \
 #>- @@AMDEP_TRUE@@	$(DEPDIR)/warning.Plo
-#>+ 15
-@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES =   $(DEPDIR)/kcm_laptop_la.all_cpp.P $(DEPDIR)/klaptopdaemon_la.all_cpp.P  $(DEPDIR)/battery.Plo $(DEPDIR)/daemondock.Plo \
-@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@	@@AMDEP_TRUE@@	$(DEPDIR)/dummy.Po $(DEPDIR)/kpcmcia.Plo \
-@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@	@@AMDEP_TRUE@@	$(DEPDIR)/kpcmciainfo.Plo \
+#>+ 17
+@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@DEP_FILES =   $(DEPDIR)/kcm_laptop_la.all_cpp.P $(DEPDIR)/libklaptopdaemon_main_la.all_cpp.P  $(DEPDIR)/battery.Plo $(DEPDIR)/daemondock.Plo \
+@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@	@@AMDEP_TRUE@@	$(DEPDIR)/klaptopdaemon_main.Plo \
+@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@	@@AMDEP_TRUE@@	$(DEPDIR)/klaptopdaemon_main.Po \
+@@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@	@@AMDEP_TRUE@@	$(DEPDIR)/kpcmcia.Plo $(DEPDIR)/kpcmciainfo.Plo \
 @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@	@@AMDEP_TRUE@@	$(DEPDIR)/laptop_daemon.Plo $(DEPDIR)/main.Plo \
 @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@	@@AMDEP_TRUE@@	$(DEPDIR)/notify.Plo $(DEPDIR)/pcmcia.Plo \
 @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@	@@AMDEP_TRUE@@	$(DEPDIR)/portable.Plo $(DEPDIR)/power.Plo \
 @@AMDEP_TRUE@@@@KDE_USE_FINAL_TRUE@@	@@AMDEP_TRUE@@	$(DEPDIR)/warning.Plo
 @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@DEP_FILES =   $(DEPDIR)/battery.Plo $(DEPDIR)/daemondock.Plo \
-@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@	@@AMDEP_TRUE@@	$(DEPDIR)/dummy.Po $(DEPDIR)/kpcmcia.Plo \
-@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@	@@AMDEP_TRUE@@	$(DEPDIR)/kpcmciainfo.Plo \
+@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@	@@AMDEP_TRUE@@	$(DEPDIR)/klaptopdaemon_main.Plo \
+@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@	@@AMDEP_TRUE@@	$(DEPDIR)/klaptopdaemon_main.Po \
+@@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@	@@AMDEP_TRUE@@	$(DEPDIR)/kpcmcia.Plo $(DEPDIR)/kpcmciainfo.Plo \
 @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@	@@AMDEP_TRUE@@	$(DEPDIR)/laptop_daemon.Plo $(DEPDIR)/main.Plo \
 @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@	@@AMDEP_TRUE@@	$(DEPDIR)/notify.Plo $(DEPDIR)/pcmcia.Plo \
 @@AMDEP_TRUE@@@@KDE_USE_FINAL_FALSE@@	@@AMDEP_TRUE@@	$(DEPDIR)/portable.Plo $(DEPDIR)/power.Plo \
@@@@ -332,7 +345,7 @@@@ CXXLINK = $(LIBTOOL) --mode=link --tag=C
d135 1
a135 1
@@@@ -340,7 +353,7 @@@@ RECURSIVE_TARGETS = info-recursive dvi-r
d144 1
a144 1
@@@@ -413,6 +426,8 @@@@ clean-libLTLIBRARIES:
d150 1
d153 12
a164 13
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
@@@@ -449,7 +464,8 @@@@ distclean-compile:
 
 @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/battery.Plo@@am__quote@@
 @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/daemondock.Plo@@am__quote@@
-@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/dummy.Po@@am__quote@@
+@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/klaptopdaemon_main.Plo@@am__quote@@
+@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/klaptopdaemon_main.Po@@am__quote@@
 @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kpcmcia.Plo@@am__quote@@
 @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kpcmciainfo.Plo@@am__quote@@
 @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/laptop_daemon.Plo@@am__quote@@
@@@@ -577,7 +593,7 @@@@ distclean-tags:
 
d167 2
a168 2
-KDE_DIST=pcmcia.h power.h portable.h daemondock.h laptop_daemon.h kpcmciainfo.h warning.h kpcmcia.h notify.h configure.in.in battery.h version.h 
+KDE_DIST=power.h warning.h configure.in.in kpcmciainfo.h battery.h version.h portable.h daemondock.h pcmcia.h kpcmcia.h laptop_daemon.h notify.h 
d172 1
a172 1
@@@@ -721,9 +737,6 @@@@ uninstall-info: uninstall-info-recursive
d182 1
a182 9
@@@@ -738,20 +751,28 @@@@ kcm_laptop.la.closure: $(kcm_laptop_la_O
 
 
 #>+ 3
+kpcmciainfo.moc: $(srcdir)/kpcmciainfo.h
+	$(MOC) $(srcdir)/kpcmciainfo.h -o kpcmciainfo.moc
+
+#>+ 3
 kpcmcia.moc: $(srcdir)/kpcmcia.h
d194 4
d200 8
d214 2
a215 2
+notify.moc: $(srcdir)/notify.h
+	$(MOC) $(srcdir)/notify.h -o notify.moc
d219 1
a219 1
@@@@ -762,20 +783,12 @@@@ warning.moc: $(srcdir)/warning.h
d235 4
d240 2
a241 2
-	-rm -f  kpcmcia.moc kpcmciainfo.moc battery.moc daemondock.moc power.moc warning.moc pcmcia.moc notify.moc laptop_daemon.moc
+	-rm -f  kpcmciainfo.moc kpcmcia.moc pcmcia.moc daemondock.moc battery.moc notify.moc power.moc warning.moc laptop_daemon.moc
d245 1
a245 1
@@@@ -792,7 +805,7 @@@@ force-reedit:
d249 2
a250 2
-kcm_laptop_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/battery.cpp $(srcdir)/main.cpp $(srcdir)/pcmcia.cpp $(srcdir)/power.cpp $(srcdir)/warning.cpp $(srcdir)/portable.cpp  battery.moc pcmcia.moc warning.moc power.moc
+kcm_laptop_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/battery.cpp $(srcdir)/main.cpp $(srcdir)/pcmcia.cpp $(srcdir)/power.cpp $(srcdir)/warning.cpp $(srcdir)/portable.cpp  pcmcia.moc battery.moc power.moc warning.moc
d254 1
a254 1
@@@@ -804,33 +817,33 @@@@ kcm_laptop_la.all_cpp.cpp: $(srcdir)/Mak
d258 1
a258 1
-klaptopdaemon_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/laptop_daemon.cpp $(srcdir)/kpcmcia.cpp $(srcdir)/kpcmciainfo.cpp $(srcdir)/daemondock.cpp $(srcdir)/notify.cpp $(srcdir)/portable.cpp  daemondock.moc kpcmcia.moc laptop_daemon.moc notify.moc kpcmciainfo.moc
d262 1
a262 1
+libklaptopdaemon_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/laptop_daemon.cpp $(srcdir)/kpcmcia.cpp $(srcdir)/kpcmciainfo.cpp $(srcdir)/daemondock.cpp $(srcdir)/notify.cpp $(srcdir)/portable.cpp  daemondock.moc kpcmcia.moc notify.moc kpcmciainfo.moc laptop_daemon.moc
d266 1
a266 1
 	for file in laptop_daemon.cpp kpcmcia.cpp kpcmciainfo.cpp daemondock.cpp notify.cpp portable.cpp ; do \
d301 1
a301 1
@@@@ -841,20 +854,20 @@@@ kde-rpo-clean:
d303 1
a303 1
 #>+ 19
d306 1
d310 1
d318 2
d322 3
d327 3
a329 2
 battery.o: battery.moc 
-pcmcia.o: pcmcia.moc 
d332 1
a332 2
 daemondock.lo: daemondock.moc 
-warning.o: warning.moc 
d335 1
@


1.2
log
@Update KDE to the 3.0.5a distribution. Packages are numbered 3.0.5.1 or
1.0.5.1 accordingly.

Fixes and changes are:

Multiple vulnerabilities.

kdelibs
	KHTML : Fixed several crashes and misrenderings.
	rlogin.protocol: fixed command execution in specially crafted
	urls.

kdebase
	KAddressbook: Don't squeeze columns on startup/properly restore
	column width settings.

kdenetwork
	lisa, reslisa: Fixed several security vulnerabilities.

kdesdk
	Cervisia: Show long lines in diff view always completely.
@
text
@d1 1
a1 1
$NetBSD$
d3 1
a3 1
--- klaptopdaemon/Makefile.in.orig	Mon Dec 30 16:24:30 2002
d33 9
@


1.1
log
@Initial revision
@
text
@d3 1
a3 1
--- klaptopdaemon/Makefile.in.orig	Wed May  8 21:11:42 2002
d5 1
a5 1
@@@@ -227,18 +227,22 @@@@
d33 2
a34 2
@@@@ -267,25 +271,31 @@@@
 	kcm_laptop_la_meta_unload.lo 
d49 2
a50 2
+#>- $(am_libklaptopdaemon_main_la_OBJECTS)
 #>+ 6
d53 1
a53 2
-	daemondock.lo notify.lo portable.lo \
-	klaptopdaemon_la_meta_unload.lo 
d58 1
a58 2
+	kpcmciainfo.lo daemondock.lo notify.lo portable.lo \
+	libklaptopdaemon_main_la_meta_unload.lo 
d75 1
a75 1
@@@@ -293,8 +303,9 @@@@
d78 33
a110 10
 @@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/battery.Plo $(DEPDIR)/daemondock.Plo \
-	@@AMDEP_TRUE@@	$(DEPDIR)/dummy.Po $(DEPDIR)/kpcmcia.Plo \
-	@@AMDEP_TRUE@@	$(DEPDIR)/kpcmciainfo.Plo \
+	@@AMDEP_TRUE@@	$(DEPDIR)/klaptopdaemon_main.Plo \
+	@@AMDEP_TRUE@@	$(DEPDIR)/klaptopdaemon_main.Po \
+	@@AMDEP_TRUE@@	$(DEPDIR)/kpcmcia.Plo $(DEPDIR)/kpcmciainfo.Plo \
 	@@AMDEP_TRUE@@	$(DEPDIR)/laptop_daemon.Plo $(DEPDIR)/main.Plo \
 	@@AMDEP_TRUE@@	$(DEPDIR)/notify.Plo $(DEPDIR)/pcmcia.Plo \
 	@@AMDEP_TRUE@@	$(DEPDIR)/portable.Plo $(DEPDIR)/power.Plo \
@@@@ -319,7 +330,7 @@@@
d119 1
a119 1
@@@@ -327,7 +338,7 @@@@
d128 1
a128 1
@@@@ -400,6 +411,8 @@@@
d137 1
a137 1
@@@@ -436,7 +449,8 @@@@
d147 1
a147 1
@@@@ -564,7 +578,7 @@@@
d151 2
a152 2
-KDE_DIST=pcmcia.h configure.in.in battery.h notify.h power.h warning.h kpcmciainfo.h version.h daemondock.h portable.h kpcmcia.h laptop_daemon.h 
+KDE_DIST=power.h warning.h configure.in.in kpcmciainfo.h battery.h version.h klaptopdaemon portable.h daemondock.h pcmcia.h kcm_laptop.la.closure kpcmcia.h laptop_daemon.h notify.h dummy.cpp 
d156 1
a156 1
@@@@ -708,9 +722,6 @@@@
d166 30
a195 1
@@@@ -792,24 +803,24 @@@@
d197 4
d202 11
a212 20
 #>+ 12
-klaptopdaemon_la_meta_unload.cpp:  daemondock.moc kpcmcia.moc notify.moc kpcmciainfo.moc laptop_daemon.moc
-	@@echo 'creating klaptopdaemon_la_meta_unload.cpp'
-	@@-rm -f klaptopdaemon_la_meta_unload.cpp
+libklaptopdaemon_main_la_meta_unload.cpp:  daemondock.moc kpcmcia.moc notify.moc kpcmciainfo.moc laptop_daemon.moc
+	@@echo 'creating libklaptopdaemon_main_la_meta_unload.cpp'
+	@@-rm -f libklaptopdaemon_main_la_meta_unload.cpp
 	@@if test ${kde_qtver} = 2; then \
-		echo 'static const char * _metalist_klaptopdaemon_la[] = {' > klaptopdaemon_la_meta_unload.cpp ;\
-		cat  daemondock.moc kpcmcia.moc notify.moc kpcmciainfo.moc laptop_daemon.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> klaptopdaemon_la_meta_unload.cpp ;\
-		echo '0};' >> klaptopdaemon_la_meta_unload.cpp ;\
-		echo '#include <kunload.h>' >> klaptopdaemon_la_meta_unload.cpp ;\
-		echo '_UNLOAD(klaptopdaemon_la)' >> klaptopdaemon_la_meta_unload.cpp ;\
-	else echo > klaptopdaemon_la_meta_unload.cpp; fi
+		echo 'static const char * _metalist_libklaptopdaemon_main_la[] = {' > libklaptopdaemon_main_la_meta_unload.cpp ;\
+		cat  daemondock.moc kpcmcia.moc notify.moc kpcmciainfo.moc laptop_daemon.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libklaptopdaemon_main_la_meta_unload.cpp ;\
+		echo '0};' >> libklaptopdaemon_main_la_meta_unload.cpp ;\
+		echo '#include <kunload.h>' >> libklaptopdaemon_main_la_meta_unload.cpp ;\
+		echo '_UNLOAD(libklaptopdaemon_main_la)' >> libklaptopdaemon_main_la_meta_unload.cpp ;\
+	else echo > libklaptopdaemon_main_la_meta_unload.cpp; fi
d214 4
d220 3
a222 3
 clean-moc-classes:
-	-rm -f  kcm_laptop_la_meta_unload.cpp klaptopdaemon_la_meta_unload.cpp
+	-rm -f  kcm_laptop_la_meta_unload.cpp libklaptopdaemon_main_la_meta_unload.cpp
d225 2
a226 2
-kcm_laptop_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/battery.cpp $(srcdir)/main.cpp $(srcdir)/pcmcia.cpp $(srcdir)/power.cpp $(srcdir)/warning.cpp $(srcdir)/portable.cpp kcm_laptop_la_meta_unload.cpp   kpcmciainfo.moc kpcmcia.moc pcmcia.moc daemondock.moc battery.moc notify.moc power.moc warning.moc laptop_daemon.moc 
+kcm_laptop_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/battery.cpp $(srcdir)/main.cpp $(srcdir)/pcmcia.cpp $(srcdir)/power.cpp $(srcdir)/warning.cpp $(srcdir)/portable.cpp $(srcdir)/kcm_laptop_la_meta_unload.cpp   kpcmciainfo.moc kpcmcia.moc pcmcia.moc daemondock.moc battery.moc notify.moc power.moc warning.moc laptop_daemon.moc 
d230 1
a230 1
@@@@ -821,11 +832,11 @@@@
d234 5
a238 16
-klaptopdaemon_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/laptop_daemon.cpp $(srcdir)/kpcmcia.cpp $(srcdir)/kpcmciainfo.cpp $(srcdir)/daemondock.cpp $(srcdir)/notify.cpp $(srcdir)/portable.cpp klaptopdaemon_la_meta_unload.cpp  
+klaptopdaemon_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/klaptopdaemon_main.cpp  
 	@@echo 'creating klaptopdaemon_la.all_cpp.cpp ...'; \
 	rm -f klaptopdaemon_la.all_cpp.files klaptopdaemon_la.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> klaptopdaemon_la.all_cpp.final; \
-	for file in laptop_daemon.cpp kpcmcia.cpp kpcmciainfo.cpp daemondock.cpp notify.cpp portable.cpp klaptopdaemon_la_meta_unload.cpp ; do \
+	for file in klaptopdaemon_main.cpp ; do \
 	  echo "#include \"$$file\"" >> klaptopdaemon_la.all_cpp.files; \
 	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> klaptopdaemon_la.all_cpp.final; \
 	done; \
@@@@ -833,11 +844,23 @@@@
 	rm -f klaptopdaemon_la.all_cpp.final klaptopdaemon_la.all_cpp.files
 
 #>+ 11
-klaptopdaemon.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp  
+libklaptopdaemon_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/laptop_daemon.cpp $(srcdir)/kpcmcia.cpp $(srcdir)/kpcmciainfo.cpp $(srcdir)/daemondock.cpp $(srcdir)/notify.cpp $(srcdir)/portable.cpp libklaptopdaemon_main_la_meta_unload.cpp  
d242 3
a244 1
+	for file in laptop_daemon.cpp kpcmcia.cpp kpcmciainfo.cpp daemondock.cpp notify.cpp portable.cpp libklaptopdaemon_main_la_meta_unload.cpp ; do \
d247 4
a250 2
+	done; \
+	cat libklaptopdaemon_main_la.all_cpp.final libklaptopdaemon_main_la.all_cpp.files  > libklaptopdaemon_main_la.all_cpp.cpp; \
a251 12
+
+#>+ 11
+klaptopdaemon.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/klaptopdaemon_main.cpp  
 	@@echo 'creating klaptopdaemon.all_cpp.cpp ...'; \
 	rm -f klaptopdaemon.all_cpp.files klaptopdaemon.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> klaptopdaemon.all_cpp.final; \
-	for file in dummy.cpp ; do \
+	for file in klaptopdaemon_main.cpp ; do \
 	  echo "#include \"$$file\"" >> klaptopdaemon.all_cpp.files; \
 	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> klaptopdaemon.all_cpp.final; \
 	done; \
@@@@ -846,20 +869,20 @@@@
d255 2
a256 2
-	-rm -f kcm_laptop_la.all_cpp.cpp klaptopdaemon_la.all_cpp.cpp klaptopdaemon.all_cpp.cpp
+	-rm -f kcm_laptop_la.all_cpp.cpp klaptopdaemon_la.all_cpp.cpp libklaptopdaemon_main_la.all_cpp.cpp klaptopdaemon.all_cpp.cpp
d276 33
a308 1
 	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
@


1.1.1.1
log
@Initial import of the kdeutils pkg (in the right place this time.)
@
text
@@


1.1.1.1.2.1
log
@file patch-ak was added on branch buildlink2 on 2002-06-23 18:53:45 +0000
@
text
@d1 246
@


1.1.1.1.2.2
log
@Merge from pkgsrc-current to buildlink2 branch.
@
text
@a0 246
$NetBSD: patch-ak,v 1.1.1.1.2.1 2002/06/23 18:53:45 jlam Exp $

--- klaptopdaemon/Makefile.in.orig	Wed May  8 21:11:42 2002
+++ klaptopdaemon/Makefile.in
@@@@ -227,18 +227,22 @@@@
 x_includes = @@x_includes@@
 x_libraries = @@x_libraries@@
 
-lib_LTLIBRARIES = klaptopdaemon.la
+lib_LTLIBRARIES = libklaptopdaemon_main.la klaptopdaemon.la
 kde_module_LTLIBRARIES = kcm_laptop.la
 bin_PROGRAMS = klaptopdaemon
 SUBDIRS = pics applnk
 
-klaptopdaemon_la_SOURCES = laptop_daemon.cpp kpcmcia.cpp kpcmciainfo.cpp daemondock.cpp notify.cpp portable.cpp
+libklaptopdaemon_main_la_SOURCES = laptop_daemon.cpp kpcmcia.cpp kpcmciainfo.cpp daemondock.cpp notify.cpp portable.cpp
+libklaptopdaemon_main_la_LDFLAGS = $(all_libraries)
+libklaptopdaemon_main_la_LIBADD = $(LIB_KDEUI)
+
+klaptopdaemon_la_SOURCES = klaptopdaemon_main.cpp
 klaptopdaemon_la_LDFLAGS = $(all_libraries) -module -avoid-version
-klaptopdaemon_la_LIBADD = $(LIB_KDEUI)
+klaptopdaemon_la_LIBADD = libklaptopdaemon_main.la
 
-klaptopdaemon_SOURCES = dummy.cpp
+klaptopdaemon_SOURCES = klaptopdaemon_main.cpp
 klaptopdaemon_LDFLAGS = $(all_libraries)
-klaptopdaemon_LDADD = klaptopdaemon.la
+klaptopdaemon_LDADD = libklaptopdaemon_main.la
 
 kcm_laptop_la_SOURCES = battery.cpp  main.cpp  pcmcia.cpp  power.cpp  warning.cpp portable.cpp
 
@@@@ -267,25 +271,31 @@@@
 	kcm_laptop_la_meta_unload.lo 
 @@KDE_USE_FINAL_FALSE@@kcm_laptop_la_OBJECTS = $(kcm_laptop_la_nofinal_OBJECTS)
 @@KDE_USE_FINAL_TRUE@@kcm_laptop_la_OBJECTS = $(kcm_laptop_la_final_OBJECTS)
-klaptopdaemon_la_DEPENDENCIES =
-am_klaptopdaemon_la_OBJECTS = laptop_daemon.lo kpcmcia.lo kpcmciainfo.lo \
-	daemondock.lo notify.lo portable.lo
+klaptopdaemon_la_DEPENDENCIES = libklaptopdaemon_main.la
+am_klaptopdaemon_la_OBJECTS = klaptopdaemon_main.lo
 #>- klaptopdaemon_la_OBJECTS = $(am_klaptopdaemon_la_OBJECTS)
+#>+ 1
+klaptopdaemon_la_OBJECTS = klaptopdaemon_main.lo
+libklaptopdaemon_main_la_DEPENDENCIES =
+am_libklaptopdaemon_main_la_OBJECTS = laptop_daemon.lo kpcmcia.lo \
+	kpcmciainfo.lo daemondock.lo notify.lo portable.lo
+#>- libklaptopdaemon_main_la_OBJECTS = \
+#>- $(am_libklaptopdaemon_main_la_OBJECTS)
 #>+ 6
-klaptopdaemon_la_final_OBJECTS = klaptopdaemon_la.all_cpp.lo 
-klaptopdaemon_la_nofinal_OBJECTS = laptop_daemon.lo kpcmcia.lo kpcmciainfo.lo \
-	daemondock.lo notify.lo portable.lo \
-	klaptopdaemon_la_meta_unload.lo 
-@@KDE_USE_FINAL_FALSE@@klaptopdaemon_la_OBJECTS = $(klaptopdaemon_la_nofinal_OBJECTS)
-@@KDE_USE_FINAL_TRUE@@klaptopdaemon_la_OBJECTS = $(klaptopdaemon_la_final_OBJECTS)
+libklaptopdaemon_main_la_final_OBJECTS = libklaptopdaemon_main_la.all_cpp.lo 
+libklaptopdaemon_main_la_nofinal_OBJECTS = laptop_daemon.lo kpcmcia.lo \
+	kpcmciainfo.lo daemondock.lo notify.lo portable.lo \
+	libklaptopdaemon_main_la_meta_unload.lo 
+@@KDE_USE_FINAL_FALSE@@libklaptopdaemon_main_la_OBJECTS = $(libklaptopdaemon_main_la_nofinal_OBJECTS)
+@@KDE_USE_FINAL_TRUE@@libklaptopdaemon_main_la_OBJECTS = $(libklaptopdaemon_main_la_final_OBJECTS)
 bin_PROGRAMS = klaptopdaemon$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS)
 
-am_klaptopdaemon_OBJECTS = dummy.$(OBJEXT)
+am_klaptopdaemon_OBJECTS = klaptopdaemon_main.$(OBJEXT)
 #>- klaptopdaemon_OBJECTS = $(am_klaptopdaemon_OBJECTS)
 #>+ 1
-klaptopdaemon_OBJECTS = dummy.$(OBJEXT)
-klaptopdaemon_DEPENDENCIES = klaptopdaemon.la
+klaptopdaemon_OBJECTS = klaptopdaemon_main.$(OBJEXT)
+klaptopdaemon_DEPENDENCIES = libklaptopdaemon_main.la
 
 DEFS = @@DEFS@@
 DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
@@@@ -293,8 +303,9 @@@@
 LIBS = @@LIBS@@
 depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 @@AMDEP_TRUE@@DEP_FILES = $(DEPDIR)/battery.Plo $(DEPDIR)/daemondock.Plo \
-	@@AMDEP_TRUE@@	$(DEPDIR)/dummy.Po $(DEPDIR)/kpcmcia.Plo \
-	@@AMDEP_TRUE@@	$(DEPDIR)/kpcmciainfo.Plo \
+	@@AMDEP_TRUE@@	$(DEPDIR)/klaptopdaemon_main.Plo \
+	@@AMDEP_TRUE@@	$(DEPDIR)/klaptopdaemon_main.Po \
+	@@AMDEP_TRUE@@	$(DEPDIR)/kpcmcia.Plo $(DEPDIR)/kpcmciainfo.Plo \
 	@@AMDEP_TRUE@@	$(DEPDIR)/laptop_daemon.Plo $(DEPDIR)/main.Plo \
 	@@AMDEP_TRUE@@	$(DEPDIR)/notify.Plo $(DEPDIR)/pcmcia.Plo \
 	@@AMDEP_TRUE@@	$(DEPDIR)/portable.Plo $(DEPDIR)/power.Plo \
@@@@ -319,7 +330,7 @@@@
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@@
 CXXFLAGS = @@CXXFLAGS@@
 DIST_SOURCES = $(kcm_laptop_la_SOURCES) $(klaptopdaemon_la_SOURCES) \
-	$(klaptopdaemon_SOURCES)
+	$(libklaptopdaemon_main_la_SOURCES) $(klaptopdaemon_SOURCES)
 
 RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
 	uninstall-info-recursive all-recursive install-data-recursive \
@@@@ -327,7 +338,7 @@@@
 	uninstall-recursive check-recursive installcheck-recursive
 DIST_COMMON = README Makefile.am Makefile.in
 DIST_SUBDIRS = $(SUBDIRS)
-SOURCES = $(kcm_laptop_la_SOURCES) $(klaptopdaemon_la_SOURCES) $(klaptopdaemon_SOURCES)
+SOURCES = $(kcm_laptop_la_SOURCES) $(klaptopdaemon_la_SOURCES) $(libklaptopdaemon_main_la_SOURCES) $(klaptopdaemon_SOURCES)
 
 #>- all: all-recursive
 #>+ 1
@@@@ -400,6 +411,8 @@@@
 	$(CXXLINK) -rpath $(kde_moduledir) $(kcm_laptop_la_LDFLAGS) $(kcm_laptop_la_OBJECTS) $(kcm_laptop_la_LIBADD) $(LIBS)
 klaptopdaemon.la: $(klaptopdaemon_la_OBJECTS) $(klaptopdaemon_la_DEPENDENCIES) 
 	$(CXXLINK) -rpath $(libdir) $(klaptopdaemon_la_LDFLAGS) $(klaptopdaemon_la_OBJECTS) $(klaptopdaemon_la_LIBADD) $(LIBS)
+libklaptopdaemon_main.la: $(libklaptopdaemon_main_la_OBJECTS) $(libklaptopdaemon_main_la_DEPENDENCIES) 
+	$(CXXLINK) -rpath $(libdir) $(libklaptopdaemon_main_la_LDFLAGS) $(libklaptopdaemon_main_la_OBJECTS) $(libklaptopdaemon_main_la_LIBADD) $(LIBS)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
@@@@ -436,7 +449,8 @@@@
 
 @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/battery.Plo@@am__quote@@
 @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/daemondock.Plo@@am__quote@@
-@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/dummy.Po@@am__quote@@
+@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/klaptopdaemon_main.Plo@@am__quote@@
+@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/klaptopdaemon_main.Po@@am__quote@@
 @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kpcmcia.Plo@@am__quote@@
 @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/kpcmciainfo.Plo@@am__quote@@
 @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@$(DEPDIR)/laptop_daemon.Plo@@am__quote@@
@@@@ -564,7 +578,7 @@@@
 
 #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 #>+ 4
-KDE_DIST=pcmcia.h configure.in.in battery.h notify.h power.h warning.h kpcmciainfo.h version.h daemondock.h portable.h kpcmcia.h laptop_daemon.h 
+KDE_DIST=power.h warning.h configure.in.in kpcmciainfo.h battery.h version.h klaptopdaemon portable.h daemondock.h pcmcia.h kcm_laptop.la.closure kpcmcia.h laptop_daemon.h notify.h dummy.cpp 
 
 DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
 
@@@@ -708,9 +722,6 @@@@
 messages:
 	$(XGETTEXT) $(klaptopdaemon_la_SOURCES) -o $(podir)/klaptopdaemon.pot
 	$(XGETTEXT) $(kcm_laptop_la_SOURCES) -o $(podir)/kcmlaptop.pot
-
-dummy.cpp:
-	echo >dummy.cpp
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
@@@@ -792,24 +803,24 @@@@
 
 
 #>+ 12
-klaptopdaemon_la_meta_unload.cpp:  daemondock.moc kpcmcia.moc notify.moc kpcmciainfo.moc laptop_daemon.moc
-	@@echo 'creating klaptopdaemon_la_meta_unload.cpp'
-	@@-rm -f klaptopdaemon_la_meta_unload.cpp
+libklaptopdaemon_main_la_meta_unload.cpp:  daemondock.moc kpcmcia.moc notify.moc kpcmciainfo.moc laptop_daemon.moc
+	@@echo 'creating libklaptopdaemon_main_la_meta_unload.cpp'
+	@@-rm -f libklaptopdaemon_main_la_meta_unload.cpp
 	@@if test ${kde_qtver} = 2; then \
-		echo 'static const char * _metalist_klaptopdaemon_la[] = {' > klaptopdaemon_la_meta_unload.cpp ;\
-		cat  daemondock.moc kpcmcia.moc notify.moc kpcmciainfo.moc laptop_daemon.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> klaptopdaemon_la_meta_unload.cpp ;\
-		echo '0};' >> klaptopdaemon_la_meta_unload.cpp ;\
-		echo '#include <kunload.h>' >> klaptopdaemon_la_meta_unload.cpp ;\
-		echo '_UNLOAD(klaptopdaemon_la)' >> klaptopdaemon_la_meta_unload.cpp ;\
-	else echo > klaptopdaemon_la_meta_unload.cpp; fi
+		echo 'static const char * _metalist_libklaptopdaemon_main_la[] = {' > libklaptopdaemon_main_la_meta_unload.cpp ;\
+		cat  daemondock.moc kpcmcia.moc notify.moc kpcmciainfo.moc laptop_daemon.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libklaptopdaemon_main_la_meta_unload.cpp ;\
+		echo '0};' >> libklaptopdaemon_main_la_meta_unload.cpp ;\
+		echo '#include <kunload.h>' >> libklaptopdaemon_main_la_meta_unload.cpp ;\
+		echo '_UNLOAD(libklaptopdaemon_main_la)' >> libklaptopdaemon_main_la_meta_unload.cpp ;\
+	else echo > libklaptopdaemon_main_la_meta_unload.cpp; fi
 
 
 #>+ 3
 clean-moc-classes:
-	-rm -f  kcm_laptop_la_meta_unload.cpp klaptopdaemon_la_meta_unload.cpp
+	-rm -f  kcm_laptop_la_meta_unload.cpp libklaptopdaemon_main_la_meta_unload.cpp
 
 #>+ 11
-kcm_laptop_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/battery.cpp $(srcdir)/main.cpp $(srcdir)/pcmcia.cpp $(srcdir)/power.cpp $(srcdir)/warning.cpp $(srcdir)/portable.cpp kcm_laptop_la_meta_unload.cpp   kpcmciainfo.moc kpcmcia.moc pcmcia.moc daemondock.moc battery.moc notify.moc power.moc warning.moc laptop_daemon.moc 
+kcm_laptop_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/battery.cpp $(srcdir)/main.cpp $(srcdir)/pcmcia.cpp $(srcdir)/power.cpp $(srcdir)/warning.cpp $(srcdir)/portable.cpp $(srcdir)/kcm_laptop_la_meta_unload.cpp   kpcmciainfo.moc kpcmcia.moc pcmcia.moc daemondock.moc battery.moc notify.moc power.moc warning.moc laptop_daemon.moc 
 	@@echo 'creating kcm_laptop_la.all_cpp.cpp ...'; \
 	rm -f kcm_laptop_la.all_cpp.files kcm_laptop_la.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> kcm_laptop_la.all_cpp.final; \
@@@@ -821,11 +832,11 @@@@
 	rm -f kcm_laptop_la.all_cpp.final kcm_laptop_la.all_cpp.files
 
 #>+ 11
-klaptopdaemon_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/laptop_daemon.cpp $(srcdir)/kpcmcia.cpp $(srcdir)/kpcmciainfo.cpp $(srcdir)/daemondock.cpp $(srcdir)/notify.cpp $(srcdir)/portable.cpp klaptopdaemon_la_meta_unload.cpp  
+klaptopdaemon_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/klaptopdaemon_main.cpp  
 	@@echo 'creating klaptopdaemon_la.all_cpp.cpp ...'; \
 	rm -f klaptopdaemon_la.all_cpp.files klaptopdaemon_la.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> klaptopdaemon_la.all_cpp.final; \
-	for file in laptop_daemon.cpp kpcmcia.cpp kpcmciainfo.cpp daemondock.cpp notify.cpp portable.cpp klaptopdaemon_la_meta_unload.cpp ; do \
+	for file in klaptopdaemon_main.cpp ; do \
 	  echo "#include \"$$file\"" >> klaptopdaemon_la.all_cpp.files; \
 	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> klaptopdaemon_la.all_cpp.final; \
 	done; \
@@@@ -833,11 +844,23 @@@@
 	rm -f klaptopdaemon_la.all_cpp.final klaptopdaemon_la.all_cpp.files
 
 #>+ 11
-klaptopdaemon.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp  
+libklaptopdaemon_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/laptop_daemon.cpp $(srcdir)/kpcmcia.cpp $(srcdir)/kpcmciainfo.cpp $(srcdir)/daemondock.cpp $(srcdir)/notify.cpp $(srcdir)/portable.cpp libklaptopdaemon_main_la_meta_unload.cpp  
+	@@echo 'creating libklaptopdaemon_main_la.all_cpp.cpp ...'; \
+	rm -f libklaptopdaemon_main_la.all_cpp.files libklaptopdaemon_main_la.all_cpp.final; \
+	echo "#define KDE_USE_FINAL 1" >> libklaptopdaemon_main_la.all_cpp.final; \
+	for file in laptop_daemon.cpp kpcmcia.cpp kpcmciainfo.cpp daemondock.cpp notify.cpp portable.cpp libklaptopdaemon_main_la_meta_unload.cpp ; do \
+	  echo "#include \"$$file\"" >> libklaptopdaemon_main_la.all_cpp.files; \
+	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libklaptopdaemon_main_la.all_cpp.final; \
+	done; \
+	cat libklaptopdaemon_main_la.all_cpp.final libklaptopdaemon_main_la.all_cpp.files  > libklaptopdaemon_main_la.all_cpp.cpp; \
+	rm -f libklaptopdaemon_main_la.all_cpp.final libklaptopdaemon_main_la.all_cpp.files
+
+#>+ 11
+klaptopdaemon.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/klaptopdaemon_main.cpp  
 	@@echo 'creating klaptopdaemon.all_cpp.cpp ...'; \
 	rm -f klaptopdaemon.all_cpp.files klaptopdaemon.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> klaptopdaemon.all_cpp.final; \
-	for file in dummy.cpp ; do \
+	for file in klaptopdaemon_main.cpp ; do \
 	  echo "#include \"$$file\"" >> klaptopdaemon.all_cpp.files; \
 	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> klaptopdaemon.all_cpp.final; \
 	done; \
@@@@ -846,20 +869,20 @@@@
 
 #>+ 3
 clean-final:
-	-rm -f kcm_laptop_la.all_cpp.cpp klaptopdaemon_la.all_cpp.cpp klaptopdaemon.all_cpp.cpp
+	-rm -f kcm_laptop_la.all_cpp.cpp klaptopdaemon_la.all_cpp.cpp libklaptopdaemon_main_la.all_cpp.cpp klaptopdaemon.all_cpp.cpp
 
 #>+ 2
 final:
-	$(MAKE) kcm_laptop_la_OBJECTS="$(kcm_laptop_la_final_OBJECTS)" klaptopdaemon_la_OBJECTS="$(klaptopdaemon_la_final_OBJECTS)" all-am
+	$(MAKE) kcm_laptop_la_OBJECTS="$(kcm_laptop_la_final_OBJECTS)" libklaptopdaemon_main_la_OBJECTS="$(libklaptopdaemon_main_la_final_OBJECTS)" all-am
 #>+ 2
 final-install:
-	$(MAKE) kcm_laptop_la_OBJECTS="$(kcm_laptop_la_final_OBJECTS)" klaptopdaemon_la_OBJECTS="$(klaptopdaemon_la_final_OBJECTS)" install-am
+	$(MAKE) kcm_laptop_la_OBJECTS="$(kcm_laptop_la_final_OBJECTS)" libklaptopdaemon_main_la_OBJECTS="$(libklaptopdaemon_main_la_final_OBJECTS)" install-am
 #>+ 2
 no-final:
-	$(MAKE) kcm_laptop_la_OBJECTS="$(kcm_laptop_la_nofinal_OBJECTS)" klaptopdaemon_la_OBJECTS="$(klaptopdaemon_la_nofinal_OBJECTS)" all-am
+	$(MAKE) kcm_laptop_la_OBJECTS="$(kcm_laptop_la_nofinal_OBJECTS)" libklaptopdaemon_main_la_OBJECTS="$(libklaptopdaemon_main_la_nofinal_OBJECTS)" all-am
 #>+ 2
 no-final-install:
-	$(MAKE) kcm_laptop_la_OBJECTS="$(kcm_laptop_la_nofinal_OBJECTS)" klaptopdaemon_la_OBJECTS="$(klaptopdaemon_la_nofinal_OBJECTS)" install-am
+	$(MAKE) kcm_laptop_la_OBJECTS="$(kcm_laptop_la_nofinal_OBJECTS)" libklaptopdaemon_main_la_OBJECTS="$(libklaptopdaemon_main_la_nofinal_OBJECTS)" install-am
 #>+ 3
 cvs-clean:
 	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
@