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
|
$NetBSD: patch-af,v 1.3 2003/03/11 13:22:31 markd Exp $
--- kedit/Makefile.in.orig Fri Jan 17 08:58:06 2003
+++ kedit/Makefile.in
@@ -256,16 +256,20 @@ x_libraries = @x_libraries@
INCLUDES = $(all_includes)
bin_PROGRAMS = kedit
-lib_LTLIBRARIES = kedit.la
+lib_LTLIBRARIES = libkedit_main.la kedit.la
-kedit_la_SOURCES = kedit.cpp ktextfiledlg.cpp\
+libkedit_main_la_SOURCES = kedit.cpp ktextfiledlg.cpp\
mail.cpp optiondialog.cpp
-kedit_la_LIBADD = -lkdeprint -lkspell $(LIB_KFILE) $(LIB_KIO)
+libkedit_main_la_LIBADD = -lkdeprint -lkspell $(LIB_KFILE) $(LIB_KIO)
+libkedit_main_la_LDFLAGS = $(all_libraries) -module -avoid-version
+
+kedit_la_SOURCES = kedit_main.cpp
+kedit_la_LIBADD = libkedit_main.la
kedit_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kedit_SOURCES = dummy.cpp
-kedit_LDADD = kedit.la
+kedit_SOURCES = kedit_main.cpp
+kedit_LDADD = libkedit_main.la
kedit_LDFLAGS = $(all_libraries) $(KDE_RPATH)
noinst_HEADERS = kedit.h ktextfiledlg.h\
@@ -289,22 +293,29 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
-kedit_la_DEPENDENCIES =
-am_kedit_la_OBJECTS = kedit.lo ktextfiledlg.lo mail.lo optiondialog.lo
+kedit_la_DEPENDENCIES = libkedit_main.la
+am_kedit_la_OBJECTS = kedit_main.lo
#>- kedit_la_OBJECTS = $(am_kedit_la_OBJECTS)
-#>+ 4
-kedit_la_final_OBJECTS = kedit_la.all_cpp.lo
-kedit_la_nofinal_OBJECTS = kedit.lo ktextfiledlg.lo mail.lo optiondialog.lo
-@KDE_USE_FINAL_FALSE@kedit_la_OBJECTS = $(kedit_la_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@kedit_la_OBJECTS = $(kedit_la_final_OBJECTS)
+#>+ 1
+kedit_la_OBJECTS = kedit_main.lo
+libkedit_main_la_DEPENDENCIES =
+am_libkedit_main_la_OBJECTS = kedit.lo ktextfiledlg.lo mail.lo \
+ optiondialog.lo
+#>- libkedit_main_la_OBJECTS = $(am_libkedit_main_la_OBJECTS)
+#>+ 5
+libkedit_main_la_final_OBJECTS = libkedit_main_la.all_cpp.lo
+libkedit_main_la_nofinal_OBJECTS = kedit.lo ktextfiledlg.lo mail.lo \
+ optiondialog.lo
+@KDE_USE_FINAL_FALSE@libkedit_main_la_OBJECTS = $(libkedit_main_la_nofinal_OBJECTS)
+@KDE_USE_FINAL_TRUE@libkedit_main_la_OBJECTS = $(libkedit_main_la_final_OBJECTS)
bin_PROGRAMS = kedit$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS)
-am_kedit_OBJECTS = dummy.$(OBJEXT)
+am_kedit_OBJECTS = kedit_main.$(OBJEXT)
#>- kedit_OBJECTS = $(am_kedit_OBJECTS)
#>+ 1
-kedit_OBJECTS = dummy.$(OBJEXT)
-kedit_DEPENDENCIES = kedit.la
+kedit_OBJECTS = kedit_main.$(OBJEXT)
+kedit_DEPENDENCIES = libkedit_main.la
DEFS = @DEFS@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
@@ -313,14 +324,17 @@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
am__depfiles_maybe = depfiles
-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/kedit.Plo \
+#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/kedit.Plo ./$(DEPDIR)/kedit_main.Plo \
+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kedit_main.Po \
#>- @AMDEP_TRUE@ ./$(DEPDIR)/ktextfiledlg.Plo ./$(DEPDIR)/mail.Plo \
#>- @AMDEP_TRUE@ ./$(DEPDIR)/optiondialog.Plo
-#>+ 7
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kedit_la.all_cpp.P ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/kedit.Plo \
+#>+ 9
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/libkedit_main_la.all_cpp.P ./$(DEPDIR)/kedit.Plo ./$(DEPDIR)/kedit_main.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kedit_main.Po \
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktextfiledlg.Plo ./$(DEPDIR)/mail.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/optiondialog.Plo
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/kedit.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = ./$(DEPDIR)/kedit.Plo ./$(DEPDIR)/kedit_main.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kedit_main.Po \
@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/ktextfiledlg.Plo ./$(DEPDIR)/mail.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/optiondialog.Plo
@@ -343,7 +357,8 @@ CXXLD = $(CXX)
CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
CXXFLAGS = @CXXFLAGS@
-DIST_SOURCES = $(kedit_la_SOURCES) $(kedit_SOURCES)
+DIST_SOURCES = $(kedit_la_SOURCES) $(libkedit_main_la_SOURCES) \
+ $(kedit_SOURCES)
DATA = $(apps_DATA) $(rc_DATA)
HEADERS = $(noinst_HEADERS)
@@ -356,7 +371,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
DIST_COMMON = README $(noinst_HEADERS) ChangeLog Makefile.am \
Makefile.in TODO
DIST_SUBDIRS = $(SUBDIRS)
-SOURCES = $(kedit_la_SOURCES) $(kedit_SOURCES)
+SOURCES = $(kedit_la_SOURCES) $(libkedit_main_la_SOURCES) $(kedit_SOURCES)
#>- all: all-recursive
#>+ 1
@@ -403,6 +418,8 @@ clean-libLTLIBRARIES:
done
kedit.la: $(kedit_la_OBJECTS) $(kedit_la_DEPENDENCIES)
$(CXXLINK) -rpath $(libdir) $(kedit_la_LDFLAGS) $(kedit_la_OBJECTS) $(kedit_la_LIBADD) $(LIBS)
+libkedit_main.la: $(libkedit_main_la_OBJECTS) $(libkedit_main_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(libdir) $(libkedit_main_la_LDFLAGS) $(libkedit_main_la_OBJECTS) $(libkedit_main_la_LIBADD) $(LIBS)
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
@@ -442,8 +459,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)/kedit.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kedit_main.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kedit_main.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ktextfiledlg.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mail.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/optiondialog.Plo@am__quote@
@@ -613,7 +631,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=optionstate.h keditui.rc KEdit.desktop
+KDE_DIST=KEdit.desktop keditui.rc optionstate.h
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@@ -758,14 +776,15 @@ uninstall-info: uninstall-info-recursive
messages: rc.cpp
$(XGETTEXT) rc.cpp *.cpp -o $(podir)/kedit.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:
#>+ 3
+optiondialog.moc: $(srcdir)/optiondialog.h
+ $(MOC) $(srcdir)/optiondialog.h -o optiondialog.moc
+
+#>+ 3
mail.moc: $(srcdir)/mail.h
$(MOC) $(srcdir)/mail.h -o mail.moc
@@ -778,12 +797,8 @@ kedit.moc: $(srcdir)/kedit.h
$(MOC) $(srcdir)/kedit.h -o kedit.moc
#>+ 3
-optiondialog.moc: $(srcdir)/optiondialog.h
- $(MOC) $(srcdir)/optiondialog.h -o optiondialog.moc
-
-#>+ 3
clean-metasources:
- -rm -f mail.moc ktextfiledlg.moc kedit.moc optiondialog.moc
+ -rm -f optiondialog.moc mail.moc ktextfiledlg.moc kedit.moc
#>+ 2
docs-am:
@@ -796,33 +811,33 @@ force-reedit:
#>+ 11
-kedit_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kedit.cpp $(srcdir)/ktextfiledlg.cpp $(srcdir)/mail.cpp $(srcdir)/optiondialog.cpp mail.moc kedit.moc ktextfiledlg.moc optiondialog.moc
- @echo 'creating kedit_la.all_cpp.cpp ...'; \
- rm -f kedit_la.all_cpp.files kedit_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> kedit_la.all_cpp.final; \
+libkedit_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kedit.cpp $(srcdir)/ktextfiledlg.cpp $(srcdir)/mail.cpp $(srcdir)/optiondialog.cpp optiondialog.moc mail.moc kedit.moc ktextfiledlg.moc
+ @echo 'creating libkedit_main_la.all_cpp.cpp ...'; \
+ rm -f libkedit_main_la.all_cpp.files libkedit_main_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkedit_main_la.all_cpp.final; \
for file in kedit.cpp ktextfiledlg.cpp mail.cpp optiondialog.cpp ; do \
- echo "#include \"$$file\"" >> kedit_la.all_cpp.files; \
- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kedit_la.all_cpp.final; \
+ echo "#include \"$$file\"" >> libkedit_main_la.all_cpp.files; \
+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkedit_main_la.all_cpp.final; \
done; \
- cat kedit_la.all_cpp.final kedit_la.all_cpp.files > kedit_la.all_cpp.cpp; \
- rm -f kedit_la.all_cpp.final kedit_la.all_cpp.files
+ cat libkedit_main_la.all_cpp.final libkedit_main_la.all_cpp.files > libkedit_main_la.all_cpp.cpp; \
+ rm -f libkedit_main_la.all_cpp.final libkedit_main_la.all_cpp.files
#>+ 3
clean-final:
- -rm -f kedit_la.all_cpp.cpp
+ -rm -f libkedit_main_la.all_cpp.cpp
#>+ 2
final:
- $(MAKE) kedit_la_OBJECTS="$(kedit_la_final_OBJECTS)" all-am
+ $(MAKE) libkedit_main_la_OBJECTS="$(libkedit_main_la_final_OBJECTS)" all-am
#>+ 2
final-install:
- $(MAKE) kedit_la_OBJECTS="$(kedit_la_final_OBJECTS)" install-am
+ $(MAKE) libkedit_main_la_OBJECTS="$(libkedit_main_la_final_OBJECTS)" install-am
#>+ 2
no-final:
- $(MAKE) kedit_la_OBJECTS="$(kedit_la_nofinal_OBJECTS)" all-am
+ $(MAKE) libkedit_main_la_OBJECTS="$(libkedit_main_la_nofinal_OBJECTS)" all-am
#>+ 2
no-final-install:
- $(MAKE) kedit_la_OBJECTS="$(kedit_la_nofinal_OBJECTS)" install-am
+ $(MAKE) libkedit_main_la_OBJECTS="$(libkedit_main_la_nofinal_OBJECTS)" install-am
#>+ 3
cvs-clean:
$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
@@ -833,10 +848,10 @@ kde-rpo-clean:
#>+ 9
optiondialog.o: optiondialog.moc
-mail.o: mail.moc
+mail.lo: mail.moc
optiondialog.lo: optiondialog.moc
+mail.o: mail.moc
kedit.lo: kedit.moc
-ktextfiledlg.lo: ktextfiledlg.moc
ktextfiledlg.o: ktextfiledlg.moc
-mail.lo: mail.moc
+ktextfiledlg.lo: ktextfiledlg.moc
kedit.o: kedit.moc
|
