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
|
$NetBSD: patch-aj,v 1.6 2003/07/30 13:58:38 markd Exp $
--- kxmlrpc/Makefile.in.orig 2003-07-15 22:08:06.000000000 +1200
+++ kxmlrpc/Makefile.in
@@ -291,18 +291,23 @@ x_libraries = @x_libraries@
INCLUDES = $(all_includes)
bin_PROGRAMS = kxmlrpcd
-kxmlrpcd_LDADD = kxmlrpcd.la
+kxmlrpcd_LDADD = libkxmlrpcd_main.la
kxmlrpcd_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-kxmlrpcd_SOURCES = dummy.cpp
+kxmlrpcd_SOURCES = kxmlrpcd_main.cpp
-lib_LTLIBRARIES = kxmlrpcd.la
+lib_LTLIBRARIES = libkxmlrpcd_main.la kxmlrpcd.la
kde_module_LTLIBRARIES = kcm_xmlrpcd.la
-kxmlrpcd_la_LIBADD = $(LIB_KSYCOCA)
-kxmlrpcd_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kxmlrpcd_la_SOURCES = kxmlrpcserver.cpp kxmlrpcparser.cpp \
+libkxmlrpcd_main_la_LIBADD = $(LIB_KSYCOCA)
+libkxmlrpcd_main_la_LDFLAGS = $(all_libraries)
+libkxmlrpcd_main_la_SOURCES = kxmlrpcserver.cpp kxmlrpcparser.cpp \
kxmlrpcdaemon.cpp kxmlrpcutil.cpp
+#>- libkxmlrpcd_main_la_METASOURCES = AUTO
+
+kxmlrpcd_la_LIBADD = libkxmlrpcd_main.la
+kxmlrpcd_la_LDFLAGS = $(all_libraries) -module -avoid-version
+kxmlrpcd_la_SOURCES = kxmlrpcd_main.cpp
#>- kxmlrpcd_la_METASOURCES = AUTO
kcm_xmlrpcd_la_LIBADD = $(LIB_KDECORE)
@@ -324,42 +329,50 @@ am_kcm_xmlrpcd_la_OBJECTS = kxmlrpcinit.
#>- kcm_xmlrpcd_la_OBJECTS = $(am_kcm_xmlrpcd_la_OBJECTS)
#>+ 1
kcm_xmlrpcd_la_OBJECTS = kxmlrpcinit.lo
-kxmlrpcd_la_DEPENDENCIES =
-am_kxmlrpcd_la_OBJECTS = kxmlrpcserver.lo kxmlrpcparser.lo \
- kxmlrpcdaemon.lo kxmlrpcutil.lo
+kxmlrpcd_la_DEPENDENCIES = libkxmlrpcd_main.la
+am_kxmlrpcd_la_OBJECTS = kxmlrpcd_main.lo
#>- kxmlrpcd_la_OBJECTS = $(am_kxmlrpcd_la_OBJECTS)
+#>+ 1
+kxmlrpcd_la_OBJECTS = kxmlrpcd_main.lo
+libkxmlrpcd_main_la_DEPENDENCIES =
+am_libkxmlrpcd_main_la_OBJECTS = kxmlrpcserver.lo kxmlrpcparser.lo \
+ kxmlrpcdaemon.lo kxmlrpcutil.lo
+#>- libkxmlrpcd_main_la_OBJECTS = $(am_libkxmlrpcd_main_la_OBJECTS)
#>+ 5
-kxmlrpcd_la_final_OBJECTS = kxmlrpcd_la.all_cpp.lo
-kxmlrpcd_la_nofinal_OBJECTS = kxmlrpcserver.lo kxmlrpcparser.lo \
+libkxmlrpcd_main_la_final_OBJECTS = libkxmlrpcd_main_la.all_cpp.lo
+libkxmlrpcd_main_la_nofinal_OBJECTS = kxmlrpcserver.lo kxmlrpcparser.lo \
kxmlrpcdaemon.lo kxmlrpcutil.lo
-@KDE_USE_FINAL_FALSE@kxmlrpcd_la_OBJECTS = $(kxmlrpcd_la_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@kxmlrpcd_la_OBJECTS = $(kxmlrpcd_la_final_OBJECTS)
+@KDE_USE_FINAL_FALSE@libkxmlrpcd_main_la_OBJECTS = $(libkxmlrpcd_main_la_nofinal_OBJECTS)
+@KDE_USE_FINAL_TRUE@libkxmlrpcd_main_la_OBJECTS = $(libkxmlrpcd_main_la_final_OBJECTS)
bin_PROGRAMS = kxmlrpcd$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS)
-am_kxmlrpcd_OBJECTS = dummy.$(OBJEXT)
+am_kxmlrpcd_OBJECTS = kxmlrpcd_main.$(OBJEXT)
#>- kxmlrpcd_OBJECTS = $(am_kxmlrpcd_OBJECTS)
#>+ 1
-kxmlrpcd_OBJECTS = dummy.$(OBJEXT)
-kxmlrpcd_DEPENDENCIES = kxmlrpcd.la
+kxmlrpcd_OBJECTS = kxmlrpcd_main.$(OBJEXT)
+kxmlrpcd_DEPENDENCIES = libkxmlrpcd_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)/dummy.Po \
+#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/kxmlrpcd_main.Plo \
+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kxmlrpcd_main.Po \
#>- @AMDEP_TRUE@ ./$(DEPDIR)/kxmlrpcdaemon.Plo \
#>- @AMDEP_TRUE@ ./$(DEPDIR)/kxmlrpcinit.Plo \
#>- @AMDEP_TRUE@ ./$(DEPDIR)/kxmlrpcparser.Plo \
#>- @AMDEP_TRUE@ ./$(DEPDIR)/kxmlrpcserver.Plo \
#>- @AMDEP_TRUE@ ./$(DEPDIR)/kxmlrpcutil.Plo
-#>+ 13
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kxmlrpcd_la.all_cpp.P ./$(DEPDIR)/dummy.Po \
+#>+ 15
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/libkxmlrpcd_main_la.all_cpp.P ./$(DEPDIR)/kxmlrpcd_main.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmlrpcd_main.Po \
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmlrpcdaemon.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmlrpcinit.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmlrpcparser.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmlrpcserver.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmlrpcutil.Plo
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = ./$(DEPDIR)/dummy.Po \
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = ./$(DEPDIR)/kxmlrpcd_main.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmlrpcd_main.Po \
@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmlrpcdaemon.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmlrpcinit.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kxmlrpcparser.Plo \
@@ -385,13 +398,13 @@ CXXLD = $(CXX)
CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
DIST_SOURCES = $(kcm_xmlrpcd_la_SOURCES) $(kxmlrpcd_la_SOURCES) \
- $(kxmlrpcd_SOURCES)
+ $(libkxmlrpcd_main_la_SOURCES) $(kxmlrpcd_SOURCES)
DATA = $(service_DATA)
HEADERS = $(noinst_HEADERS)
DIST_COMMON = README $(noinst_HEADERS) Makefile.am Makefile.in
-SOURCES = $(kcm_xmlrpcd_la_SOURCES) $(kxmlrpcd_la_SOURCES) $(kxmlrpcd_SOURCES)
+SOURCES = $(kcm_xmlrpcd_la_SOURCES) $(kxmlrpcd_la_SOURCES) $(libkxmlrpcd_main_la_SOURCES) $(kxmlrpcd_SOURCES)
#>- all: all-am
#>+ 1
@@ -471,6 +484,8 @@ clean-libLTLIBRARIES:
$(CXXLINK) -rpath $(kde_moduledir) $(kcm_xmlrpcd_la_LDFLAGS) $(kcm_xmlrpcd_la_OBJECTS) $(kcm_xmlrpcd_la_LIBADD) $(LIBS)
kxmlrpcd.la: $(kxmlrpcd_la_OBJECTS) $(kxmlrpcd_la_DEPENDENCIES)
$(CXXLINK) -rpath $(libdir) $(kxmlrpcd_la_LDFLAGS) $(kxmlrpcd_la_OBJECTS) $(kxmlrpcd_la_LIBADD) $(LIBS)
+libkxmlrpcd_main.la: $(libkxmlrpcd_main_la_OBJECTS) $(libkxmlrpcd_main_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(libdir) $(libkxmlrpcd_main_la_LDFLAGS) $(libkxmlrpcd_main_la_OBJECTS) $(libkxmlrpcd_main_la_LIBADD) $(LIBS)
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
@@ -510,7 +525,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)/kxmlrpcd_main.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kxmlrpcd_main.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kxmlrpcdaemon.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kxmlrpcinit.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kxmlrpcparser.Plo@am__quote@
@@ -636,7 +652,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=kxmlrpcd.desktop LICENSE
+KDE_DIST=LICENSE kxmlrpcd.desktop Makefile.in.rej
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@@ -804,8 +820,14 @@ kxmlrpcserver.moc: $(srcdir)/kxmlrpcserv
#>+ 1
mocs: kxmlrpcserver.moc
#>+ 3
+kxmlrpcserver.moc: $(srcdir)/kxmlrpcserver.h
+ $(MOC) $(srcdir)/kxmlrpcserver.h -o kxmlrpcserver.moc
+
+#>+ 1
+mocs: kxmlrpcserver.moc
+#>+ 3
clean-metasources:
- -rm -f kxmlrpcserver.moc
+ -rm -f kxmlrpcserver.moc kxmlrpcserver.moc
#>+ 3
clean-closures:
@@ -822,33 +844,33 @@ force-reedit:
#>+ 11
-kxmlrpcd_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kxmlrpcserver.cpp $(srcdir)/kxmlrpcparser.cpp $(srcdir)/kxmlrpcdaemon.cpp $(srcdir)/kxmlrpcutil.cpp kxmlrpcserver.moc
- @echo 'creating kxmlrpcd_la.all_cpp.cpp ...'; \
- rm -f kxmlrpcd_la.all_cpp.files kxmlrpcd_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> kxmlrpcd_la.all_cpp.final; \
+libkxmlrpcd_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kxmlrpcserver.cpp $(srcdir)/kxmlrpcparser.cpp $(srcdir)/kxmlrpcdaemon.cpp $(srcdir)/kxmlrpcutil.cpp kxmlrpcserver.moc
+ @echo 'creating libkxmlrpcd_main_la.all_cpp.cpp ...'; \
+ rm -f libkxmlrpcd_main_la.all_cpp.files libkxmlrpcd_main_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkxmlrpcd_main_la.all_cpp.final; \
for file in kxmlrpcserver.cpp kxmlrpcparser.cpp kxmlrpcdaemon.cpp kxmlrpcutil.cpp ; do \
- echo "#include \"$$file\"" >> kxmlrpcd_la.all_cpp.files; \
- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kxmlrpcd_la.all_cpp.final; \
+ echo "#include \"$$file\"" >> libkxmlrpcd_main_la.all_cpp.files; \
+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkxmlrpcd_main_la.all_cpp.final; \
done; \
- cat kxmlrpcd_la.all_cpp.final kxmlrpcd_la.all_cpp.files > kxmlrpcd_la.all_cpp.cpp; \
- rm -f kxmlrpcd_la.all_cpp.final kxmlrpcd_la.all_cpp.files
+ cat libkxmlrpcd_main_la.all_cpp.final libkxmlrpcd_main_la.all_cpp.files > libkxmlrpcd_main_la.all_cpp.cpp; \
+ rm -f libkxmlrpcd_main_la.all_cpp.final libkxmlrpcd_main_la.all_cpp.files
#>+ 3
clean-final:
- -rm -f kxmlrpcd_la.all_cpp.cpp
+ -rm -f libkxmlrpcd_main_la.all_cpp.cpp
#>+ 2
final:
- $(MAKE) kxmlrpcd_la_OBJECTS="$(kxmlrpcd_la_final_OBJECTS)" all-am
+ $(MAKE) libkxmlrpcd_main_la_OBJECTS="$(libkxmlrpcd_main_la_final_OBJECTS)" all-am
#>+ 2
final-install:
- $(MAKE) kxmlrpcd_la_OBJECTS="$(kxmlrpcd_la_final_OBJECTS)" install-am
+ $(MAKE) libkxmlrpcd_main_la_OBJECTS="$(libkxmlrpcd_main_la_final_OBJECTS)" install-am
#>+ 2
no-final:
- $(MAKE) kxmlrpcd_la_OBJECTS="$(kxmlrpcd_la_nofinal_OBJECTS)" all-am
+ $(MAKE) libkxmlrpcd_main_la_OBJECTS="$(libkxmlrpcd_main_la_nofinal_OBJECTS)" all-am
#>+ 2
no-final-install:
- $(MAKE) kxmlrpcd_la_OBJECTS="$(kxmlrpcd_la_nofinal_OBJECTS)" install-am
+ $(MAKE) libkxmlrpcd_main_la_OBJECTS="$(libkxmlrpcd_main_la_nofinal_OBJECTS)" install-am
#>+ 3
cvs-clean:
$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
@@ -858,5 +880,5 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 3
-kxmlrpcserver.lo: kxmlrpcserver.moc
-kxmlrpcserver.o: kxmlrpcserver.moc
+kxmlrpcserver.o: kxmlrpcserver.moc kxmlrpcserver.moc
+kxmlrpcserver.lo: kxmlrpcserver.moc kxmlrpcserver.moc
|
