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
|
$NetBSD: patch-cn,v 1.4 2003/03/11 13:10:24 markd Exp $
--- konqueror/keditbookmarks/Makefile.in.orig Fri Jan 17 09:03:09 2003
+++ konqueror/keditbookmarks/Makefile.in
@@ -288,20 +288,24 @@ INCLUDES = -I$(top_srcdir)/libkonq $(all
#>- METASOURCES = AUTO
-lib_LTLIBRARIES = keditbookmarks.la
+lib_LTLIBRARIES = libkeditbookmarks_main.la keditbookmarks.la
-#>- keditbookmarks_la_SOURCES = main.cpp items.cpp toplevel.cpp favicons.cpp toplevel.skel commands.cpp
+#>- libkeditbookmarks_main_la_SOURCES = main.cpp items.cpp toplevel.cpp favicons.cpp toplevel.skel commands.cpp
#>+ 1
-keditbookmarks_la_SOURCES=main.cpp items.cpp toplevel.cpp favicons.cpp commands.cpp toplevel_skel.cpp
+libkeditbookmarks_main_la_SOURCES=main.cpp items.cpp toplevel.cpp favicons.cpp commands.cpp toplevel_skel.cpp
+libkeditbookmarks_main_la_LIBADD = $(top_builddir)/libkonq/libkonq.la $(LIB_KHTML)
+libkeditbookmarks_main_la_LDFLAGS = $(all_libraries)
+
+keditbookmarks_la_SOURCES = keditbookmarks_main.cpp
kbookmarklistener_DIR = $(top_srcdir)/libkonq
-keditbookmarks_la_LIBADD = $(top_builddir)/libkonq/libkonq.la $(LIB_KHTML)
+keditbookmarks_la_LIBADD = libkeditbookmarks_main.la
keditbookmarks_la_LDFLAGS = $(all_libraries) -module -avoid-version
bin_PROGRAMS = keditbookmarks
-keditbookmarks_SOURCES = dummy.cpp
-keditbookmarks_LDADD = keditbookmarks.la
+keditbookmarks_SOURCES = keditbookmarks_main.cpp
+keditbookmarks_LDADD = libkeditbookmarks_main.la
keditbookmarks_LDFLAGS = $(all_libraries)
rcdir = $(kde_datadir)/keditbookmarks
@@ -314,24 +318,31 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
-keditbookmarks_la_DEPENDENCIES = $(top_builddir)/libkonq/libkonq.la
-am_keditbookmarks_la_OBJECTS = main.lo items.lo toplevel.lo favicons.lo \
- commands.lo
+keditbookmarks_la_DEPENDENCIES = libkeditbookmarks_main.la
+am_keditbookmarks_la_OBJECTS = keditbookmarks_main.lo
#>- keditbookmarks_la_OBJECTS = $(am_keditbookmarks_la_OBJECTS)
+#>+ 1
+keditbookmarks_la_OBJECTS = keditbookmarks_main.lo
+libkeditbookmarks_main_la_DEPENDENCIES = \
+ $(top_builddir)/libkonq/libkonq.la
+am_libkeditbookmarks_main_la_OBJECTS = main.lo items.lo toplevel.lo \
+ favicons.lo commands.lo
+#>- libkeditbookmarks_main_la_OBJECTS = \
+#>- $(am_libkeditbookmarks_main_la_OBJECTS)
#>+ 5
-keditbookmarks_la_final_OBJECTS = keditbookmarks_la.all_cpp.lo
-keditbookmarks_la_nofinal_OBJECTS = main.lo items.lo toplevel.lo favicons.lo \
- commands.lo toplevel_skel.lo
-@KDE_USE_FINAL_FALSE@keditbookmarks_la_OBJECTS = $(keditbookmarks_la_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@keditbookmarks_la_OBJECTS = $(keditbookmarks_la_final_OBJECTS)
+libkeditbookmarks_main_la_final_OBJECTS = libkeditbookmarks_main_la.all_cpp.lo
+libkeditbookmarks_main_la_nofinal_OBJECTS = main.lo items.lo toplevel.lo \
+ favicons.lo commands.lo toplevel_skel.lo
+@KDE_USE_FINAL_FALSE@libkeditbookmarks_main_la_OBJECTS = $(libkeditbookmarks_main_la_nofinal_OBJECTS)
+@KDE_USE_FINAL_TRUE@libkeditbookmarks_main_la_OBJECTS = $(libkeditbookmarks_main_la_final_OBJECTS)
bin_PROGRAMS = keditbookmarks$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS)
-am_keditbookmarks_OBJECTS = dummy.$(OBJEXT)
+am_keditbookmarks_OBJECTS = keditbookmarks_main.$(OBJEXT)
#>- keditbookmarks_OBJECTS = $(am_keditbookmarks_OBJECTS)
#>+ 1
-keditbookmarks_OBJECTS = dummy.$(OBJEXT)
-keditbookmarks_DEPENDENCIES = keditbookmarks.la
+keditbookmarks_OBJECTS = keditbookmarks_main.$(OBJEXT)
+keditbookmarks_DEPENDENCIES = libkeditbookmarks_main.la
DEFS = @DEFS@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
@@ -340,15 +351,21 @@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/commands.Plo ./$(DEPDIR)/dummy.Po \
+#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/commands.Plo \
#>- @AMDEP_TRUE@ ./$(DEPDIR)/favicons.Plo ./$(DEPDIR)/items.Plo \
+#>- @AMDEP_TRUE@ ./$(DEPDIR)/keditbookmarks_main.Plo \
+#>- @AMDEP_TRUE@ ./$(DEPDIR)/keditbookmarks_main.Po \
#>- @AMDEP_TRUE@ ./$(DEPDIR)/main.Plo ./$(DEPDIR)/toplevel.Plo
-#>+ 7
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/toplevel_skel.P $(DEPDIR)/keditbookmarks_la.all_cpp.P ./$(DEPDIR)/commands.Plo ./$(DEPDIR)/dummy.Po \
+#>+ 11
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/toplevel_skel.P $(DEPDIR)/libkeditbookmarks_main_la.all_cpp.P ./$(DEPDIR)/commands.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/favicons.Plo ./$(DEPDIR)/items.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/keditbookmarks_main.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/keditbookmarks_main.Po \
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/main.Plo ./$(DEPDIR)/toplevel.Plo
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/toplevel_skel.P ./$(DEPDIR)/commands.Plo ./$(DEPDIR)/dummy.Po \
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/toplevel_skel.P ./$(DEPDIR)/commands.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/favicons.Plo ./$(DEPDIR)/items.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/keditbookmarks_main.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/keditbookmarks_main.Po \
@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/main.Plo ./$(DEPDIR)/toplevel.Plo
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -370,11 +387,12 @@ CXXLD = $(CXX)
CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
CXXFLAGS = @CXXFLAGS@
-DIST_SOURCES = $(keditbookmarks_la_SOURCES) $(keditbookmarks_SOURCES)
+DIST_SOURCES = $(keditbookmarks_la_SOURCES) \
+ $(libkeditbookmarks_main_la_SOURCES) $(keditbookmarks_SOURCES)
DATA = $(rc_DATA)
DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(keditbookmarks_la_SOURCES) $(keditbookmarks_SOURCES)
+SOURCES = $(keditbookmarks_la_SOURCES) $(libkeditbookmarks_main_la_SOURCES) $(keditbookmarks_SOURCES)
#>- all: all-am
#>+ 1
@@ -421,6 +439,8 @@ clean-libLTLIBRARIES:
done
keditbookmarks.la: $(keditbookmarks_la_OBJECTS) $(keditbookmarks_la_DEPENDENCIES)
$(CXXLINK) -rpath $(libdir) $(keditbookmarks_la_LDFLAGS) $(keditbookmarks_la_OBJECTS) $(keditbookmarks_la_LIBADD) $(LIBS)
+libkeditbookmarks_main.la: $(libkeditbookmarks_main_la_OBJECTS) $(libkeditbookmarks_main_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(libdir) $(libkeditbookmarks_main_la_LDFLAGS) $(libkeditbookmarks_main_la_OBJECTS) $(libkeditbookmarks_main_la_LIBADD) $(LIBS)
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
@@ -461,9 +481,10 @@ distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/commands.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/favicons.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/items.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keditbookmarks_main.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keditbookmarks_main.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/toplevel.Plo@am__quote@
@@ -554,7 +575,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=toplevel.h cr48-app-keditbookmarks.png cr128-app-keditbookmarks.png cr32-app-keditbookmarks.png uninstall.desktop cr64-app-keditbookmarks.png keditbookmarksui.rc favicons.h commands.h cr16-app-keditbookmarks.png kinsertionsort.h
+KDE_DIST=commands.h kinsertionsort.h favicons.h cr64-app-keditbookmarks.png cr32-app-keditbookmarks.png toplevel.h keditbookmarksui.rc cr128-app-keditbookmarks.png cr48-app-keditbookmarks.png cr16-app-keditbookmarks.png uninstall.desktop
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@@ -681,9 +702,6 @@ uninstall-am: uninstall-kde-icons unins
uninstall-libLTLIBRARIES uninstall-rcDATA
-dummy.cpp:
- echo > dummy.cpp
-
install-data-local: uninstall.desktop
$(mkinstalldirs) $(DESTDIR)$(kde_appsdir)/Internet
$(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_appsdir)/Internet/keditbookmarks.desktop
@@ -691,27 +709,27 @@ install-data-local: uninstall.desktop
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-#>+ 5
-toplevel.kidl: $(srcdir)/toplevel.h $(DCOP_DEPENDENCIES)
- $(DCOPIDL) $(srcdir)/toplevel.h > toplevel.kidl || ( rm -f toplevel.kidl ; /bin/false )
-toplevel_skel.cpp: toplevel.kidl
- $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub toplevel.kidl
-
#>+ 3
favicons.moc: $(srcdir)/favicons.h
$(MOC) $(srcdir)/favicons.h -o favicons.moc
#>+ 3
+commands.moc: $(srcdir)/commands.h
+ $(MOC) $(srcdir)/commands.h -o commands.moc
+
+#>+ 3
toplevel.moc: $(srcdir)/toplevel.h
$(MOC) $(srcdir)/toplevel.h -o toplevel.moc
-#>+ 3
-commands.moc: $(srcdir)/commands.h
- $(MOC) $(srcdir)/commands.h -o commands.moc
+#>+ 5
+toplevel.kidl: $(srcdir)/toplevel.h $(DCOP_DEPENDENCIES)
+ $(DCOPIDL) $(srcdir)/toplevel.h > toplevel.kidl || ( rm -f toplevel.kidl ; /bin/false )
+toplevel_skel.cpp: toplevel.kidl
+ $(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub toplevel.kidl
#>+ 3
clean-metasources:
- -rm -f favicons.moc toplevel.moc commands.moc
+ -rm -f favicons.moc commands.moc toplevel.moc
#>+ 4
clean-idl:
@@ -749,33 +767,33 @@ force-reedit:
#>+ 11
-keditbookmarks_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/items.cpp $(srcdir)/toplevel.cpp $(srcdir)/favicons.cpp $(srcdir)/commands.cpp toplevel_skel.cpp favicons.moc toplevel.moc commands.moc
- @echo 'creating keditbookmarks_la.all_cpp.cpp ...'; \
- rm -f keditbookmarks_la.all_cpp.files keditbookmarks_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> keditbookmarks_la.all_cpp.final; \
+libkeditbookmarks_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/items.cpp $(srcdir)/toplevel.cpp $(srcdir)/favicons.cpp $(srcdir)/commands.cpp toplevel_skel.cpp favicons.moc commands.moc toplevel.moc
+ @echo 'creating libkeditbookmarks_main_la.all_cpp.cpp ...'; \
+ rm -f libkeditbookmarks_main_la.all_cpp.files libkeditbookmarks_main_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkeditbookmarks_main_la.all_cpp.final; \
for file in main.cpp items.cpp toplevel.cpp favicons.cpp commands.cpp toplevel_skel.cpp ; do \
- echo "#include \"$$file\"" >> keditbookmarks_la.all_cpp.files; \
- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> keditbookmarks_la.all_cpp.final; \
+ echo "#include \"$$file\"" >> libkeditbookmarks_main_la.all_cpp.files; \
+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkeditbookmarks_main_la.all_cpp.final; \
done; \
- cat keditbookmarks_la.all_cpp.final keditbookmarks_la.all_cpp.files > keditbookmarks_la.all_cpp.cpp; \
- rm -f keditbookmarks_la.all_cpp.final keditbookmarks_la.all_cpp.files
+ cat libkeditbookmarks_main_la.all_cpp.final libkeditbookmarks_main_la.all_cpp.files > libkeditbookmarks_main_la.all_cpp.cpp; \
+ rm -f libkeditbookmarks_main_la.all_cpp.final libkeditbookmarks_main_la.all_cpp.files
#>+ 3
clean-final:
- -rm -f keditbookmarks_la.all_cpp.cpp
+ -rm -f libkeditbookmarks_main_la.all_cpp.cpp
#>+ 2
final:
- $(MAKE) keditbookmarks_la_OBJECTS="$(keditbookmarks_la_final_OBJECTS)" all-am
+ $(MAKE) libkeditbookmarks_main_la_OBJECTS="$(libkeditbookmarks_main_la_final_OBJECTS)" all-am
#>+ 2
final-install:
- $(MAKE) keditbookmarks_la_OBJECTS="$(keditbookmarks_la_final_OBJECTS)" install-am
+ $(MAKE) libkeditbookmarks_main_la_OBJECTS="$(libkeditbookmarks_main_la_final_OBJECTS)" install-am
#>+ 2
no-final:
- $(MAKE) keditbookmarks_la_OBJECTS="$(keditbookmarks_la_nofinal_OBJECTS)" all-am
+ $(MAKE) libkeditbookmarks_main_la_OBJECTS="$(libkeditbookmarks_main_la_nofinal_OBJECTS)" all-am
#>+ 2
no-final-install:
- $(MAKE) keditbookmarks_la_OBJECTS="$(keditbookmarks_la_nofinal_OBJECTS)" install-am
+ $(MAKE) libkeditbookmarks_main_la_OBJECTS="$(libkeditbookmarks_main_la_nofinal_OBJECTS)" install-am
#>+ 3
cvs-clean:
$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
@@ -785,9 +803,9 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 7
+toplevel.o: toplevel.moc
+commands.lo: commands.moc
+toplevel.lo: toplevel.moc
commands.o: commands.moc
-favicons.lo: favicons.moc
favicons.o: favicons.moc
-toplevel.lo: toplevel.moc
-commands.lo: commands.moc
-toplevel.o: toplevel.moc
+favicons.lo: favicons.moc
|
