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
|
$NetBSD: patch-ag,v 1.3 2003/01/02 09:12:39 skrll Exp $
--- dcop/Makefile.in.orig Tue Nov 26 08:57:39 2002
+++ dcop/Makefile.in
@@ -293,7 +293,7 @@ INCLUDES = $(all_includes)
bin_PROGRAMS = dcopserver dcopserver_shutdown
check_PROGRAMS = testdcop testdcopc
-lib_LTLIBRARIES = libDCOP.la dcopserver.la
+lib_LTLIBRARIES = libDCOP.la libdcopserver_main.la dcopserver.la
libDCOP_la_LIBADD = KDE-ICE/libkICE.la $(LIB_QT)
libDCOP_la_LDFLAGS = $(KDE_RPATH) -version-info 4:0 -no-undefined $(all_libraries)
@@ -307,13 +307,17 @@ noinst_HEADERS = version.h dcopglobal.h
# dcopstub needs to go first for --enable-final to work
libDCOP_la_SOURCES = dcopstub.cpp dcopclient.cpp dcopobject.cpp dcopref.cpp
+libdcopserver_main_la_LDFLAGS = $(all_libraries)
+libdcopserver_main_la_SOURCES = dcopserver.cpp dcopsignals.cpp
+libdcopserver_main_la_LIBADD = libDCOP.la
+
dcopserver_la_LDFLAGS = -module -avoid-version $(all_libraries)
-dcopserver_la_SOURCES = dcopserver.cpp dcopsignals.cpp
-dcopserver_la_LIBADD = libDCOP.la
+dcopserver_la_SOURCES = dcopserver_main.cpp
+dcopserver_la_LIBADD = libdcopserver_main.la
dcopserver_LDFLAGS = $(KDE_RPATH) $(all_libraries)
-dcopserver_SOURCES = dummy.cpp
-dcopserver_LDADD = dcopserver.la
+dcopserver_SOURCES = dcopserver_main.cpp
+dcopserver_LDADD = libdcopserver_main.la
dcopserver_shutdown_SOURCES = dcopserver_shutdown.c
@@ -332,14 +336,11 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
-dcopserver_la_DEPENDENCIES = libDCOP.la
-am_dcopserver_la_OBJECTS = dcopserver.lo dcopsignals.lo
+dcopserver_la_DEPENDENCIES = libdcopserver_main.la
+am_dcopserver_la_OBJECTS = dcopserver_main.lo
#>- dcopserver_la_OBJECTS = $(am_dcopserver_la_OBJECTS)
-#>+ 4
-dcopserver_la_final_OBJECTS = dcopserver_la.all_cpp.lo
-dcopserver_la_nofinal_OBJECTS = dcopserver.lo dcopsignals.lo
-@KDE_USE_FINAL_FALSE@dcopserver_la_OBJECTS = $(dcopserver_la_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@dcopserver_la_OBJECTS = $(dcopserver_la_final_OBJECTS)
+#>+ 1
+dcopserver_la_OBJECTS = dcopserver_main.lo
libDCOP_la_DEPENDENCIES = KDE-ICE/libkICE.la
am_libDCOP_la_OBJECTS = dcopstub.lo dcopclient.lo dcopobject.lo \
dcopref.lo
@@ -350,15 +351,23 @@ libDCOP_la_nofinal_OBJECTS = dcopstub.lo
dcopref.lo
@KDE_USE_FINAL_FALSE@libDCOP_la_OBJECTS = $(libDCOP_la_nofinal_OBJECTS)
@KDE_USE_FINAL_TRUE@libDCOP_la_OBJECTS = $(libDCOP_la_final_OBJECTS)
+libdcopserver_main_la_DEPENDENCIES = libDCOP.la
+am_libdcopserver_main_la_OBJECTS = dcopserver.lo dcopsignals.lo
+#>- libdcopserver_main_la_OBJECTS = $(am_libdcopserver_main_la_OBJECTS)
+#>+ 4
+libdcopserver_main_la_final_OBJECTS = libdcopserver_main_la.all_cpp.lo
+libdcopserver_main_la_nofinal_OBJECTS = dcopserver.lo dcopsignals.lo
+@KDE_USE_FINAL_FALSE@libdcopserver_main_la_OBJECTS = $(libdcopserver_main_la_nofinal_OBJECTS)
+@KDE_USE_FINAL_TRUE@libdcopserver_main_la_OBJECTS = $(libdcopserver_main_la_final_OBJECTS)
bin_PROGRAMS = dcopserver$(EXEEXT) dcopserver_shutdown$(EXEEXT)
check_PROGRAMS = testdcop$(EXEEXT) testdcopc$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS)
-am_dcopserver_OBJECTS = dummy.$(OBJEXT)
+am_dcopserver_OBJECTS = dcopserver_main.$(OBJEXT)
#>- dcopserver_OBJECTS = $(am_dcopserver_OBJECTS)
#>+ 1
-dcopserver_OBJECTS = dummy.$(OBJEXT)
-dcopserver_DEPENDENCIES = dcopserver.la
+dcopserver_OBJECTS = dcopserver_main.$(OBJEXT)
+dcopserver_DEPENDENCIES = libdcopserver_main.la
am_dcopserver_shutdown_OBJECTS = dcopserver_shutdown.$(OBJEXT)
#>- dcopserver_shutdown_OBJECTS = $(am_dcopserver_shutdown_OBJECTS)
#>+ 1
@@ -389,25 +398,28 @@ depcomp = $(SHELL) $(top_srcdir)/admin/d
#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dcopc.Po $(DEPDIR)/dcopclient.Plo \
#>- @AMDEP_TRUE@ $(DEPDIR)/dcopobject.Plo $(DEPDIR)/dcopref.Plo \
#>- @AMDEP_TRUE@ $(DEPDIR)/dcopserver.Plo \
+#>- @AMDEP_TRUE@ $(DEPDIR)/dcopserver_main.Plo \
+#>- @AMDEP_TRUE@ $(DEPDIR)/dcopserver_main.Po \
#>- @AMDEP_TRUE@ $(DEPDIR)/dcopserver_shutdown.Po \
#>- @AMDEP_TRUE@ $(DEPDIR)/dcopsignals.Plo $(DEPDIR)/dcopstub.Plo \
-#>- @AMDEP_TRUE@ $(DEPDIR)/dummy.Po $(DEPDIR)/testdcop.Po \
-#>- @AMDEP_TRUE@ $(DEPDIR)/testdcopc.Po
-#>+ 15
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/dcopserver_la.all_cpp.P $(DEPDIR)/libDCOP_la.all_cpp.P $(DEPDIR)/dcopc.Po $(DEPDIR)/dcopclient.Plo \
+#>- @AMDEP_TRUE@ $(DEPDIR)/testdcop.Po $(DEPDIR)/testdcopc.Po
+#>+ 17
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/libDCOP_la.all_cpp.P $(DEPDIR)/libdcopserver_main_la.all_cpp.P $(DEPDIR)/dcopc.Po $(DEPDIR)/dcopclient.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/dcopobject.Plo $(DEPDIR)/dcopref.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/dcopserver.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/dcopserver_main.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/dcopserver_main.Po \
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/dcopserver_shutdown.Po \
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/dcopsignals.Plo $(DEPDIR)/dcopstub.Plo \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/dummy.Po $(DEPDIR)/testdcop.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/testdcopc.Po
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/testdcop.Po $(DEPDIR)/testdcopc.Po
@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/dcopc.Po $(DEPDIR)/dcopclient.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/dcopobject.Plo $(DEPDIR)/dcopref.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/dcopserver.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/dcopserver_main.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/dcopserver_main.Po \
@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/dcopserver_shutdown.Po \
@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/dcopsignals.Plo $(DEPDIR)/dcopstub.Plo \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/dummy.Po $(DEPDIR)/testdcop.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/testdcopc.Po
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/testdcop.Po $(DEPDIR)/testdcopc.Po
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -437,8 +449,9 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C
$(AM_LDFLAGS) $(LDFLAGS) -o $@
CXXFLAGS = @CXXFLAGS@
DIST_SOURCES = $(dcopserver_la_SOURCES) $(libDCOP_la_SOURCES) \
- $(dcopserver_SOURCES) $(dcopserver_shutdown_SOURCES) \
- $(testdcop_SOURCES) $(testdcopc_SOURCES)
+ $(libdcopserver_main_la_SOURCES) $(dcopserver_SOURCES) \
+ $(dcopserver_shutdown_SOURCES) $(testdcop_SOURCES) \
+ $(testdcopc_SOURCES)
HEADERS = $(include_HEADERS) $(noinst_HEADERS)
@@ -449,7 +462,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) Makefile.am \
Makefile.in
DIST_SUBDIRS = $(SUBDIRS)
-SOURCES = $(dcopserver_la_SOURCES) $(libDCOP_la_SOURCES) $(dcopserver_SOURCES) $(dcopserver_shutdown_SOURCES) $(testdcop_SOURCES) $(testdcopc_SOURCES)
+SOURCES = $(dcopserver_la_SOURCES) $(libDCOP_la_SOURCES) $(libdcopserver_main_la_SOURCES) $(dcopserver_SOURCES) $(dcopserver_shutdown_SOURCES) $(testdcop_SOURCES) $(testdcopc_SOURCES)
#>- all: all-recursive
#>+ 1
@@ -503,6 +516,8 @@ dcopserver.la: $(dcopserver_la_OBJECTS)
@KDE_USE_CLOSURE_TRUE@libDCOP.la: libDCOP.la.closure $(libDCOP_la_OBJECTS) $(libDCOP_la_DEPENDENCIES)
@KDE_USE_CLOSURE_FALSE@libDCOP.la: $(libDCOP_la_OBJECTS) $(libDCOP_la_DEPENDENCIES)
$(CXXLINK) -rpath $(libdir) $(libDCOP_la_LDFLAGS) $(libDCOP_la_OBJECTS) $(libDCOP_la_LIBADD) $(LIBS)
+libdcopserver_main.la: $(libdcopserver_main_la_OBJECTS) $(libdcopserver_main_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(libdir) $(libdcopserver_main_la_LDFLAGS) $(libdcopserver_main_la_OBJECTS) $(libdcopserver_main_la_LIBADD) $(LIBS)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(bindir)
@@ -554,10 +569,11 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dcopobject.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dcopref.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dcopserver.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dcopserver_main.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dcopserver_main.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dcopserver_shutdown.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dcopsignals.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dcopstub.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/testdcop.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/testdcopc.Po@am__quote@
@@ -851,22 +867,19 @@ uninstall-info: uninstall-info-recursive
uninstall-info-am uninstall-info-recursive \
uninstall-libLTLIBRARIES uninstall-recursive
-
-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:
#>+ 3
-dcopclient.moc: $(srcdir)/dcopclient.h
- $(MOC) $(srcdir)/dcopclient.h -o dcopclient.moc
-
-#>+ 3
testdcop.moc: $(srcdir)/testdcop.h
$(MOC) $(srcdir)/testdcop.h -o testdcop.moc
#>+ 3
+dcopclient.moc: $(srcdir)/dcopclient.h
+ $(MOC) $(srcdir)/dcopclient.h -o dcopclient.moc
+
+#>+ 3
dcopserver.moc: $(srcdir)/dcopserver.h
$(MOC) $(srcdir)/dcopserver.h -o dcopserver.moc
@@ -881,7 +894,7 @@ libDCOP.la.closure: $(libDCOP_la_OBJECTS
#>+ 3
clean-metasources:
- -rm -f dcopclient.moc testdcop.moc dcopserver.moc
+ -rm -f testdcop.moc dcopclient.moc dcopserver.moc
#>+ 3
clean-closures:
@@ -898,18 +911,6 @@ force-reedit:
#>+ 11
-dcopserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dcopserver.cpp $(srcdir)/dcopsignals.cpp dcopserver.moc
- @echo 'creating dcopserver_la.all_cpp.cpp ...'; \
- rm -f dcopserver_la.all_cpp.files dcopserver_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> dcopserver_la.all_cpp.final; \
- for file in dcopserver.cpp dcopsignals.cpp ; do \
- echo "#include \"$$file\"" >> dcopserver_la.all_cpp.files; \
- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> dcopserver_la.all_cpp.final; \
- done; \
- cat dcopserver_la.all_cpp.final dcopserver_la.all_cpp.files > dcopserver_la.all_cpp.cpp; \
- rm -f dcopserver_la.all_cpp.final dcopserver_la.all_cpp.files
-
-#>+ 11
libDCOP_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dcopstub.cpp $(srcdir)/dcopclient.cpp $(srcdir)/dcopobject.cpp $(srcdir)/dcopref.cpp dcopclient.moc
@echo 'creating libDCOP_la.all_cpp.cpp ...'; \
rm -f libDCOP_la.all_cpp.files libDCOP_la.all_cpp.final; \
@@ -921,22 +922,34 @@ libDCOP_la.all_cpp.cpp: $(srcdir)/Makefi
cat libDCOP_la.all_cpp.final libDCOP_la.all_cpp.files > libDCOP_la.all_cpp.cpp; \
rm -f libDCOP_la.all_cpp.final libDCOP_la.all_cpp.files
+#>+ 11
+libdcopserver_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dcopserver.cpp $(srcdir)/dcopsignals.cpp dcopserver.moc
+ @echo 'creating libdcopserver_main_la.all_cpp.cpp ...'; \
+ rm -f libdcopserver_main_la.all_cpp.files libdcopserver_main_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libdcopserver_main_la.all_cpp.final; \
+ for file in dcopserver.cpp dcopsignals.cpp ; do \
+ echo "#include \"$$file\"" >> libdcopserver_main_la.all_cpp.files; \
+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libdcopserver_main_la.all_cpp.final; \
+ done; \
+ cat libdcopserver_main_la.all_cpp.final libdcopserver_main_la.all_cpp.files > libdcopserver_main_la.all_cpp.cpp; \
+ rm -f libdcopserver_main_la.all_cpp.final libdcopserver_main_la.all_cpp.files
+
#>+ 3
clean-final:
- -rm -f dcopserver_la.all_cpp.cpp libDCOP_la.all_cpp.cpp
+ -rm -f libDCOP_la.all_cpp.cpp libdcopserver_main_la.all_cpp.cpp
#>+ 2
final:
- $(MAKE) dcopserver_la_OBJECTS="$(dcopserver_la_final_OBJECTS)" libDCOP_la_OBJECTS="$(libDCOP_la_final_OBJECTS)" testdcopc_OBJECTS="$(testdcopc_final_OBJECTS)" all-am
+ $(MAKE) libDCOP_la_OBJECTS="$(libDCOP_la_final_OBJECTS)" libdcopserver_main_la_OBJECTS="$(libdcopserver_main_la_final_OBJECTS)" testdcopc_OBJECTS="$(testdcopc_final_OBJECTS)" all-am
#>+ 2
final-install:
- $(MAKE) dcopserver_la_OBJECTS="$(dcopserver_la_final_OBJECTS)" libDCOP_la_OBJECTS="$(libDCOP_la_final_OBJECTS)" testdcopc_OBJECTS="$(testdcopc_final_OBJECTS)" install-am
+ $(MAKE) libDCOP_la_OBJECTS="$(libDCOP_la_final_OBJECTS)" libdcopserver_main_la_OBJECTS="$(libdcopserver_main_la_final_OBJECTS)" testdcopc_OBJECTS="$(testdcopc_final_OBJECTS)" install-am
#>+ 2
no-final:
- $(MAKE) dcopserver_la_OBJECTS="$(dcopserver_la_nofinal_OBJECTS)" libDCOP_la_OBJECTS="$(libDCOP_la_nofinal_OBJECTS)" testdcopc_OBJECTS="$(testdcopc_nofinal_OBJECTS)" all-am
+ $(MAKE) libDCOP_la_OBJECTS="$(libDCOP_la_nofinal_OBJECTS)" libdcopserver_main_la_OBJECTS="$(libdcopserver_main_la_nofinal_OBJECTS)" testdcopc_OBJECTS="$(testdcopc_nofinal_OBJECTS)" all-am
#>+ 2
no-final-install:
- $(MAKE) dcopserver_la_OBJECTS="$(dcopserver_la_nofinal_OBJECTS)" libDCOP_la_OBJECTS="$(libDCOP_la_nofinal_OBJECTS)" testdcopc_OBJECTS="$(testdcopc_nofinal_OBJECTS)" install-am
+ $(MAKE) libDCOP_la_OBJECTS="$(libDCOP_la_nofinal_OBJECTS)" libdcopserver_main_la_OBJECTS="$(libdcopserver_main_la_nofinal_OBJECTS)" testdcopc_OBJECTS="$(testdcopc_nofinal_OBJECTS)" install-am
#>+ 3
cvs-clean:
$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
@@ -946,9 +959,9 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 7
-dcopserver.o: dcopserver.moc
-testdcop.lo: testdcop.moc
-testdcop.o: testdcop.moc
dcopclient.lo: dcopclient.moc
+testdcop.lo: testdcop.moc
+dcopserver.o: dcopserver.moc
dcopclient.o: dcopclient.moc
+testdcop.o: testdcop.moc
dcopserver.lo: dcopserver.moc
|
