summaryrefslogtreecommitdiff
path: root/misc/kdeutils3/patches/patch-ak
blob: cc41ec9cbc720ed7961ef5e938894a8c33bb4f27 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
$NetBSD: patch-ak,v 1.2 2003/01/02 09:12:29 skrll Exp $

--- klaptopdaemon/Makefile.in.orig	Mon Dec 30 16:24:30 2002
+++ klaptopdaemon/Makefile.in
@@ -226,18 +226,22 @@ qt_libraries = @qt_libraries@
 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
 
@@ -265,24 +269,30 @@ kcm_laptop_la_nofinal_OBJECTS = battery.
 	warning.lo portable.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)
 #>+ 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)
+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
+@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)
@@ -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
 	$(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 \
@@ -340,7 +353,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
 	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
@@ -413,6 +426,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)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	$(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:
 
 #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 #>+ 4
-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 
 
 DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
 
@@ -721,9 +737,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:
@@ -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
 	$(MOC) $(srcdir)/kpcmcia.h -o kpcmcia.moc
 
 #>+ 3
-kpcmciainfo.moc: $(srcdir)/kpcmciainfo.h
-	$(MOC) $(srcdir)/kpcmciainfo.h -o kpcmciainfo.moc
+pcmcia.moc: $(srcdir)/pcmcia.h
+	$(MOC) $(srcdir)/pcmcia.h -o pcmcia.moc
+
+#>+ 3
+daemondock.moc: $(srcdir)/daemondock.h
+	$(MOC) $(srcdir)/daemondock.h -o daemondock.moc
 
 #>+ 3
 battery.moc: $(srcdir)/battery.h
 	$(MOC) $(srcdir)/battery.h -o battery.moc
 
 #>+ 3
-daemondock.moc: $(srcdir)/daemondock.h
-	$(MOC) $(srcdir)/daemondock.h -o daemondock.moc
+notify.moc: $(srcdir)/notify.h
+	$(MOC) $(srcdir)/notify.h -o notify.moc
 
 #>+ 3
 power.moc: $(srcdir)/power.h
@@ -762,20 +783,12 @@ warning.moc: $(srcdir)/warning.h
 	$(MOC) $(srcdir)/warning.h -o warning.moc
 
 #>+ 3
-pcmcia.moc: $(srcdir)/pcmcia.h
-	$(MOC) $(srcdir)/pcmcia.h -o pcmcia.moc
-
-#>+ 3
-notify.moc: $(srcdir)/notify.h
-	$(MOC) $(srcdir)/notify.h -o notify.moc
-
-#>+ 3
 laptop_daemon.moc: $(srcdir)/laptop_daemon.h
 	$(MOC) $(srcdir)/laptop_daemon.h -o laptop_daemon.moc
 
 #>+ 3
 clean-metasources:
-	-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
 
 #>+ 3
 clean-closures:
@@ -792,7 +805,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  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
 	@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; \
@@ -804,33 +817,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  daemondock.moc kpcmcia.moc laptop_daemon.moc notify.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  daemondock.moc kpcmcia.moc notify.moc kpcmciainfo.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 ; 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
@@ -841,20 +854,20 @@ kde-rpo-clean:
 
 #>+ 19
 kpcmcia.o: kpcmcia.moc 
-battery.lo: battery.moc 
-notify.o: notify.moc 
-pcmcia.lo: pcmcia.moc 
 kpcmcia.lo: kpcmcia.moc 
-laptop_daemon.lo: laptop_daemon.moc 
+laptop_daemon.o: laptop_daemon.moc 
+notify.o: notify.moc 
 power.o: power.moc 
-daemondock.o: daemondock.moc 
-power.lo: power.moc 
 notify.lo: notify.moc 
+warning.lo: warning.moc 
+warning.o: warning.moc 
+laptop_daemon.lo: laptop_daemon.moc 
+kpcmciainfo.o: kpcmciainfo.moc 
 battery.o: battery.moc 
-pcmcia.o: pcmcia.moc 
+pcmcia.lo: pcmcia.moc 
+battery.lo: battery.moc 
 daemondock.lo: daemondock.moc 
-warning.o: warning.moc 
+daemondock.o: daemondock.moc 
+pcmcia.o: pcmcia.moc 
 kpcmciainfo.lo: kpcmciainfo.moc 
-laptop_daemon.o: laptop_daemon.moc 
-warning.lo: warning.moc 
-kpcmciainfo.o: kpcmciainfo.moc 
+power.lo: power.moc