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
|
$NetBSD: patch-ai,v 1.8 2004/01/15 10:15:14 markd Exp $
--- kcontrol/access/Makefile.in.orig 2004-01-02 14:05:55.000000000 +1300
+++ kcontrol/access/Makefile.in
@@ -428,16 +428,20 @@ INCLUDES = $(all_includes)
bin_PROGRAMS = kaccess
-kaccess_SOURCES = dummy.cpp
+kaccess_SOURCES = kaccess_main.cpp
kaccess_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-kaccess_LDADD = kaccess.la
+kaccess_LDADD = libkaccess_main.la
kde_module_LTLIBRARIES = kcm_access.la
-lib_LTLIBRARIES = kaccess.la
+lib_LTLIBRARIES = libkaccess_main.la kaccess.la
-kaccess_la_SOURCES = kaccess.cpp main.cpp
-kaccess_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kaccess_la_LIBADD = $(LIB_KDEUI)
+libkaccess_main_la_SOURCES = kaccess.cpp main.cpp
+libkaccess_main_la_LDFLAGS = $(all_libraries)
+libkaccess_main_la_LIBADD = $(LIB_KDEUI)
+
+kaccess_la_SOURCES = kaccess_main.cpp
+kaccess_la_LDFLAGS = $(all_libraries) -module -avoid-version
+kaccess_la_LIBADD = libkaccess_main.la
kcm_access_la_SOURCES = kcmaccess.cpp
kcm_access_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
@@ -456,37 +460,48 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES)
-kaccess_la_DEPENDENCIES =
-am_kaccess_la_OBJECTS = kaccess.lo main.lo
+kaccess_la_DEPENDENCIES = libkaccess_main.la
+am_kaccess_la_OBJECTS = kaccess_main.lo
#>- kaccess_la_OBJECTS = $(am_kaccess_la_OBJECTS)
-#>+ 4
-kaccess_la_final_OBJECTS = kaccess_la.all_cpp.lo
-kaccess_la_nofinal_OBJECTS = kaccess.lo main.lo
-@KDE_USE_FINAL_FALSE@kaccess_la_OBJECTS = $(kaccess_la_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@kaccess_la_OBJECTS = $(kaccess_la_final_OBJECTS)
+#>+ 1
+kaccess_la_OBJECTS = kaccess_main.lo
kcm_access_la_DEPENDENCIES =
am_kcm_access_la_OBJECTS = kcmaccess.lo
#>- kcm_access_la_OBJECTS = $(am_kcm_access_la_OBJECTS)
#>+ 1
kcm_access_la_OBJECTS = kcmaccess.lo
+libkaccess_main_la_DEPENDENCIES =
+am_libkaccess_main_la_OBJECTS = kaccess.lo main.lo
+#>- libkaccess_main_la_OBJECTS = $(am_libkaccess_main_la_OBJECTS)
+#>+ 4
+libkaccess_main_la_final_OBJECTS = libkaccess_main_la.all_cpp.lo
+libkaccess_main_la_nofinal_OBJECTS = kaccess.lo main.lo
+@KDE_USE_FINAL_FALSE@libkaccess_main_la_OBJECTS = $(libkaccess_main_la_nofinal_OBJECTS)
+@KDE_USE_FINAL_TRUE@libkaccess_main_la_OBJECTS = $(libkaccess_main_la_final_OBJECTS)
bin_PROGRAMS = kaccess$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS)
-am_kaccess_OBJECTS = dummy.$(OBJEXT)
+am_kaccess_OBJECTS = kaccess_main.$(OBJEXT)
#>- kaccess_OBJECTS = $(am_kaccess_OBJECTS)
#>+ 1
-kaccess_OBJECTS = dummy.$(OBJEXT)
-kaccess_DEPENDENCIES = kaccess.la
+kaccess_OBJECTS = kaccess_main.$(OBJEXT)
+kaccess_DEPENDENCIES = libkaccess_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)/kaccess.Plo \
+#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/kaccess.Plo \
+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kaccess_main.Plo \
+#>- @AMDEP_TRUE@ ./$(DEPDIR)/kaccess_main.Po \
#>- @AMDEP_TRUE@ ./$(DEPDIR)/kcmaccess.Plo ./$(DEPDIR)/main.Plo
-#>+ 5
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/kaccess_la.all_cpp.P ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/kaccess.Plo \
+#>+ 9
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/libkaccess_main_la.all_cpp.P ./$(DEPDIR)/kaccess.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaccess_main.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaccess_main.Po \
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmaccess.Plo ./$(DEPDIR)/main.Plo
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = ./$(DEPDIR)/dummy.Po ./$(DEPDIR)/kaccess.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = ./$(DEPDIR)/kaccess.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaccess_main.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kaccess_main.Po \
@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ ./$(DEPDIR)/kcmaccess.Plo ./$(DEPDIR)/main.Plo
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -508,13 +523,13 @@ CXXLD = $(CXX)
CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
DIST_SOURCES = $(kaccess_la_SOURCES) $(kcm_access_la_SOURCES) \
- $(kaccess_SOURCES)
+ $(libkaccess_main_la_SOURCES) $(kaccess_SOURCES)
DATA = $(data_DATA) $(services_DATA)
HEADERS = $(noinst_HEADERS)
DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
-SOURCES = $(kaccess_la_SOURCES) $(kcm_access_la_SOURCES) $(kaccess_SOURCES)
+SOURCES = $(kaccess_la_SOURCES) $(kcm_access_la_SOURCES) $(libkaccess_main_la_SOURCES) $(kaccess_SOURCES)
#>- all: all-am
#>+ 1
@@ -594,6 +609,8 @@ kaccess.la: $(kaccess_la_OBJECTS) $(kacc
@KDE_USE_CLOSURE_TRUE@kcm_access.la: kcm_access.la.closure $(kcm_access_la_OBJECTS) $(kcm_access_la_DEPENDENCIES)
@KDE_USE_CLOSURE_FALSE@kcm_access.la: $(kcm_access_la_OBJECTS) $(kcm_access_la_DEPENDENCIES)
$(CXXLINK) -rpath $(kde_moduledir) $(kcm_access_la_LDFLAGS) $(kcm_access_la_OBJECTS) $(kcm_access_la_LIBADD) $(LIBS)
+libkaccess_main.la: $(libkaccess_main_la_OBJECTS) $(libkaccess_main_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(libdir) $(libkaccess_main_la_LDFLAGS) $(libkaccess_main_la_OBJECTS) $(libkaccess_main_la_LIBADD) $(LIBS)
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
@@ -633,8 +650,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)/kaccess.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kaccess_main.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kaccess_main.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kcmaccess.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@
@@ -775,7 +793,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=kcmaccess.desktop configure.in.in kaccess.desktop kaccess.h
+KDE_DIST=configure.in.in Makefile.in.rej kcmaccess.desktop kaccess.desktop kaccess.h
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@@ -925,9 +943,6 @@ uninstall-am: uninstall-binPROGRAMS unin
messages:
$(XGETTEXT) $(kaccess_la_SOURCES) -o $(podir)/kaccess.pot
$(XGETTEXT) $(kcm_access_la_SOURCES) -o $(podir)/kcmaccess.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:
@@ -972,33 +987,33 @@ force-reedit:
#>+ 11
-kaccess_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaccess.cpp $(srcdir)/main.cpp kaccess.moc
- @echo 'creating kaccess_la.all_cpp.cpp ...'; \
- rm -f kaccess_la.all_cpp.files kaccess_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> kaccess_la.all_cpp.final; \
+libkaccess_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kaccess.cpp $(srcdir)/main.cpp kaccess.moc
+ @echo 'creating libkaccess_main_la.all_cpp.cpp ...'; \
+ rm -f libkaccess_main_la.all_cpp.files libkaccess_main_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libkaccess_main_la.all_cpp.final; \
for file in kaccess.cpp main.cpp ; do \
- echo "#include \"$$file\"" >> kaccess_la.all_cpp.files; \
- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kaccess_la.all_cpp.final; \
+ echo "#include \"$$file\"" >> libkaccess_main_la.all_cpp.files; \
+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkaccess_main_la.all_cpp.final; \
done; \
- cat kaccess_la.all_cpp.final kaccess_la.all_cpp.files > kaccess_la.all_cpp.cpp; \
- rm -f kaccess_la.all_cpp.final kaccess_la.all_cpp.files
+ cat libkaccess_main_la.all_cpp.final libkaccess_main_la.all_cpp.files > libkaccess_main_la.all_cpp.cpp; \
+ rm -f libkaccess_main_la.all_cpp.final libkaccess_main_la.all_cpp.files
#>+ 3
clean-final:
- -rm -f kaccess_la.all_cpp.cpp
+ -rm -f libkaccess_main_la.all_cpp.cpp
#>+ 2
final:
- $(MAKE) kaccess_la_OBJECTS="$(kaccess_la_final_OBJECTS)" all-am
+ $(MAKE) libkaccess_main_la_OBJECTS="$(libkaccess_main_la_final_OBJECTS)" all-am
#>+ 2
final-install:
- $(MAKE) kaccess_la_OBJECTS="$(kaccess_la_final_OBJECTS)" install-am
+ $(MAKE) libkaccess_main_la_OBJECTS="$(libkaccess_main_la_final_OBJECTS)" install-am
#>+ 2
no-final:
- $(MAKE) kaccess_la_OBJECTS="$(kaccess_la_nofinal_OBJECTS)" all-am
+ $(MAKE) libkaccess_main_la_OBJECTS="$(libkaccess_main_la_nofinal_OBJECTS)" all-am
#>+ 2
no-final-install:
- $(MAKE) kaccess_la_OBJECTS="$(kaccess_la_nofinal_OBJECTS)" install-am
+ $(MAKE) libkaccess_main_la_OBJECTS="$(libkaccess_main_la_nofinal_OBJECTS)" install-am
#>+ 3
cvs-clean:
$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
@@ -1008,7 +1023,7 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 5
-kcmaccess.o: kcmaccess.moc
-kaccess.o: kaccess.moc
kcmaccess.lo: kcmaccess.moc
kaccess.lo: kaccess.moc
+kcmaccess.o: kcmaccess.moc
+kaccess.o: kaccess.moc
|
