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
|
$NetBSD: patch-dh,v 1.3 2003/01/02 09:12:35 skrll Exp $
--- kwin/Makefile.in.orig Fri Dec 27 18:19:11 2002
+++ kwin/Makefile.in
@@ -292,18 +292,22 @@ INCLUDES = $(all_includes)
SUBDIRS = . kcmkwin pics clients
bin_PROGRAMS = kwin
-lib_LTLIBRARIES = kwin.la
+lib_LTLIBRARIES = libkwin.la kwin.la
# workspace.cpp has to be first in order not to break --enable-final
-#>- kwin_la_SOURCES = workspace.cpp atoms.cpp client.cpp main.cpp \
+#>- libkwin_la_SOURCES = workspace.cpp atoms.cpp client.cpp main.cpp \
#>- tabbox.cpp options.cpp plugins.cpp events.cpp KWinInterface.skel \
#>- killwindow.cpp kwinbutton.cpp
#>+ 3
-kwin_la_SOURCES=workspace.cpp atoms.cpp client.cpp main.cpp \
+libkwin_la_SOURCES=workspace.cpp atoms.cpp client.cpp main.cpp \
tabbox.cpp options.cpp plugins.cpp events.cpp \
killwindow.cpp kwinbutton.cpp KWinInterface_skel.cpp
-kwin_la_LIBADD = $(LIB_KDEUI) $(LIBXINERAMA)
+libkwin_la_LIBADD = $(LIB_KDEUI) $(LIBXINERAMA)
+libkwin_la_LDFLAGS = $(all_libraries)
+
+kwin_la_SOURCES = kwin_main.cpp
+kwin_la_LIBADD = libkwin.la
kwin_la_LDFLAGS = $(all_libraries) -module -avoid-version
include_HEADERS = KWinInterface.h
@@ -312,7 +316,7 @@ kwinincludedir = $(includedir)/kwin
kwininclude_HEADERS = options.h client.h workspace.h kwinbutton.h
kwin_SOURCES = kwin_main.cpp
-kwin_LDADD = kwin.la
+kwin_LDADD = libkwin.la
kwin_LDFLAGS = $(all_libraries) $(KDE_RPATH)
KDE_ICON = kwin
@@ -323,7 +327,6 @@ data_DATA = eventsrc
sounddir = $(kde_sounddir)
sound_DATA = pop.wav
-
update_DATA = kwin.upd pluginlibFix.pl
updatedir = $(kde_datadir)/kconf_update
subdir = kwin
@@ -332,16 +335,23 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
-kwin_la_DEPENDENCIES =
-am_kwin_la_OBJECTS = workspace.lo atoms.lo client.lo main.lo tabbox.lo \
- options.lo plugins.lo events.lo killwindow.lo kwinbutton.lo
+kwin_la_DEPENDENCIES = libkwin.la
+am_kwin_la_OBJECTS = kwin_main.lo
#>- kwin_la_OBJECTS = $(am_kwin_la_OBJECTS)
-#>+ 5
-kwin_la_final_OBJECTS = kwin_la.all_cpp.lo
-kwin_la_nofinal_OBJECTS = workspace.lo atoms.lo client.lo main.lo tabbox.lo \
- options.lo plugins.lo events.lo killwindow.lo kwinbutton.lo KWinInterface_skel.lo
-@KDE_USE_FINAL_FALSE@kwin_la_OBJECTS = $(kwin_la_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@kwin_la_OBJECTS = $(kwin_la_final_OBJECTS)
+#>+ 1
+kwin_la_OBJECTS = kwin_main.lo
+libkwin_la_DEPENDENCIES =
+am_libkwin_la_OBJECTS = workspace.lo atoms.lo client.lo main.lo \
+ tabbox.lo options.lo plugins.lo events.lo killwindow.lo \
+ kwinbutton.lo
+#>- libkwin_la_OBJECTS = $(am_libkwin_la_OBJECTS)
+#>+ 6
+libkwin_la_final_OBJECTS = libkwin_la.all_cpp.lo
+libkwin_la_nofinal_OBJECTS = workspace.lo atoms.lo client.lo main.lo \
+ tabbox.lo options.lo plugins.lo events.lo killwindow.lo \
+ kwinbutton.lo KWinInterface_skel.lo
+@KDE_USE_FINAL_FALSE@libkwin_la_OBJECTS = $(libkwin_la_nofinal_OBJECTS)
+@KDE_USE_FINAL_TRUE@libkwin_la_OBJECTS = $(libkwin_la_final_OBJECTS)
bin_PROGRAMS = kwin$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS)
@@ -349,7 +359,7 @@ am_kwin_OBJECTS = kwin_main.$(OBJEXT)
#>- kwin_OBJECTS = $(am_kwin_OBJECTS)
#>+ 1
kwin_OBJECTS = kwin_main.$(OBJEXT)
-kwin_DEPENDENCIES = kwin.la
+kwin_DEPENDENCIES = libkwin.la
DEFS = @DEFS@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
@@ -359,23 +369,23 @@ LIBS = @LIBS@
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/atoms.Plo $(DEPDIR)/client.Plo \
#>- @AMDEP_TRUE@ $(DEPDIR)/events.Plo $(DEPDIR)/killwindow.Plo \
-#>- @AMDEP_TRUE@ $(DEPDIR)/kwin_main.Po $(DEPDIR)/kwinbutton.Plo \
-#>- @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/options.Plo \
-#>- @AMDEP_TRUE@ $(DEPDIR)/plugins.Plo $(DEPDIR)/tabbox.Plo \
-#>- @AMDEP_TRUE@ $(DEPDIR)/workspace.Plo
+#>- @AMDEP_TRUE@ $(DEPDIR)/kwin_main.Plo $(DEPDIR)/kwin_main.Po \
+#>- @AMDEP_TRUE@ $(DEPDIR)/kwinbutton.Plo $(DEPDIR)/main.Plo \
+#>- @AMDEP_TRUE@ $(DEPDIR)/options.Plo $(DEPDIR)/plugins.Plo \
+#>- @AMDEP_TRUE@ $(DEPDIR)/tabbox.Plo $(DEPDIR)/workspace.Plo
#>+ 13
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/KWinInterface_skel.P $(DEPDIR)/kwin_la.all_cpp.P $(DEPDIR)/atoms.Plo $(DEPDIR)/client.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/KWinInterface_skel.P $(DEPDIR)/libkwin_la.all_cpp.P $(DEPDIR)/atoms.Plo $(DEPDIR)/client.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/events.Plo $(DEPDIR)/killwindow.Plo \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kwin_main.Po $(DEPDIR)/kwinbutton.Plo \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/options.Plo \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/plugins.Plo $(DEPDIR)/tabbox.Plo \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/workspace.Plo
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kwin_main.Plo $(DEPDIR)/kwin_main.Po \
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/kwinbutton.Plo $(DEPDIR)/main.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/options.Plo $(DEPDIR)/plugins.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/tabbox.Plo $(DEPDIR)/workspace.Plo
@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/KWinInterface_skel.P $(DEPDIR)/atoms.Plo $(DEPDIR)/client.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/events.Plo $(DEPDIR)/killwindow.Plo \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kwin_main.Po $(DEPDIR)/kwinbutton.Plo \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/main.Plo $(DEPDIR)/options.Plo \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/plugins.Plo $(DEPDIR)/tabbox.Plo \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/workspace.Plo
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kwin_main.Plo $(DEPDIR)/kwin_main.Po \
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/kwinbutton.Plo $(DEPDIR)/main.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/options.Plo $(DEPDIR)/plugins.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/tabbox.Plo $(DEPDIR)/workspace.Plo
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -396,7 +406,7 @@ CXXLD = $(CXX)
CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
CXXFLAGS = @CXXFLAGS@
-DIST_SOURCES = $(kwin_la_SOURCES) $(kwin_SOURCES)
+DIST_SOURCES = $(kwin_la_SOURCES) $(libkwin_la_SOURCES) $(kwin_SOURCES)
DATA = $(data_DATA) $(sound_DATA) $(update_DATA)
HEADERS = $(include_HEADERS) $(kwininclude_HEADERS)
@@ -409,7 +419,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
DIST_COMMON = README $(include_HEADERS) $(kwininclude_HEADERS) \
Makefile.am Makefile.in
DIST_SUBDIRS = $(SUBDIRS)
-SOURCES = $(kwin_la_SOURCES) $(kwin_SOURCES)
+SOURCES = $(kwin_la_SOURCES) $(libkwin_la_SOURCES) $(kwin_SOURCES)
#>- all: all-recursive
#>+ 1
@@ -458,6 +468,8 @@ clean-libLTLIBRARIES:
-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
kwin.la: $(kwin_la_OBJECTS) $(kwin_la_DEPENDENCIES)
$(CXXLINK) -rpath $(libdir) $(kwin_la_LDFLAGS) $(kwin_la_OBJECTS) $(kwin_la_LIBADD) $(LIBS)
+libkwin.la: $(libkwin_la_OBJECTS) $(libkwin_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(libdir) $(libkwin_la_LDFLAGS) $(libkwin_la_OBJECTS) $(libkwin_la_LIBADD) $(LIBS)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(bindir)
@@ -496,6 +508,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/client.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/events.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/killwindow.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kwin_main.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kwin_main.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kwinbutton.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Plo@am__quote@
@@ -706,7 +719,7 @@ distclean-tags:
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=stdclient_bitmaps.h NEWCOLORSCHEME.README killwindow.h eventsrc atoms.h main.h killwindow.cpp kwin.upd pop.wav plugins.cpp pluginlibFix.pl tabbox.cpp hi16-app-kwin.png plugins.h events.h kwinbindings.cpp LICENSE hi48-app-kwin.png options.cpp kwinbutton.cpp hi32-app-kwin.png tabbox.h events.cpp
+KDE_DIST=pluginlibFix.pl kwinbutton.cpp kwin.upd events.cpp plugins.h options.cpp LICENSE killwindow.h main.h NEWCOLORSCHEME.README hi32-app-kwin.png tabbox.h hi48-app-kwin.png kwinbindings.cpp plugins.cpp pop.wav stdclient_bitmaps.h events.h atoms.h killwindow.cpp tabbox.cpp eventsrc hi16-app-kwin.png
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@@ -863,25 +876,15 @@ messages:
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-#>+ 5
-KWinInterface.kidl: $(srcdir)/KWinInterface.h $(DCOP_DEPENDENCIES)
- $(DCOPIDL) $(srcdir)/KWinInterface.h > KWinInterface.kidl || ( rm -f KWinInterface.kidl ; /bin/false )
-KWinInterface_skel.cpp: KWinInterface.kidl
- $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub KWinInterface.kidl
+#>+ 3
+workspace.moc: $(srcdir)/workspace.h
+ $(MOC) $(srcdir)/workspace.h -o workspace.moc
#>+ 3
client.moc: $(srcdir)/client.h
$(MOC) $(srcdir)/client.h -o client.moc
#>+ 3
-plugins.moc: $(srcdir)/plugins.h
- $(MOC) $(srcdir)/plugins.h -o plugins.moc
-
-#>+ 3
-workspace.moc: $(srcdir)/workspace.h
- $(MOC) $(srcdir)/workspace.h -o workspace.moc
-
-#>+ 3
options.moc: $(srcdir)/options.h
$(MOC) $(srcdir)/options.h -o options.moc
@@ -894,8 +897,18 @@ kwinbutton.moc: $(srcdir)/kwinbutton.h
$(MOC) $(srcdir)/kwinbutton.h -o kwinbutton.moc
#>+ 3
+plugins.moc: $(srcdir)/plugins.h
+ $(MOC) $(srcdir)/plugins.h -o plugins.moc
+
+#>+ 5
+KWinInterface.kidl: $(srcdir)/KWinInterface.h $(DCOP_DEPENDENCIES)
+ $(DCOPIDL) $(srcdir)/KWinInterface.h > KWinInterface.kidl || ( rm -f KWinInterface.kidl ; /bin/false )
+KWinInterface_skel.cpp: KWinInterface.kidl
+ $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub KWinInterface.kidl
+
+#>+ 3
clean-metasources:
- -rm -f client.moc plugins.moc workspace.moc options.moc tabbox.moc kwinbutton.moc
+ -rm -f workspace.moc client.moc options.moc tabbox.moc kwinbutton.moc plugins.moc
#>+ 4
clean-idl:
@@ -927,33 +940,33 @@ force-reedit:
#>+ 11
-kwin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/workspace.cpp $(srcdir)/atoms.cpp $(srcdir)/client.cpp $(srcdir)/main.cpp $(srcdir)/tabbox.cpp $(srcdir)/options.cpp $(srcdir)/plugins.cpp $(srcdir)/events.cpp $(srcdir)/killwindow.cpp $(srcdir)/kwinbutton.cpp KWinInterface_skel.cpp client.moc workspace.moc plugins.moc options.moc tabbox.moc kwinbutton.moc
- @echo 'creating kwin_la.all_cpp.cpp ...'; \
- rm -f kwin_la.all_cpp.files kwin_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> kwin_la.all_cpp.final; \
+libkwin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/workspace.cpp $(srcdir)/atoms.cpp $(srcdir)/client.cpp $(srcdir)/main.cpp $(srcdir)/tabbox.cpp $(srcdir)/options.cpp $(srcdir)/plugins.cpp $(srcdir)/events.cpp $(srcdir)/killwindow.cpp $(srcdir)/kwinbutton.cpp KWinInterface_skel.cpp workspace.moc client.moc tabbox.moc options.moc kwinbutton.moc plugins.moc
+ @echo 'creating libkwin_la.all_cpp.cpp ...'; \
+ rm -f libkwin_la.all_cpp.files libkwin_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkwin_la.all_cpp.final; \
for file in workspace.cpp atoms.cpp client.cpp main.cpp tabbox.cpp options.cpp plugins.cpp events.cpp killwindow.cpp kwinbutton.cpp KWinInterface_skel.cpp ; do \
- echo "#include \"$$file\"" >> kwin_la.all_cpp.files; \
- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwin_la.all_cpp.final; \
+ echo "#include \"$$file\"" >> libkwin_la.all_cpp.files; \
+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkwin_la.all_cpp.final; \
done; \
- cat kwin_la.all_cpp.final kwin_la.all_cpp.files > kwin_la.all_cpp.cpp; \
- rm -f kwin_la.all_cpp.final kwin_la.all_cpp.files
+ cat libkwin_la.all_cpp.final libkwin_la.all_cpp.files > libkwin_la.all_cpp.cpp; \
+ rm -f libkwin_la.all_cpp.final libkwin_la.all_cpp.files
#>+ 3
clean-final:
- -rm -f kwin_la.all_cpp.cpp
+ -rm -f libkwin_la.all_cpp.cpp
#>+ 2
final:
- $(MAKE) kwin_la_OBJECTS="$(kwin_la_final_OBJECTS)" all-am
+ $(MAKE) libkwin_la_OBJECTS="$(libkwin_la_final_OBJECTS)" all-am
#>+ 2
final-install:
- $(MAKE) kwin_la_OBJECTS="$(kwin_la_final_OBJECTS)" install-am
+ $(MAKE) libkwin_la_OBJECTS="$(libkwin_la_final_OBJECTS)" install-am
#>+ 2
no-final:
- $(MAKE) kwin_la_OBJECTS="$(kwin_la_nofinal_OBJECTS)" all-am
+ $(MAKE) libkwin_la_OBJECTS="$(libkwin_la_nofinal_OBJECTS)" all-am
#>+ 2
no-final-install:
- $(MAKE) kwin_la_OBJECTS="$(kwin_la_nofinal_OBJECTS)" install-am
+ $(MAKE) libkwin_la_OBJECTS="$(libkwin_la_nofinal_OBJECTS)" install-am
#>+ 3
cvs-clean:
$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
@@ -963,15 +976,15 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 13
-kwinbutton.lo: kwinbutton.moc
kwinbutton.o: kwinbutton.moc
-tabbox.lo: tabbox.moc
-tabbox.o: tabbox.moc
-options.o: options.moc
-client.lo: client.moc
workspace.o: workspace.moc
-client.o: client.moc
-options.lo: options.moc
plugins.o: plugins.moc
+options.lo: options.moc
+client.o: client.moc
+tabbox.o: tabbox.moc
workspace.lo: workspace.moc
+client.lo: client.moc
+options.o: options.moc
plugins.lo: plugins.moc
+kwinbutton.lo: kwinbutton.moc
+tabbox.lo: tabbox.moc
|
