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
|
$NetBSD: patch-bg,v 1.7 2004/01/15 10:15:14 markd Exp $
--- khotkeys/khotkeys/Makefile.in.orig 2004-01-02 14:05:58.000000000 +1300
+++ khotkeys/khotkeys/Makefile.in
@@ -426,16 +426,20 @@ x_includes = @x_includes@
x_libraries = @x_libraries@
bin_PROGRAMS = khotkeys
-lib_LTLIBRARIES = khotkeys.la
+lib_LTLIBRARIES = libkhotkeys_main.la khotkeys.la
-#>- khotkeys_la_SOURCES = khotkeys.cpp main.cpp khotkeys.skel
+#>- libkhotkeys_main_la_SOURCES = khotkeys.cpp main.cpp khotkeys.skel
#>+ 1
-khotkeys_la_SOURCES=khotkeys.cpp main.cpp khotkeys_skel.cpp
-khotkeys_la_LIBADD = ../shared/libshared.la $(LIB_KSYCOCA)
+libkhotkeys_main_la_SOURCES=khotkeys.cpp main.cpp khotkeys_skel.cpp
+libkhotkeys_main_la_LIBADD = ../shared/libshared.la $(LIB_KSYCOCA)
+libkhotkeys_main_la_LDFLAGS = $(all_libraries)
+
+khotkeys_la_SOURCES = khotkeys_main.cpp
+khotkeys_la_LIBADD = libkhotkeys_main.la
khotkeys_la_LDFLAGS = $(all_libraries) -module -avoid-version
-khotkeys_SOURCES = dummy.cpp
-khotkeys_LDADD = khotkeys.la
+khotkeys_SOURCES = khotkeys_main.cpp
+khotkeys_LDADD = libkhotkeys_main.la
khotkeys_LDFLAGS = $(all_libraries) $(KDE_RPATH)
autostart_DATA = khotkeys.desktop
@@ -453,33 +457,41 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
-khotkeys_la_DEPENDENCIES = ../shared/libshared.la
-am_khotkeys_la_OBJECTS = khotkeys.lo main.lo
+khotkeys_la_DEPENDENCIES = libkhotkeys_main.la
+am_khotkeys_la_OBJECTS = khotkeys_main.lo
#>- khotkeys_la_OBJECTS = $(am_khotkeys_la_OBJECTS)
+#>+ 1
+khotkeys_la_OBJECTS = khotkeys_main.lo
+libkhotkeys_main_la_DEPENDENCIES = ../shared/libshared.la
+am_libkhotkeys_main_la_OBJECTS = khotkeys.lo main.lo
+#>- libkhotkeys_main_la_OBJECTS = $(am_libkhotkeys_main_la_OBJECTS)
#>+ 4
-khotkeys_la_final_OBJECTS = khotkeys_la.all_cpp.lo
-khotkeys_la_nofinal_OBJECTS = khotkeys.lo main.lo khotkeys_skel.lo
-@KDE_USE_FINAL_FALSE@khotkeys_la_OBJECTS = $(khotkeys_la_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@khotkeys_la_OBJECTS = $(khotkeys_la_final_OBJECTS)
+libkhotkeys_main_la_final_OBJECTS = libkhotkeys_main_la.all_cpp.lo
+libkhotkeys_main_la_nofinal_OBJECTS = khotkeys.lo main.lo khotkeys_skel.lo
+@KDE_USE_FINAL_FALSE@libkhotkeys_main_la_OBJECTS = $(libkhotkeys_main_la_nofinal_OBJECTS)
+@KDE_USE_FINAL_TRUE@libkhotkeys_main_la_OBJECTS = $(libkhotkeys_main_la_final_OBJECTS)
bin_PROGRAMS = khotkeys$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS)
-am_khotkeys_OBJECTS = dummy.$(OBJEXT)
+am_khotkeys_OBJECTS = khotkeys_main.$(OBJEXT)
#>- khotkeys_OBJECTS = $(am_khotkeys_OBJECTS)
#>+ 1
-khotkeys_OBJECTS = dummy.$(OBJEXT)
-khotkeys_DEPENDENCIES = khotkeys.la
+khotkeys_OBJECTS = khotkeys_main.$(OBJEXT)
+khotkeys_DEPENDENCIES = libkhotkeys_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 ./$(DEPDIR)/khotkeys.Plo \
-#>- @AMDEP_TRUE@ ./$(DEPDIR)/main.Plo
-#>+ 5
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/khotkeys_skel.P $(DEPDIR)/khotkeys_la.all_cpp.P ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/khotkeys.Plo \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/main.Plo
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/khotkeys_skel.P ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/khotkeys.Plo \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/main.Plo
+#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/khotkeys.Plo \
+#>- @AMDEP_TRUE@ ./$(DEPDIR)/khotkeys_main.Plo \
+#>- @AMDEP_TRUE@ ./$(DEPDIR)/khotkeys_main.Po ./$(DEPDIR)/main.Plo
+#>+ 7
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/khotkeys_skel.P $(DEPDIR)/libkhotkeys_main_la.all_cpp.P ./$(DEPDIR)/khotkeys.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/khotkeys_main.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/khotkeys_main.Po ./$(DEPDIR)/main.Plo
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/khotkeys_skel.P ./$(DEPDIR)/khotkeys.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/khotkeys_main.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/khotkeys_main.Po ./$(DEPDIR)/main.Plo
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -499,13 +511,14 @@ CXXLD = $(CXX)
#>+ 2
CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(khotkeys_la_SOURCES) $(khotkeys_SOURCES)
+DIST_SOURCES = $(khotkeys_la_SOURCES) $(libkhotkeys_main_la_SOURCES) \
+ $(khotkeys_SOURCES)
DATA = $(autostart_DATA)
HEADERS = $(noinst_HEADERS)
DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
-SOURCES = $(khotkeys_la_SOURCES) $(khotkeys_SOURCES)
+SOURCES = $(khotkeys_la_SOURCES) $(libkhotkeys_main_la_SOURCES) $(khotkeys_SOURCES)
#>- all: all-am
#>+ 1
@@ -552,6 +565,8 @@ clean-libLTLIBRARIES:
done
khotkeys.la: $(khotkeys_la_OBJECTS) $(khotkeys_la_DEPENDENCIES)
$(CXXLINK) -rpath $(libdir) $(khotkeys_la_LDFLAGS) $(khotkeys_la_OBJECTS) $(khotkeys_la_LIBADD) $(LIBS)
+libkhotkeys_main.la: $(libkhotkeys_main_la_OBJECTS) $(libkhotkeys_main_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(libdir) $(libkhotkeys_main_la_LDFLAGS) $(libkhotkeys_main_la_OBJECTS) $(libkhotkeys_main_la_LIBADD) $(LIBS)
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
@@ -591,8 +606,9 @@ 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)/khotkeys.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/khotkeys_main.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/khotkeys_main.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@
distclean-depend:
@@ -714,7 +730,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=khkglobalaccel.h khkglobalaccel.cpp khotkeys.desktop
+KDE_DIST=khotkeys.desktop khkglobalaccel.h khkglobalaccel.cpp Makefile.in.rej
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@@ -849,19 +865,10 @@ uninstall-am: uninstall-autostartDATA un
uninstall-binPROGRAMS uninstall-info-am \
uninstall-libLTLIBRARIES
-
-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:
-#>+ 5
-khotkeys.kidl: $(srcdir)/khotkeys.h $(DCOP_DEPENDENCIES)
- $(DCOPIDL) $(srcdir)/khotkeys.h > khotkeys.kidl || ( rm -f khotkeys.kidl ; false )
-khotkeys_skel.cpp: khotkeys.kidl
- $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub khotkeys.kidl
-
#>+ 3
khotkeys.moc: $(srcdir)/khotkeys.h
$(MOC) $(srcdir)/khotkeys.h -o khotkeys.moc
@@ -874,6 +881,12 @@ khkglobalaccel.moc: $(srcdir)/khkglobala
#>+ 1
mocs: khkglobalaccel.moc
+#>+ 5
+khotkeys.kidl: $(srcdir)/khotkeys.h $(DCOP_DEPENDENCIES)
+ $(DCOPIDL) $(srcdir)/khotkeys.h > khotkeys.kidl || ( rm -f khotkeys.kidl ; false )
+khotkeys_skel.cpp: khotkeys.kidl
+ $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub khotkeys.kidl
+
#>+ 3
clean-metasources:
-rm -f khotkeys.moc khkglobalaccel.moc
@@ -894,33 +907,33 @@ force-reedit:
#>+ 11
-khotkeys_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/khotkeys.cpp $(srcdir)/main.cpp khotkeys_skel.cpp khotkeys.moc
- @echo 'creating khotkeys_la.all_cpp.cpp ...'; \
- rm -f khotkeys_la.all_cpp.files khotkeys_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> khotkeys_la.all_cpp.final; \
+libkhotkeys_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/khotkeys.cpp $(srcdir)/main.cpp khotkeys_skel.cpp khotkeys.moc
+ @echo 'creating libkhotkeys_main_la.all_cpp.cpp ...'; \
+ rm -f libkhotkeys_main_la.all_cpp.files libkhotkeys_main_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkhotkeys_main_la.all_cpp.final; \
for file in khotkeys.cpp main.cpp khotkeys_skel.cpp ; do \
- echo "#include \"$$file\"" >> khotkeys_la.all_cpp.files; \
- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> khotkeys_la.all_cpp.final; \
+ echo "#include \"$$file\"" >> libkhotkeys_main_la.all_cpp.files; \
+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkhotkeys_main_la.all_cpp.final; \
done; \
- cat khotkeys_la.all_cpp.final khotkeys_la.all_cpp.files > khotkeys_la.all_cpp.cpp; \
- rm -f khotkeys_la.all_cpp.final khotkeys_la.all_cpp.files
+ cat libkhotkeys_main_la.all_cpp.final libkhotkeys_main_la.all_cpp.files > libkhotkeys_main_la.all_cpp.cpp; \
+ rm -f libkhotkeys_main_la.all_cpp.final libkhotkeys_main_la.all_cpp.files
#>+ 3
clean-final:
- -rm -f khotkeys_la.all_cpp.cpp
+ -rm -f libkhotkeys_main_la.all_cpp.cpp
#>+ 2
final:
- $(MAKE) khotkeys_la_OBJECTS="$(khotkeys_la_final_OBJECTS)" all-am
+ $(MAKE) libkhotkeys_main_la_OBJECTS="$(libkhotkeys_main_la_final_OBJECTS)" all-am
#>+ 2
final-install:
- $(MAKE) khotkeys_la_OBJECTS="$(khotkeys_la_final_OBJECTS)" install-am
+ $(MAKE) libkhotkeys_main_la_OBJECTS="$(libkhotkeys_main_la_final_OBJECTS)" install-am
#>+ 2
no-final:
- $(MAKE) khotkeys_la_OBJECTS="$(khotkeys_la_nofinal_OBJECTS)" all-am
+ $(MAKE) libkhotkeys_main_la_OBJECTS="$(libkhotkeys_main_la_nofinal_OBJECTS)" all-am
#>+ 2
no-final-install:
- $(MAKE) khotkeys_la_OBJECTS="$(khotkeys_la_nofinal_OBJECTS)" install-am
+ $(MAKE) libkhotkeys_main_la_OBJECTS="$(libkhotkeys_main_la_nofinal_OBJECTS)" install-am
#>+ 3
cvs-clean:
$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
@@ -930,7 +943,7 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 5
-khotkeys.o: khotkeys.moc
-khkglobalaccel.o: khkglobalaccel.moc
-khkglobalaccel.lo: khkglobalaccel.moc
khotkeys.lo: khotkeys.moc
+khkglobalaccel.lo: khkglobalaccel.moc
+khkglobalaccel.o: khkglobalaccel.moc
+khotkeys.o: khotkeys.moc
|
