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
|
$NetBSD: patch-ab,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $
--- kcalc/Makefile.in.orig Wed May 8 21:11:41 2002
+++ kcalc/Makefile.in
@@ -228,22 +228,24 @@
x_libraries = @x_libraries@
bin_PROGRAMS = kcalc
-lib_LTLIBRARIES = kcalc.la
+lib_LTLIBRARIES = libkcalc_main.la kcalc.la
-kcalc_la_SOURCES = kcalc.cpp kcalc_core.cpp dlabel.cpp stats.cpp \
+libkcalc_main_la_SOURCES = kcalc.cpp kcalc_core.cpp dlabel.cpp stats.cpp \
optiondialog.cpp
+libkcalc_main_la_LIBADD = $(LIB_KDEUI) -lm
+
+kcalc_la_SOURCES = kcalc_main.cpp
+kcalc_la_LDFLAGS = $(all_libraries) -module -avoid-version
#>- METASOURCES = AUTO
noinst_HEADERS = kcalc.h dlabel.h stats.h kcalctype.h
INCLUDES = $(all_includes)
-kcalc_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kcalc_la_LIBADD = $(LIB_KDEUI) -lm
-kcalc_SOURCES = dummy.cpp
-kcalc_LDADD = kcalc.la
+kcalc_SOURCES = kcalc_main.cpp
+kcalc_LDADD = libkcalc_main.la
kcalc_LDFLAGS = $(all_libraries) $(KDE_RPATH)
pics_DATA =
@@ -261,25 +263,31 @@
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
-kcalc_la_DEPENDENCIES =
-am_kcalc_la_OBJECTS = kcalc.lo kcalc_core.lo dlabel.lo stats.lo \
- optiondialog.lo
+kcalc_la_LIBADD =
+am_kcalc_la_OBJECTS = kcalc_main.lo
#>- kcalc_la_OBJECTS = $(am_kcalc_la_OBJECTS)
+#>+ 1
+kcalc_la_OBJECTS = kcalc_main.lo
+libkcalc_main_la_LDFLAGS =
+libkcalc_main_la_DEPENDENCIES =
+am_libkcalc_main_la_OBJECTS = kcalc.lo kcalc_core.lo dlabel.lo stats.lo \
+ optiondialog.lo
+#>- libkcalc_main_la_OBJECTS = $(am_libkcalc_main_la_OBJECTS)
#>+ 6
-kcalc_la_final_OBJECTS = kcalc_la.all_cpp.lo
-kcalc_la_nofinal_OBJECTS = kcalc.lo kcalc_core.lo dlabel.lo stats.lo \
+libkcalc_main_la_final_OBJECTS = libkcalc_main_la.all_cpp.lo
+libkcalc_main_la_nofinal_OBJECTS = kcalc.lo kcalc_core.lo dlabel.lo stats.lo \
optiondialog.lo \
- kcalc_la_meta_unload.lo
-@KDE_USE_FINAL_FALSE@kcalc_la_OBJECTS = $(kcalc_la_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@kcalc_la_OBJECTS = $(kcalc_la_final_OBJECTS)
+ libkcalc_main_la_meta_unload.lo
+@KDE_USE_FINAL_FALSE@libkcalc_main_la_OBJECTS = $(libkcalc_main_la_nofinal_OBJECTS)
+@KDE_USE_FINAL_TRUE@libkcalc_main_la_OBJECTS = $(libkcalc_main_la_final_OBJECTS)
bin_PROGRAMS = kcalc$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS)
-am_kcalc_OBJECTS = dummy.$(OBJEXT)
+am_kcalc_OBJECTS = kcalc_main.$(OBJEXT)
#>- kcalc_OBJECTS = $(am_kcalc_OBJECTS)
#>+ 1
-kcalc_OBJECTS = dummy.$(OBJEXT)
-kcalc_DEPENDENCIES = kcalc.la
+kcalc_OBJECTS = kcalc_main.$(OBJEXT)
+kcalc_DEPENDENCIES = libkcalc_main.la
DEFS = @DEFS@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
@@ -287,9 +295,10 @@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dlabel.Plo $(DEPDIR)/dummy.Po \
- @AMDEP_TRUE@ $(DEPDIR)/kcalc.Plo $(DEPDIR)/kcalc_core.Plo \
- @AMDEP_TRUE@ $(DEPDIR)/optiondialog.Plo $(DEPDIR)/stats.Plo
+@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/dlabel.Plo $(DEPDIR)/kcalc.Plo \
+ @AMDEP_TRUE@ $(DEPDIR)/kcalc_core.Plo $(DEPDIR)/kcalc_main.Plo \
+ @AMDEP_TRUE@ $(DEPDIR)/kcalc_main.Po $(DEPDIR)/optiondialog.Plo \
+ @AMDEP_TRUE@ $(DEPDIR)/stats.Plo
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
#>+ 2
@@ -309,14 +318,15 @@
CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
CXXFLAGS = @CXXFLAGS@
-DIST_SOURCES = $(kcalc_la_SOURCES) $(kcalc_SOURCES)
+DIST_SOURCES = $(kcalc_la_SOURCES) $(libkcalc_main_la_SOURCES) \
+ $(kcalc_SOURCES)
DATA = $(apps_DATA) $(pics_DATA)
HEADERS = $(noinst_HEADERS)
DIST_COMMON = README $(noinst_HEADERS) ChangeLog Makefile.am \
Makefile.in
-SOURCES = $(kcalc_la_SOURCES) $(kcalc_SOURCES)
+SOURCES = $(kcalc_la_SOURCES) $(libkcalc_main_la_SOURCES) $(kcalc_SOURCES)
#>- all: all-am
#>+ 1
@@ -365,6 +375,8 @@
-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
kcalc.la: $(kcalc_la_OBJECTS) $(kcalc_la_DEPENDENCIES)
$(CXXLINK) -rpath $(libdir) $(kcalc_la_LDFLAGS) $(kcalc_la_OBJECTS) $(kcalc_la_LIBADD) $(LIBS)
+libkcalc_main.la: $(libkcalc_main_la_OBJECTS) $(libkcalc_main_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(libdir) $(libkcalc_main_la_LDFLAGS) $(libkcalc_main_la_OBJECTS) $(libkcalc_main_la_LIBADD) $(LIBS)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(bindir)
@@ -400,9 +412,10 @@
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dlabel.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kcalc.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kcalc_core.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kcalc_main.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kcalc_main.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/optiondialog.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/stats.Plo@am__quote@
@@ -497,7 +510,7 @@
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=kcalclogo.xpm optiondialog.h hi32-app-kcalc.png ToDo configure.in.in hi16-app-kcalc.png kcalc.desktop hi48-app-kcalc.png version.h
+KDE_DIST=kcalclogo.xpm configure.in.in optiondialog.h hi16-app-kcalc.png kcalc version.h hi32-app-kcalc.png kcalc.desktop hi48-app-kcalc.png dummy.cpp ToDo
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@@ -620,9 +633,6 @@
messages:
$(XGETTEXT) *.cpp -o $(podir)/kcalc.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:
@@ -668,28 +678,28 @@
#>+ 12
-kcalc_la_meta_unload.cpp: kcalc.moc optiondialog.moc dlabel.moc
- @echo 'creating kcalc_la_meta_unload.cpp'
- @-rm -f kcalc_la_meta_unload.cpp
+libkcalc_main_la_meta_unload.cpp: kcalc.moc optiondialog.moc dlabel.moc
+ @echo 'creating libkcalc_main_la_meta_unload.cpp'
+ @-rm -f libkcalc_main_la_meta_unload.cpp
@if test ${kde_qtver} = 2; then \
- echo 'static const char * _metalist_kcalc_la[] = {' > kcalc_la_meta_unload.cpp ;\
- cat kcalc.moc optiondialog.moc dlabel.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kcalc_la_meta_unload.cpp ;\
- echo '0};' >> kcalc_la_meta_unload.cpp ;\
- echo '#include <kunload.h>' >> kcalc_la_meta_unload.cpp ;\
- echo '_UNLOAD(kcalc_la)' >> kcalc_la_meta_unload.cpp ;\
- else echo > kcalc_la_meta_unload.cpp; fi
+ echo 'static const char * _metalist_libkcalc_main_la[] = {' > libkcalc_main_la_meta_unload.cpp ;\
+ cat kcalc.moc optiondialog.moc dlabel.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkcalc_main_la_meta_unload.cpp ;\
+ echo '0};' >> libkcalc_main_la_meta_unload.cpp ;\
+ echo '#include <kunload.h>' >> libkcalc_main_la_meta_unload.cpp ;\
+ echo '_UNLOAD(libkcalc_main_la)' >> libkcalc_main_la_meta_unload.cpp ;\
+ else echo > libkcalc_main_la_meta_unload.cpp; fi
#>+ 3
clean-moc-classes:
- -rm -f kcalc_la_meta_unload.cpp
+ -rm -f libkcalc_main_la_meta_unload.cpp
#>+ 11
-kcalc_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcalc.cpp $(srcdir)/kcalc_core.cpp $(srcdir)/dlabel.cpp $(srcdir)/stats.cpp $(srcdir)/optiondialog.cpp kcalc_la_meta_unload.cpp kcalc.moc optiondialog.moc dlabel.moc
+kcalc_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcalc_main.cpp kcalc.moc optiondialog.moc dlabel.moc
@echo 'creating kcalc_la.all_cpp.cpp ...'; \
rm -f kcalc_la.all_cpp.files kcalc_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kcalc_la.all_cpp.final; \
- for file in kcalc.cpp kcalc_core.cpp dlabel.cpp stats.cpp optiondialog.cpp kcalc_la_meta_unload.cpp ; do \
+ for file in kcalc_main.cpp ; do \
echo "#include \"$$file\"" >> kcalc_la.all_cpp.files; \
test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcalc_la.all_cpp.final; \
done; \
@@ -697,11 +707,23 @@
rm -f kcalc_la.all_cpp.final kcalc_la.all_cpp.files
#>+ 11
-kcalc.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp
+libkcalc_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcalc.cpp $(srcdir)/kcalc_core.cpp $(srcdir)/dlabel.cpp $(srcdir)/stats.cpp $(srcdir)/optiondialog.cpp libkcalc_main_la_meta_unload.cpp
+ @echo 'creating libkcalc_main_la.all_cpp.cpp ...'; \
+ rm -f libkcalc_main_la.all_cpp.files libkcalc_main_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkcalc_main_la.all_cpp.final; \
+ for file in kcalc.cpp kcalc_core.cpp dlabel.cpp stats.cpp optiondialog.cpp libkcalc_main_la_meta_unload.cpp ; do \
+ echo "#include \"$$file\"" >> libkcalc_main_la.all_cpp.files; \
+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkcalc_main_la.all_cpp.final; \
+ done; \
+ cat libkcalc_main_la.all_cpp.final libkcalc_main_la.all_cpp.files > libkcalc_main_la.all_cpp.cpp; \
+ rm -f libkcalc_main_la.all_cpp.final libkcalc_main_la.all_cpp.files
+
+#>+ 11
+kcalc.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcalc_main.cpp
@echo 'creating kcalc.all_cpp.cpp ...'; \
rm -f kcalc.all_cpp.files kcalc.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> kcalc.all_cpp.final; \
- for file in dummy.cpp ; do \
+ for file in kcalc_main.cpp ; do \
echo "#include \"$$file\"" >> kcalc.all_cpp.files; \
test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kcalc.all_cpp.final; \
done; \
@@ -710,20 +732,20 @@
#>+ 3
clean-final:
- -rm -f kcalc_la.all_cpp.cpp kcalc.all_cpp.cpp
+ -rm -f kcalc_la.all_cpp.cpp libkcalc_main_la.all_cpp.cpp kcalc.all_cpp.cpp
#>+ 2
final:
- $(MAKE) kcalc_la_OBJECTS="$(kcalc_la_final_OBJECTS)" all-am
+ $(MAKE) libkcalc_main_la_OBJECTS="$(libkcalc_main_la_final_OBJECTS)" all-am
#>+ 2
final-install:
- $(MAKE) kcalc_la_OBJECTS="$(kcalc_la_final_OBJECTS)" install-am
+ $(MAKE) libkcalc_main_la_OBJECTS="$(libkcalc_main_la_final_OBJECTS)" install-am
#>+ 2
no-final:
- $(MAKE) kcalc_la_OBJECTS="$(kcalc_la_nofinal_OBJECTS)" all-am
+ $(MAKE) libkcalc_main_la_OBJECTS="$(libkcalc_main_la_nofinal_OBJECTS)" all-am
#>+ 2
no-final-install:
- $(MAKE) kcalc_la_OBJECTS="$(kcalc_la_nofinal_OBJECTS)" install-am
+ $(MAKE) libkcalc_main_la_OBJECTS="$(libkcalc_main_la_nofinal_OBJECTS)" install-am
#>+ 3
cvs-clean:
$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
|
