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
|
$NetBSD: patch-cz,v 1.2 2002/08/25 19:23:44 jlam Exp $
--- ksmserver/Makefile.in.orig Mon May 13 23:57:53 2002
+++ ksmserver/Makefile.in
@@ -309,18 +309,21 @@
INCLUDES = $(all_includes)
bin_PROGRAMS = ksmserver
-lib_LTLIBRARIES = ksmserver.la
+lib_LTLIBRARIES = libksmserver_main.la ksmserver.la
noinst_HEADERS = global.h server.h shutdown.h
#>- ksmserver_la_METASOURCES = AUTO
# Order is important for --enable-final!
-ksmserver_la_SOURCES = main.cpp server.cpp shutdown.cpp
-ksmserver_SOURCES = dummy.cpp
+libksmserver_main_la_SOURCES = main.cpp server.cpp shutdown.cpp
+ksmserver_la_SOURCES = ksmserver_main.cpp
+ksmserver_SOURCES = ksmserver_main.cpp
+libksmserver_main_la_LDFLAGS = $(all_libraries)
ksmserver_la_LDFLAGS = $(all_libraries) -avoid-version -module
ksmserver_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-ksmserver_la_LIBADD = $(LIB_KDEUI)
-ksmserver_LDADD = ksmserver.la
+libksmserver_main_la_LIBADD = $(LIB_KDEUI)
+ksmserver_la_LIBADD = libksmserver_main.la
+ksmserver_LDADD = libksmserver_main.la
picsdir = $(kde_datadir)/ksmserver/pics
pics_DATA = shutdownkonq.png
@@ -339,24 +342,29 @@
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
-ksmserver_la_DEPENDENCIES =
-am_ksmserver_la_OBJECTS = main.lo server.lo shutdown.lo
+ksmserver_la_DEPENDENCIES = libksmserver_main.la
+am_ksmserver_la_OBJECTS = ksmserver_main.lo
#>- ksmserver_la_OBJECTS = $(am_ksmserver_la_OBJECTS)
+#>+ 1
+ksmserver_la_OBJECTS = ksmserver_main.lo
+libksmserver_main_la_DEPENDENCIES =
+am_libksmserver_main_la_OBJECTS = main.lo server.lo shutdown.lo
+#>- libksmserver_main_la_OBJECTS = $(am_libksmserver_main_la_OBJECTS)
#>+ 5
-ksmserver_la_final_OBJECTS = ksmserver_la.all_cpp.lo
-ksmserver_la_nofinal_OBJECTS = main.lo server.lo shutdown.lo \
- ksmserver_la_meta_unload.lo
-@KDE_USE_FINAL_FALSE@ksmserver_la_OBJECTS = $(ksmserver_la_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@ksmserver_la_OBJECTS = $(ksmserver_la_final_OBJECTS)
+libksmserver_main_la_final_OBJECTS = libksmserver_main_la.all_cpp.lo
+libksmserver_main_la_nofinal_OBJECTS = main.lo server.lo shutdown.lo \
+ libksmserver_main_la_meta_unload.lo
+@KDE_USE_FINAL_FALSE@libksmserver_main_la_OBJECTS = $(libksmserver_main_la_nofinal_OBJECTS)
+@KDE_USE_FINAL_TRUE@libksmserver_main_la_OBJECTS = $(libksmserver_main_la_final_OBJECTS)
bin_PROGRAMS = ksmserver$(EXEEXT)
check_PROGRAMS = testsh$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS)
-am_ksmserver_OBJECTS = dummy.$(OBJEXT)
+am_ksmserver_OBJECTS = ksmserver_main.$(OBJEXT)
#>- ksmserver_OBJECTS = $(am_ksmserver_OBJECTS)
#>+ 1
-ksmserver_OBJECTS = dummy.$(OBJEXT)
-ksmserver_DEPENDENCIES = ksmserver.la
+ksmserver_OBJECTS = ksmserver_main.$(OBJEXT)
+ksmserver_DEPENDENCIES = libksmserver_main.la
am_testsh_OBJECTS = test.$(OBJEXT) shutdown.$(OBJEXT)
#>- testsh_OBJECTS = $(am_testsh_OBJECTS)
#>+ 5
@@ -373,7 +381,8 @@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dummy.Po $(DEPDIR)/main.Plo \
+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/ksmserver_main.Plo \
+ @AMDEP_TRUE@ $(DEPDIR)/ksmserver_main.Po $(DEPDIR)/main.Plo \
@AMDEP_TRUE@ $(DEPDIR)/server.Plo $(DEPDIR)/shutdown.Plo \
@AMDEP_TRUE@ $(DEPDIR)/shutdown.Po $(DEPDIR)/test.Po
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -395,8 +404,8 @@
CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
CXXFLAGS = @CXXFLAGS@
-DIST_SOURCES = $(ksmserver_la_SOURCES) $(ksmserver_SOURCES) \
- $(testsh_SOURCES)
+DIST_SOURCES = $(ksmserver_la_SOURCES) $(libksmserver_main_la_SOURCES) \
+ $(ksmserver_SOURCES) $(testsh_SOURCES)
DATA = $(pics_DATA) $(update_DATA)
HEADERS = $(noinst_HEADERS)
@@ -408,7 +417,7 @@
uninstall-recursive check-recursive installcheck-recursive
DIST_COMMON = README $(noinst_HEADERS) Makefile.am Makefile.in
DIST_SUBDIRS = $(SUBDIRS)
-SOURCES = $(ksmserver_la_SOURCES) $(ksmserver_SOURCES) $(testsh_SOURCES)
+SOURCES = $(ksmserver_la_SOURCES) $(libksmserver_main_la_SOURCES) $(ksmserver_SOURCES) $(testsh_SOURCES)
#>- all: all-recursive
#>+ 1
@@ -457,6 +466,8 @@
-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
ksmserver.la: $(ksmserver_la_OBJECTS) $(ksmserver_la_DEPENDENCIES)
$(CXXLINK) -rpath $(libdir) $(ksmserver_la_LDFLAGS) $(ksmserver_la_OBJECTS) $(ksmserver_la_LIBADD) $(LIBS)
+libksmserver_main.la: $(libksmserver_main_la_OBJECTS) $(libksmserver_main_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(libdir) $(libksmserver_main_la_LDFLAGS) $(libksmserver_main_la_OBJECTS) $(libksmserver_main_la_LIBADD) $(LIBS)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(bindir)
@@ -497,7 +508,8 @@
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ksmserver_main.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ksmserver_main.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/server.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/shutdown.Plo@am__quote@
@@ -655,7 +667,7 @@
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=move_session_config.sh ksmserver.upd shutdownkonq.png configure.in.in LICENSE
+KDE_DIST=ksmserver configure.in.in LICENSE move_session_config.sh ksmserver.upd shutdownkonq.png dummy.cpp
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@@ -796,9 +808,6 @@
messages:
$(XGETTEXT) *.cpp -o $(podir)/ksmserver.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:
@@ -826,16 +835,16 @@
#>+ 12
-ksmserver_la_meta_unload.cpp: server.moc shutdown.moc
- @echo 'creating ksmserver_la_meta_unload.cpp'
- @-rm -f ksmserver_la_meta_unload.cpp
+libksmserver_main_la_meta_unload.cpp: server.moc shutdown.moc
+ @echo 'creating libksmserver_main_la_meta_unload.cpp'
+ @-rm -f libksmserver_main_la_meta_unload.cpp
@if test ${kde_qtver} = 2; then \
- echo 'static const char * _metalist_ksmserver_la[] = {' > ksmserver_la_meta_unload.cpp ;\
- cat server.moc shutdown.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> ksmserver_la_meta_unload.cpp ;\
- echo '0};' >> ksmserver_la_meta_unload.cpp ;\
- echo '#include <kunload.h>' >> ksmserver_la_meta_unload.cpp ;\
- echo '_UNLOAD(ksmserver_la)' >> ksmserver_la_meta_unload.cpp ;\
- else echo > ksmserver_la_meta_unload.cpp; fi
+ echo 'static const char * _metalist_libksmserver_main_la[] = {' > libksmserver_main_la_meta_unload.cpp ;\
+ cat server.moc shutdown.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libksmserver_main_la_meta_unload.cpp ;\
+ echo '0};' >> libksmserver_main_la_meta_unload.cpp ;\
+ echo '#include <kunload.h>' >> libksmserver_main_la_meta_unload.cpp ;\
+ echo '_UNLOAD(libksmserver_main_la)' >> libksmserver_main_la_meta_unload.cpp ;\
+ else echo > libksmserver_main_la_meta_unload.cpp; fi
#>+ 12
@@ -853,14 +862,14 @@
#>+ 3
clean-moc-classes:
- -rm -f ksmserver_la_meta_unload.cpp testsh_meta_unload.cpp
+ -rm -f libksmserver_main_la_meta_unload.cpp testsh_meta_unload.cpp
#>+ 11
-ksmserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/server.cpp $(srcdir)/shutdown.cpp ksmserver_la_meta_unload.cpp server.moc shutdown.moc
+ksmserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/ksmserver_main.cpp server.moc shutdown.moc
@echo 'creating ksmserver_la.all_cpp.cpp ...'; \
rm -f ksmserver_la.all_cpp.files ksmserver_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> ksmserver_la.all_cpp.final; \
- for file in main.cpp server.cpp shutdown.cpp ksmserver_la_meta_unload.cpp ; do \
+ for file in ksmserver_main.cpp ; do \
echo "#include \"$$file\"" >> ksmserver_la.all_cpp.files; \
test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> ksmserver_la.all_cpp.final; \
done; \
@@ -868,11 +877,23 @@
rm -f ksmserver_la.all_cpp.final ksmserver_la.all_cpp.files
#>+ 11
-ksmserver.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp
+libksmserver_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/server.cpp $(srcdir)/shutdown.cpp libksmserver_main_la_meta_unload.cpp
+ @echo 'creating libksmserver_main_la.all_cpp.cpp ...'; \
+ rm -f libksmserver_main_la.all_cpp.files libksmserver_main_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libksmserver_main_la.all_cpp.final; \
+ for file in main.cpp server.cpp shutdown.cpp libksmserver_main_la_meta_unload.cpp ; do \
+ echo "#include \"$$file\"" >> libksmserver_main_la.all_cpp.files; \
+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libksmserver_main_la.all_cpp.final; \
+ done; \
+ cat libksmserver_main_la.all_cpp.final libksmserver_main_la.all_cpp.files > libksmserver_main_la.all_cpp.cpp; \
+ rm -f libksmserver_main_la.all_cpp.final libksmserver_main_la.all_cpp.files
+
+#>+ 11
+ksmserver.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/ksmserver_main.cpp
@echo 'creating ksmserver.all_cpp.cpp ...'; \
rm -f ksmserver.all_cpp.files ksmserver.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> ksmserver.all_cpp.final; \
- for file in dummy.cpp ; do \
+ for file in ksmserver_main.cpp ; do \
echo "#include \"$$file\"" >> ksmserver.all_cpp.files; \
test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> ksmserver.all_cpp.final; \
done; \
@@ -893,20 +914,20 @@
#>+ 3
clean-final:
- -rm -f ksmserver_la.all_cpp.cpp ksmserver.all_cpp.cpp testsh.all_cpp.cpp
+ -rm -f ksmserver_la.all_cpp.cpp libksmserver_main_la.all_cpp.cpp ksmserver.all_cpp.cpp testsh.all_cpp.cpp
#>+ 2
final:
- $(MAKE) ksmserver_la_OBJECTS="$(ksmserver_la_final_OBJECTS)" testsh_OBJECTS="$(testsh_final_OBJECTS)" all-am
+ $(MAKE) libksmserver_main_la_OBJECTS="$(libksmserver_main_la_final_OBJECTS)" testsh_OBJECTS="$(testsh_final_OBJECTS)" all-am
#>+ 2
final-install:
- $(MAKE) ksmserver_la_OBJECTS="$(ksmserver_la_final_OBJECTS)" testsh_OBJECTS="$(testsh_final_OBJECTS)" install-am
+ $(MAKE) libksmserver_main_la_OBJECTS="$(libksmserver_main_la_final_OBJECTS)" testsh_OBJECTS="$(testsh_final_OBJECTS)" install-am
#>+ 2
no-final:
- $(MAKE) ksmserver_la_OBJECTS="$(ksmserver_la_nofinal_OBJECTS)" testsh_OBJECTS="$(testsh_nofinal_OBJECTS)" all-am
+ $(MAKE) libksmserver_main_la_OBJECTS="$(libksmserver_main_la_nofinal_OBJECTS)" testsh_OBJECTS="$(testsh_nofinal_OBJECTS)" all-am
#>+ 2
no-final-install:
- $(MAKE) ksmserver_la_OBJECTS="$(ksmserver_la_nofinal_OBJECTS)" testsh_OBJECTS="$(testsh_nofinal_OBJECTS)" install-am
+ $(MAKE) libksmserver_main_la_OBJECTS="$(libksmserver_main_la_nofinal_OBJECTS)" testsh_OBJECTS="$(testsh_nofinal_OBJECTS)" install-am
#>+ 3
cvs-clean:
$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
|
