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
|
$NetBSD: patch-bh,v 1.3 2003/01/02 09:12:39 skrll Exp $
--- kio/misc/Makefile.in.orig Tue Nov 26 08:57:39 2002
+++ kio/misc/Makefile.in
@@ -286,20 +286,24 @@ INCLUDES = -I$(srcdir)/.. -I$(top_srcdir
SUBDIRS = . ksendbugmail kpac kdesasl kssld
-lib_LTLIBRARIES = kio_uiserver.la
+lib_LTLIBRARIES = libkio_uiserver_main.la kio_uiserver.la
bin_PROGRAMS = kio_uiserver kmailservice ktelnetservice
-kio_uiserver_SOURCES = dummy.cpp
-kio_uiserver_LDADD = kio_uiserver.la
+kio_uiserver_SOURCES = kio_uiserver_main.cpp
+kio_uiserver_LDADD = libkio_uiserver_main.la
kio_uiserver_LDFLAGS = $(KDE_RPATH) $(all_libraries)
-#>- kio_uiserver_la_SOURCES = uiserver.cpp uiserver.skel observer.stub \
+#>- libkio_uiserver_main_la_SOURCES = uiserver.cpp uiserver.skel observer.stub \
#>- renamedlg.cpp skipdlg.cpp
#>+ 2
-kio_uiserver_la_SOURCES=uiserver.cpp \
+libkio_uiserver_main_la_SOURCES=uiserver.cpp \
renamedlg.cpp skipdlg.cpp uiserver_skel.cpp observer_stub.cpp
-kio_uiserver_la_LIBADD = $(LIB_KIO)
+libkio_uiserver_main_la_LIBADD = $(LIB_KIO)
+libkio_uiserver_main_la_LDFLAGS = $(all_libraries)
+
+kio_uiserver_la_SOURCES = kio_uiserver_main.cpp
+kio_uiserver_la_LIBADD = libkio_uiserver_main.la
kio_uiserver_la_LDFLAGS = $(all_libraries) -module -avoid-version
observer_DIR = $(top_srcdir)/kio/kio
@@ -327,23 +331,28 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
-kio_uiserver_la_DEPENDENCIES =
-am_kio_uiserver_la_OBJECTS = uiserver.lo renamedlg.lo skipdlg.lo
+kio_uiserver_la_DEPENDENCIES = libkio_uiserver_main.la
+am_kio_uiserver_la_OBJECTS = kio_uiserver_main.lo
#>- kio_uiserver_la_OBJECTS = $(am_kio_uiserver_la_OBJECTS)
+#>+ 1
+kio_uiserver_la_OBJECTS = kio_uiserver_main.lo
+libkio_uiserver_main_la_DEPENDENCIES =
+am_libkio_uiserver_main_la_OBJECTS = uiserver.lo renamedlg.lo skipdlg.lo
+#>- libkio_uiserver_main_la_OBJECTS = $(am_libkio_uiserver_main_la_OBJECTS)
#>+ 4
-kio_uiserver_la_final_OBJECTS = kio_uiserver_la.all_cpp.lo
-kio_uiserver_la_nofinal_OBJECTS = uiserver.lo renamedlg.lo skipdlg.lo uiserver_skel.lo observer_stub.lo
-@KDE_USE_FINAL_FALSE@kio_uiserver_la_OBJECTS = $(kio_uiserver_la_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@kio_uiserver_la_OBJECTS = $(kio_uiserver_la_final_OBJECTS)
+libkio_uiserver_main_la_final_OBJECTS = libkio_uiserver_main_la.all_cpp.lo
+libkio_uiserver_main_la_nofinal_OBJECTS = uiserver.lo renamedlg.lo skipdlg.lo uiserver_skel.lo observer_stub.lo
+@KDE_USE_FINAL_FALSE@libkio_uiserver_main_la_OBJECTS = $(libkio_uiserver_main_la_nofinal_OBJECTS)
+@KDE_USE_FINAL_TRUE@libkio_uiserver_main_la_OBJECTS = $(libkio_uiserver_main_la_final_OBJECTS)
bin_PROGRAMS = kio_uiserver$(EXEEXT) kmailservice$(EXEEXT) \
ktelnetservice$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS)
-am_kio_uiserver_OBJECTS = dummy.$(OBJEXT)
+am_kio_uiserver_OBJECTS = kio_uiserver_main.$(OBJEXT)
#>- kio_uiserver_OBJECTS = $(am_kio_uiserver_OBJECTS)
#>+ 1
-kio_uiserver_OBJECTS = dummy.$(OBJEXT)
-kio_uiserver_DEPENDENCIES = kio_uiserver.la
+kio_uiserver_OBJECTS = kio_uiserver_main.$(OBJEXT)
+kio_uiserver_DEPENDENCIES = libkio_uiserver_main.la
am_kmailservice_OBJECTS = kmailservice.$(OBJEXT)
#>- kmailservice_OBJECTS = $(am_kmailservice_OBJECTS)
#>+ 1
@@ -361,14 +370,20 @@ CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/kmailservice.Po \
+#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/kio_uiserver_main.Plo \
+#>- @AMDEP_TRUE@ $(DEPDIR)/kio_uiserver_main.Po \
+#>- @AMDEP_TRUE@ $(DEPDIR)/kmailservice.Po \
#>- @AMDEP_TRUE@ $(DEPDIR)/ktelnetservice.Po $(DEPDIR)/renamedlg.Plo \
#>- @AMDEP_TRUE@ $(DEPDIR)/skipdlg.Plo $(DEPDIR)/uiserver.Plo
-#>+ 7
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/uiserver_skel.P $(DEPDIR)/observer_stub.P $(DEPDIR)/kio_uiserver_la.all_cpp.P $(DEPDIR)/dummy.Po $(DEPDIR)/kmailservice.Po \
+#>+ 11
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/uiserver_skel.P $(DEPDIR)/observer_stub.P $(DEPDIR)/libkio_uiserver_main_la.all_cpp.P $(DEPDIR)/kio_uiserver_main.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kio_uiserver_main.Po \
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kmailservice.Po \
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/ktelnetservice.Po $(DEPDIR)/renamedlg.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/skipdlg.Plo $(DEPDIR)/uiserver.Plo
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/uiserver_skel.P $(DEPDIR)/observer_stub.P $(DEPDIR)/dummy.Po $(DEPDIR)/kmailservice.Po \
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/uiserver_skel.P $(DEPDIR)/observer_stub.P $(DEPDIR)/kio_uiserver_main.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kio_uiserver_main.Po \
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kmailservice.Po \
@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/ktelnetservice.Po $(DEPDIR)/renamedlg.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/skipdlg.Plo $(DEPDIR)/uiserver.Plo
@@ -391,7 +406,8 @@ CXXLD = $(CXX)
CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
CXXFLAGS = @CXXFLAGS@
-DIST_SOURCES = $(kio_uiserver_la_SOURCES) $(kio_uiserver_SOURCES) \
+DIST_SOURCES = $(kio_uiserver_la_SOURCES) \
+ $(libkio_uiserver_main_la_SOURCES) $(kio_uiserver_SOURCES) \
$(kmailservice_SOURCES) $(ktelnetservice_SOURCES)
DATA = $(kde_services_DATA) $(protocol_DATA)
@@ -404,7 +420,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
uninstall-recursive check-recursive installcheck-recursive
DIST_COMMON = $(kiomisc_HEADERS) Makefile.am Makefile.in
DIST_SUBDIRS = $(SUBDIRS)
-SOURCES = $(kio_uiserver_la_SOURCES) $(kio_uiserver_SOURCES) $(kmailservice_SOURCES) $(ktelnetservice_SOURCES)
+SOURCES = $(kio_uiserver_la_SOURCES) $(libkio_uiserver_main_la_SOURCES) $(kio_uiserver_SOURCES) $(kmailservice_SOURCES) $(ktelnetservice_SOURCES)
#>- all: all-recursive
#>+ 1
@@ -453,6 +469,8 @@ clean-libLTLIBRARIES:
-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
kio_uiserver.la: $(kio_uiserver_la_OBJECTS) $(kio_uiserver_la_DEPENDENCIES)
$(CXXLINK) -rpath $(libdir) $(kio_uiserver_la_LDFLAGS) $(kio_uiserver_la_OBJECTS) $(kio_uiserver_la_LIBADD) $(LIBS)
+libkio_uiserver_main.la: $(libkio_uiserver_main_la_OBJECTS) $(libkio_uiserver_main_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(libdir) $(libkio_uiserver_main_la_LDFLAGS) $(libkio_uiserver_main_la_OBJECTS) $(libkio_uiserver_main_la_LIBADD) $(LIBS)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(bindir)
@@ -493,7 +511,8 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kio_uiserver_main.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kio_uiserver_main.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kmailservice.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ktelnetservice.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/renamedlg.Plo@am__quote@
@@ -668,7 +687,7 @@ distclean-tags:
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=rlogin.protocol renamedlg.cpp telnet.protocol rtsp.protocol skipdlg.cpp kmailservice.protocol kio_uiserver.desktop
+KDE_DIST=kio_uiserver.desktop renamedlg.cpp skipdlg.cpp kmailservice.protocol telnet.protocol rlogin.protocol rtsp.protocol
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@@ -815,6 +834,18 @@ dummy.cpp: uiserver.kidl
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
+#>+ 3
+uiserver.moc: $(srcdir)/uiserver.h
+ $(MOC) $(srcdir)/uiserver.h -o uiserver.moc
+
+#>+ 3
+skipdlg.moc: $(srcdir)/skipdlg.h
+ $(MOC) $(srcdir)/skipdlg.h -o skipdlg.moc
+
+#>+ 3
+renamedlg.moc: $(srcdir)/renamedlg.h
+ $(MOC) $(srcdir)/renamedlg.h -o renamedlg.moc
+
#>+ 9
uiserver.kidl: $(srcdir)/uiserver.h $(DCOP_DEPENDENCIES)
$(DCOPIDL) $(srcdir)/uiserver.h > uiserver.kidl || ( rm -f uiserver.kidl ; /bin/false )
@@ -826,20 +857,8 @@ observer_stub.h: observer.kidl
$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-skel observer.kidl
#>+ 3
-uiserver.moc: $(srcdir)/uiserver.h
- $(MOC) $(srcdir)/uiserver.h -o uiserver.moc
-
-#>+ 3
-renamedlg.moc: $(srcdir)/renamedlg.h
- $(MOC) $(srcdir)/renamedlg.h -o renamedlg.moc
-
-#>+ 3
-skipdlg.moc: $(srcdir)/skipdlg.h
- $(MOC) $(srcdir)/skipdlg.h -o skipdlg.moc
-
-#>+ 3
clean-metasources:
- -rm -f uiserver.moc renamedlg.moc skipdlg.moc
+ -rm -f uiserver.moc skipdlg.moc renamedlg.moc
#>+ 5
clean-idl:
@@ -858,33 +877,33 @@ force-reedit:
#>+ 11
-kio_uiserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/uiserver.cpp $(srcdir)/renamedlg.cpp $(srcdir)/skipdlg.cpp uiserver_skel.cpp observer_stub.cpp uiserver.moc skipdlg.moc renamedlg.moc
- @echo 'creating kio_uiserver_la.all_cpp.cpp ...'; \
- rm -f kio_uiserver_la.all_cpp.files kio_uiserver_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> kio_uiserver_la.all_cpp.final; \
+libkio_uiserver_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/uiserver.cpp $(srcdir)/renamedlg.cpp $(srcdir)/skipdlg.cpp uiserver_skel.cpp observer_stub.cpp uiserver.moc skipdlg.moc renamedlg.moc
+ @echo 'creating libkio_uiserver_main_la.all_cpp.cpp ...'; \
+ rm -f libkio_uiserver_main_la.all_cpp.files libkio_uiserver_main_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkio_uiserver_main_la.all_cpp.final; \
for file in uiserver.cpp renamedlg.cpp skipdlg.cpp uiserver_skel.cpp observer_stub.cpp ; do \
- echo "#include \"$$file\"" >> kio_uiserver_la.all_cpp.files; \
- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kio_uiserver_la.all_cpp.final; \
+ echo "#include \"$$file\"" >> libkio_uiserver_main_la.all_cpp.files; \
+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkio_uiserver_main_la.all_cpp.final; \
done; \
- cat kio_uiserver_la.all_cpp.final kio_uiserver_la.all_cpp.files > kio_uiserver_la.all_cpp.cpp; \
- rm -f kio_uiserver_la.all_cpp.final kio_uiserver_la.all_cpp.files
+ cat libkio_uiserver_main_la.all_cpp.final libkio_uiserver_main_la.all_cpp.files > libkio_uiserver_main_la.all_cpp.cpp; \
+ rm -f libkio_uiserver_main_la.all_cpp.final libkio_uiserver_main_la.all_cpp.files
#>+ 3
clean-final:
- -rm -f kio_uiserver_la.all_cpp.cpp
+ -rm -f libkio_uiserver_main_la.all_cpp.cpp
#>+ 2
final:
- $(MAKE) kio_uiserver_la_OBJECTS="$(kio_uiserver_la_final_OBJECTS)" all-am
+ $(MAKE) libkio_uiserver_main_la_OBJECTS="$(libkio_uiserver_main_la_final_OBJECTS)" all-am
#>+ 2
final-install:
- $(MAKE) kio_uiserver_la_OBJECTS="$(kio_uiserver_la_final_OBJECTS)" install-am
+ $(MAKE) libkio_uiserver_main_la_OBJECTS="$(libkio_uiserver_main_la_final_OBJECTS)" install-am
#>+ 2
no-final:
- $(MAKE) kio_uiserver_la_OBJECTS="$(kio_uiserver_la_nofinal_OBJECTS)" all-am
+ $(MAKE) libkio_uiserver_main_la_OBJECTS="$(libkio_uiserver_main_la_nofinal_OBJECTS)" all-am
#>+ 2
no-final-install:
- $(MAKE) kio_uiserver_la_OBJECTS="$(kio_uiserver_la_nofinal_OBJECTS)" install-am
+ $(MAKE) libkio_uiserver_main_la_OBJECTS="$(libkio_uiserver_main_la_nofinal_OBJECTS)" install-am
#>+ 3
cvs-clean:
$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
@@ -894,13 +913,13 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 11
-uiserver.o: uiserver.moc
+skipdlg.o: skipdlg.moc
$(srcdir)/skipdlg.cpp: observer_stub.h
renamedlg.lo: renamedlg.moc
-skipdlg.o: skipdlg.moc
-observer_stub.cpp: observer_stub.h
-uiserver.lo: uiserver.moc
$(srcdir)/renamedlg.cpp: observer_stub.h
+$(srcdir)/uiserver.cpp: observer_stub.h
skipdlg.lo: skipdlg.moc
+observer_stub.cpp: observer_stub.h
+uiserver.lo: uiserver.moc
+uiserver.o: uiserver.moc
renamedlg.o: renamedlg.moc
-$(srcdir)/uiserver.cpp: observer_stub.h
|
