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
|
$NetBSD: patch-cd,v 1.7 2004/01/15 10:15:14 markd Exp $
--- kmenuedit/Makefile.in.orig 2004-01-02 14:06:00.000000000 +1300
+++ kmenuedit/Makefile.in
@@ -425,17 +425,19 @@ x_libraries = @x_libraries@
INCLUDES = $(all_includes)
bin_PROGRAMS = kmenuedit
-lib_LTLIBRARIES = kmenuedit.la
+lib_LTLIBRARIES = libkmenuedit_main.la kmenuedit.la
-CLEANFILES = dummy.cpp
+libkmenuedit_main_la_SOURCES = basictab.cpp treeview.cpp desktopfileeditor.cpp menueditview.cpp kmenuedit.cpp main.cpp khotkeys.cpp
-kmenuedit_la_SOURCES = basictab.cpp treeview.cpp desktopfileeditor.cpp menueditview.cpp kmenuedit.cpp main.cpp khotkeys.cpp
+libkmenuedit_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO)
+libkmenuedit_main_la_LDFLAGS = $(all_libraries)
-kmenuedit_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO)
+kmenuedit_la_SOURCES = kmenuedit_main.cpp
+kmenuedit_la_LIBADD = libkmenuedit_main.la
kmenuedit_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kmenuedit_SOURCES = dummy.cpp
-kmenuedit_LDADD = kmenuedit.la
+kmenuedit_SOURCES = kmenuedit_main.cpp
+kmenuedit_LDADD = libkmenuedit_main.la
kmenuedit_LDFLAGS = $(all_libraries) $(KDE_RPATH)
noinst_HEADERS = kmenuedit.h menueditview.h treeview.h desktopfileeditor.h basictab.h khotkeys.h
@@ -460,45 +462,55 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
-kmenuedit_la_DEPENDENCIES =
-am_kmenuedit_la_OBJECTS = basictab.lo treeview.lo desktopfileeditor.lo \
- menueditview.lo kmenuedit.lo main.lo khotkeys.lo
+kmenuedit_la_DEPENDENCIES = libkmenuedit_main.la
+am_kmenuedit_la_OBJECTS = kmenuedit_main.lo
#>- kmenuedit_la_OBJECTS = $(am_kmenuedit_la_OBJECTS)
-#>+ 5
-kmenuedit_la_final_OBJECTS = kmenuedit_la.all_cpp.lo
-kmenuedit_la_nofinal_OBJECTS = basictab.lo treeview.lo desktopfileeditor.lo \
- menueditview.lo kmenuedit.lo main.lo khotkeys.lo
-@KDE_USE_FINAL_FALSE@kmenuedit_la_OBJECTS = $(kmenuedit_la_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@kmenuedit_la_OBJECTS = $(kmenuedit_la_final_OBJECTS)
+#>+ 1
+kmenuedit_la_OBJECTS = kmenuedit_main.lo
+libkmenuedit_main_la_DEPENDENCIES =
+am_libkmenuedit_main_la_OBJECTS = basictab.lo treeview.lo \
+ desktopfileeditor.lo menueditview.lo kmenuedit.lo main.lo \
+ khotkeys.lo
+#>- libkmenuedit_main_la_OBJECTS = $(am_libkmenuedit_main_la_OBJECTS)
+#>+ 6
+libkmenuedit_main_la_final_OBJECTS = libkmenuedit_main_la.all_cpp.lo
+libkmenuedit_main_la_nofinal_OBJECTS = basictab.lo treeview.lo \
+ desktopfileeditor.lo menueditview.lo kmenuedit.lo main.lo \
+ khotkeys.lo
+@KDE_USE_FINAL_FALSE@libkmenuedit_main_la_OBJECTS = $(libkmenuedit_main_la_nofinal_OBJECTS)
+@KDE_USE_FINAL_TRUE@libkmenuedit_main_la_OBJECTS = $(libkmenuedit_main_la_final_OBJECTS)
bin_PROGRAMS = kmenuedit$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS)
-am_kmenuedit_OBJECTS = dummy.$(OBJEXT)
+am_kmenuedit_OBJECTS = kmenuedit_main.$(OBJEXT)
#>- kmenuedit_OBJECTS = $(am_kmenuedit_OBJECTS)
#>+ 1
-kmenuedit_OBJECTS = dummy.$(OBJEXT)
-kmenuedit_DEPENDENCIES = kmenuedit.la
+kmenuedit_OBJECTS = kmenuedit_main.$(OBJEXT)
+kmenuedit_DEPENDENCIES = libkmenuedit_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)/basictab.Plo \
#>- @AMDEP_TRUE@ ./$(DEPDIR)/desktopfileeditor.Plo \
-#>- @AMDEP_TRUE@ ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/khotkeys.Plo \
-#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmenuedit.Plo ./$(DEPDIR)/main.Plo \
+#>- @AMDEP_TRUE@ ./$(DEPDIR)/khotkeys.Plo ./$(DEPDIR)/kmenuedit.Plo \
+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmenuedit_main.Plo \
+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kmenuedit_main.Po ./$(DEPDIR)/main.Plo \
#>- @AMDEP_TRUE@ ./$(DEPDIR)/menueditview.Plo \
#>- @AMDEP_TRUE@ ./$(DEPDIR)/treeview.Plo
-#>+ 13
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kmenuedit_la.all_cpp.P ./$(DEPDIR)/basictab.Plo \
+#>+ 15
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/libkmenuedit_main_la.all_cpp.P ./$(DEPDIR)/basictab.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/desktopfileeditor.Plo \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/khotkeys.Plo \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmenuedit.Plo ./$(DEPDIR)/main.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/khotkeys.Plo ./$(DEPDIR)/kmenuedit.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmenuedit_main.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmenuedit_main.Po ./$(DEPDIR)/main.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/menueditview.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/treeview.Plo
@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = ./$(DEPDIR)/basictab.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/desktopfileeditor.Plo \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/khotkeys.Plo \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmenuedit.Plo ./$(DEPDIR)/main.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/khotkeys.Plo ./$(DEPDIR)/kmenuedit.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmenuedit_main.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kmenuedit_main.Po ./$(DEPDIR)/main.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/menueditview.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/treeview.Plo
@@ -520,7 +532,8 @@ CXXLD = $(CXX)
#>+ 2
CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(kmenuedit_la_SOURCES) $(kmenuedit_SOURCES)
+DIST_SOURCES = $(kmenuedit_la_SOURCES) $(libkmenuedit_main_la_SOURCES) \
+ $(kmenuedit_SOURCES)
DATA = $(apps_DATA) $(rc_DATA)
HEADERS = $(noinst_HEADERS)
@@ -533,7 +546,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
check-recursive installcheck-recursive
DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
DIST_SUBDIRS = $(SUBDIRS)
-SOURCES = $(kmenuedit_la_SOURCES) $(kmenuedit_SOURCES)
+SOURCES = $(kmenuedit_la_SOURCES) $(libkmenuedit_main_la_SOURCES) $(kmenuedit_SOURCES)
#>- all: all-recursive
#>+ 1
@@ -580,6 +593,8 @@ clean-libLTLIBRARIES:
done
kmenuedit.la: $(kmenuedit_la_OBJECTS) $(kmenuedit_la_DEPENDENCIES)
$(CXXLINK) -rpath $(libdir) $(kmenuedit_la_LDFLAGS) $(kmenuedit_la_OBJECTS) $(kmenuedit_la_LIBADD) $(LIBS)
+libkmenuedit_main.la: $(libkmenuedit_main_la_OBJECTS) $(libkmenuedit_main_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(libdir) $(libkmenuedit_main_la_LDFLAGS) $(libkmenuedit_main_la_OBJECTS) $(libkmenuedit_main_la_LIBADD) $(LIBS)
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
@@ -621,9 +636,10 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basictab.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/desktopfileeditor.Plo@am__quote@
-@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)/kmenuedit.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmenuedit_main.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kmenuedit_main.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/menueditview.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/treeview.Plo@am__quote@
@@ -835,7 +851,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=cr48-app-kmenuedit.png cr16-app-kmenuedit.png kmenueditui.rc uninstall.desktop cr32-app-kmenuedit.png kmenuedit.desktop
+KDE_DIST=cr32-app-kmenuedit.png cr16-app-kmenuedit.png cr48-app-kmenuedit.png kmenuedit.desktop Makefile.in.rej kmenueditui.rc uninstall.desktop
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@@ -909,7 +925,6 @@ install-strip:
mostlyclean-generic:
clean-generic:
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES)
@@ -1014,11 +1029,11 @@ dummy.cpp:
.NOEXPORT:
#>+ 3
-desktopfileeditor.moc: $(srcdir)/desktopfileeditor.h
- $(MOC) $(srcdir)/desktopfileeditor.h -o desktopfileeditor.moc
+basictab.moc: $(srcdir)/basictab.h
+ $(MOC) $(srcdir)/basictab.h -o basictab.moc
#>+ 1
-mocs: desktopfileeditor.moc
+mocs: basictab.moc
#>+ 3
treeview.moc: $(srcdir)/treeview.h
$(MOC) $(srcdir)/treeview.h -o treeview.moc
@@ -1026,18 +1041,18 @@ treeview.moc: $(srcdir)/treeview.h
#>+ 1
mocs: treeview.moc
#>+ 3
-basictab.moc: $(srcdir)/basictab.h
- $(MOC) $(srcdir)/basictab.h -o basictab.moc
-
-#>+ 1
-mocs: basictab.moc
-#>+ 3
menueditview.moc: $(srcdir)/menueditview.h
$(MOC) $(srcdir)/menueditview.h -o menueditview.moc
#>+ 1
mocs: menueditview.moc
#>+ 3
+desktopfileeditor.moc: $(srcdir)/desktopfileeditor.h
+ $(MOC) $(srcdir)/desktopfileeditor.h -o desktopfileeditor.moc
+
+#>+ 1
+mocs: desktopfileeditor.moc
+#>+ 3
kmenuedit.moc: $(srcdir)/kmenuedit.h
$(MOC) $(srcdir)/kmenuedit.h -o kmenuedit.moc
@@ -1045,7 +1060,7 @@ kmenuedit.moc: $(srcdir)/kmenuedit.h
mocs: kmenuedit.moc
#>+ 3
clean-metasources:
- -rm -f desktopfileeditor.moc treeview.moc basictab.moc menueditview.moc kmenuedit.moc
+ -rm -f basictab.moc treeview.moc menueditview.moc desktopfileeditor.moc kmenuedit.moc
#>+ 2
docs-am:
@@ -1072,33 +1087,33 @@ force-reedit:
#>+ 11
-kmenuedit_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/basictab.cpp $(srcdir)/treeview.cpp $(srcdir)/desktopfileeditor.cpp $(srcdir)/menueditview.cpp $(srcdir)/kmenuedit.cpp $(srcdir)/main.cpp $(srcdir)/khotkeys.cpp desktopfileeditor.moc treeview.moc kmenuedit.moc menueditview.moc basictab.moc
- @echo 'creating kmenuedit_la.all_cpp.cpp ...'; \
- rm -f kmenuedit_la.all_cpp.files kmenuedit_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> kmenuedit_la.all_cpp.final; \
+libkmenuedit_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/basictab.cpp $(srcdir)/treeview.cpp $(srcdir)/desktopfileeditor.cpp $(srcdir)/menueditview.cpp $(srcdir)/kmenuedit.cpp $(srcdir)/main.cpp $(srcdir)/khotkeys.cpp basictab.moc treeview.moc desktopfileeditor.moc menueditview.moc kmenuedit.moc
+ @echo 'creating libkmenuedit_main_la.all_cpp.cpp ...'; \
+ rm -f libkmenuedit_main_la.all_cpp.files libkmenuedit_main_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkmenuedit_main_la.all_cpp.final; \
for file in basictab.cpp treeview.cpp desktopfileeditor.cpp menueditview.cpp kmenuedit.cpp main.cpp khotkeys.cpp ; do \
- echo "#include \"$$file\"" >> kmenuedit_la.all_cpp.files; \
- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kmenuedit_la.all_cpp.final; \
+ echo "#include \"$$file\"" >> libkmenuedit_main_la.all_cpp.files; \
+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkmenuedit_main_la.all_cpp.final; \
done; \
- cat kmenuedit_la.all_cpp.final kmenuedit_la.all_cpp.files > kmenuedit_la.all_cpp.cpp; \
- rm -f kmenuedit_la.all_cpp.final kmenuedit_la.all_cpp.files
+ cat libkmenuedit_main_la.all_cpp.final libkmenuedit_main_la.all_cpp.files > libkmenuedit_main_la.all_cpp.cpp; \
+ rm -f libkmenuedit_main_la.all_cpp.final libkmenuedit_main_la.all_cpp.files
#>+ 3
clean-final:
- -rm -f kmenuedit_la.all_cpp.cpp
+ -rm -f libkmenuedit_main_la.all_cpp.cpp
#>+ 2
final:
- $(MAKE) kmenuedit_la_OBJECTS="$(kmenuedit_la_final_OBJECTS)" all-am
+ $(MAKE) libkmenuedit_main_la_OBJECTS="$(libkmenuedit_main_la_final_OBJECTS)" all-am
#>+ 2
final-install:
- $(MAKE) kmenuedit_la_OBJECTS="$(kmenuedit_la_final_OBJECTS)" install-am
+ $(MAKE) libkmenuedit_main_la_OBJECTS="$(libkmenuedit_main_la_final_OBJECTS)" install-am
#>+ 2
no-final:
- $(MAKE) kmenuedit_la_OBJECTS="$(kmenuedit_la_nofinal_OBJECTS)" all-am
+ $(MAKE) libkmenuedit_main_la_OBJECTS="$(libkmenuedit_main_la_nofinal_OBJECTS)" all-am
#>+ 2
no-final-install:
- $(MAKE) kmenuedit_la_OBJECTS="$(kmenuedit_la_nofinal_OBJECTS)" install-am
+ $(MAKE) libkmenuedit_main_la_OBJECTS="$(libkmenuedit_main_la_nofinal_OBJECTS)" install-am
#>+ 3
cvs-clean:
$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
@@ -1108,13 +1123,13 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 11
-desktopfileeditor.lo: desktopfileeditor.moc
+basictab.lo: basictab.moc
menueditview.lo: menueditview.moc
+menueditview.o: menueditview.moc
kmenuedit.lo: kmenuedit.moc
+treeview.o: treeview.moc
+desktopfileeditor.lo: desktopfileeditor.moc
kmenuedit.o: kmenuedit.moc
-desktopfileeditor.o: desktopfileeditor.moc
-treeview.lo: treeview.moc
-basictab.lo: basictab.moc
basictab.o: basictab.moc
-treeview.o: treeview.moc
-menueditview.o: menueditview.moc
+treeview.lo: treeview.moc
+desktopfileeditor.o: desktopfileeditor.moc
|
