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
|
$NetBSD: patch-cf,v 1.3 2001/12/03 15:37:19 skrll Exp $
--- klipper/Makefile.in.orig Sat Nov 10 07:58:28 2001
+++ klipper/Makefile.in
@@ -275,18 +275,19 @@
INCLUDES = $(all_includes)
bin_PROGRAMS = klipper
-lib_LTLIBRARIES = klipper.la
+lib_LTLIBRARIES = libklipper_main.la klipper.la
-CLEANFILES = dummy.cpp
-
-klipper_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA)
-klipper_la_SOURCES = main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp
+libklipper_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA)
+libklipper_main_la_SOURCES = main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp
+libklipper_main_la_LDFLAGS = $(all_libraries) -module -avoid-version
+klipper_la_LIBADD = libklipper_main.la
+klipper_la_SOURCES = klipper_main.cpp
#>- klipper_la_METASOURCES = AUTO
klipper_la_LDFLAGS = $(all_libraries) -module -avoid-version
-klipper_LDADD = klipper.la $(LIB_KSYCOCA)
-klipper_SOURCES = dummy.cpp
+klipper_LDADD = libklipper_main.la $(LIB_KSYCOCA)
+klipper_SOURCES = klipper_main.cpp
klipper_LDFLAGS = $(all_libraries) $(KDE_RPATH)
appsdir = $(kde_appsdir)/Utilities
@@ -316,21 +317,27 @@
LIBS = @LIBS@
X_CFLAGS = @X_CFLAGS@
X_LIBS = @X_LIBS@
-klipper_la_DEPENDENCIES =
-#>- klipper_la_OBJECTS = main.lo toplevel.lo urlgrabber.lo configdialog.lo
-#>+ 5
-klipper_la_final_OBJECTS = klipper_la.all_cpp.lo
-klipper_la_nofinal_OBJECTS = main.lo toplevel.lo urlgrabber.lo configdialog.lo \
- klipper_la_meta_unload.lo
-@KDE_USE_FINAL_FALSE@klipper_la_OBJECTS = $(klipper_la_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@klipper_la_OBJECTS = $(klipper_la_final_OBJECTS)
+libklipper_main_la_DEPENDENCIES =
+#>- libklipper_main_la_OBJECTS = main.lo toplevel.lo urlgrabber.lo \
+#>- configdialog.lo
+#>+ 6
+libklipper_main_la_final_OBJECTS = libklipper_main_la.all_cpp.lo
+libklipper_main_la_nofinal_OBJECTS = main.lo toplevel.lo urlgrabber.lo \
+ configdialog.lo \
+ libklipper_main_la_meta_unload.lo
+@KDE_USE_FINAL_FALSE@libklipper_main_la_OBJECTS = $(libklipper_main_la_nofinal_OBJECTS)
+@KDE_USE_FINAL_TRUE@libklipper_main_la_OBJECTS = $(libklipper_main_la_final_OBJECTS)
+klipper_la_DEPENDENCIES = libklipper_main.la
+#>- klipper_la_OBJECTS = klipper_main.lo
+#>+ 1
+klipper_la_OBJECTS = klipper_main.lo
bin_PROGRAMS = klipper$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS)
-#>- klipper_OBJECTS = dummy.$(OBJEXT)
+#>- klipper_OBJECTS = klipper_main.$(OBJEXT)
#>+ 1
-klipper_OBJECTS = dummy.$(OBJEXT)
-klipper_DEPENDENCIES = klipper.la
+klipper_OBJECTS = klipper_main.$(OBJEXT)
+klipper_DEPENDENCIES = libklipper_main.la
CXXFLAGS = @CXXFLAGS@
#>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
#>+ 1
@@ -349,15 +356,15 @@
#>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=klipperrc hi16-app-klipper.png hi32-app-klipper.png klipper-1-2.pl klipperrc.upd klipperbindings.cpp urlgrabber.h toplevel.h klipper.desktop hi48-app-klipper.png configdialog.h
+KDE_DIST=klipperrc hi48-app-klipper.png toplevel.h hi16-app-klipper.png hi32-app-klipper.png klipperbindings.cpp configdialog.h klipper-1-2.pl klipper.desktop klipperrc.upd urlgrabber.h
DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
TAR = tar
GZIP_ENV = --best
-SOURCES = $(klipper_la_SOURCES) $(klipper_SOURCES)
-OBJECTS = $(klipper_la_OBJECTS) $(klipper_OBJECTS)
+SOURCES = $(libklipper_main_la_SOURCES) $(klipper_la_SOURCES) $(klipper_SOURCES)
+OBJECTS = $(libklipper_main_la_OBJECTS) $(klipper_la_OBJECTS) $(klipper_OBJECTS)
#>- all: all-redirect
#>+ 1
@@ -444,6 +451,9 @@
maintainer-clean-libtool:
+libklipper_main.la: $(libklipper_main_la_OBJECTS) $(libklipper_main_la_DEPENDENCIES)
+ $(CXXLINK) -rpath $(libdir) $(libklipper_main_la_LDFLAGS) $(libklipper_main_la_OBJECTS) $(libklipper_main_la_LIBADD) $(LIBS)
+
klipper.la: $(klipper_la_OBJECTS) $(klipper_la_DEPENDENCIES)
$(CXXLINK) -rpath $(libdir) $(klipper_la_LDFLAGS) $(klipper_la_OBJECTS) $(klipper_la_LIBADD) $(LIBS)
@@ -644,7 +654,6 @@
mostlyclean-generic:
clean-generic:
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES)
@@ -706,9 +715,6 @@
messages:
$(XGETTEXT) $(klipper_la_SOURCES) klipperbindings.cpp -o $(podir)/klipper.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:
@@ -753,28 +759,40 @@
#>+ 12
-klipper_la_meta_unload.cpp: urlgrabber.moc toplevel.moc configdialog.moc
- @echo 'creating klipper_la_meta_unload.cpp'
- @-rm -f klipper_la_meta_unload.cpp
+libklipper_main_la_meta_unload.cpp: urlgrabber.moc toplevel.moc configdialog.moc
+ @echo 'creating libklipper_main_la_meta_unload.cpp'
+ @-rm -f libklipper_main_la_meta_unload.cpp
@if test ${kde_qtver} = 2; then \
- echo 'static const char * _metalist_klipper_la[] = {' > klipper_la_meta_unload.cpp ;\
- cat urlgrabber.moc toplevel.moc configdialog.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> klipper_la_meta_unload.cpp ;\
- echo '0};' >> klipper_la_meta_unload.cpp ;\
- echo '#include <kunload.h>' >> klipper_la_meta_unload.cpp ;\
- echo '_UNLOAD(klipper_la)' >> klipper_la_meta_unload.cpp ;\
- else echo > klipper_la_meta_unload.cpp; fi
+ echo 'static const char * _metalist_libklipper_main_la[] = {' > libklipper_main_la_meta_unload.cpp ;\
+ cat urlgrabber.moc toplevel.moc configdialog.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libklipper_main_la_meta_unload.cpp ;\
+ echo '0};' >> libklipper_main_la_meta_unload.cpp ;\
+ echo '#include <kunload.h>' >> libklipper_main_la_meta_unload.cpp ;\
+ echo '_UNLOAD(libklipper_main_la)' >> libklipper_main_la_meta_unload.cpp ;\
+ else echo > libklipper_main_la_meta_unload.cpp; fi
#>+ 3
clean-moc-classes:
- -rm -f klipper_la_meta_unload.cpp
+ -rm -f libklipper_main_la_meta_unload.cpp
+
+#>+ 11
+libklipper_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/urlgrabber.cpp $(srcdir)/configdialog.cpp libklipper_main_la_meta_unload.cpp
+ @echo 'creating libklipper_main_la.all_cpp.cpp ...'; \
+ rm -f libklipper_main_la.all_cpp.files libklipper_main_la.all_cpp.final; \
+ echo "#define KDE_USE_FINAL 1" >> libklipper_main_la.all_cpp.final; \
+ for file in main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp libklipper_main_la_meta_unload.cpp ; do \
+ echo "#include \"$$file\"" >> libklipper_main_la.all_cpp.files; \
+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libklipper_main_la.all_cpp.final; \
+ done; \
+ cat libklipper_main_la.all_cpp.final libklipper_main_la.all_cpp.files > libklipper_main_la.all_cpp.cpp; \
+ rm -f libklipper_main_la.all_cpp.final libklipper_main_la.all_cpp.files
#>+ 11
-klipper_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/urlgrabber.cpp $(srcdir)/configdialog.cpp klipper_la_meta_unload.cpp urlgrabber.moc toplevel.moc configdialog.moc
+klipper_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/klipper_main.cpp urlgrabber.moc toplevel.moc configdialog.moc
@echo 'creating klipper_la.all_cpp.cpp ...'; \
rm -f klipper_la.all_cpp.files klipper_la.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> klipper_la.all_cpp.final; \
- for file in main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp klipper_la_meta_unload.cpp ; do \
+ for file in klipper_main.cpp ; do \
echo "#include \"$$file\"" >> klipper_la.all_cpp.files; \
test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> klipper_la.all_cpp.final; \
done; \
@@ -782,11 +800,11 @@
rm -f klipper_la.all_cpp.final klipper_la.all_cpp.files
#>+ 11
-klipper.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp
+klipper.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/klipper_main.cpp
@echo 'creating klipper.all_cpp.cpp ...'; \
rm -f klipper.all_cpp.files klipper.all_cpp.final; \
echo "#define KDE_USE_FINAL 1" >> klipper.all_cpp.final; \
- for file in dummy.cpp ; do \
+ for file in klipper_main.cpp ; do \
echo "#include \"$$file\"" >> klipper.all_cpp.files; \
test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> klipper.all_cpp.final; \
done; \
@@ -795,20 +813,20 @@
#>+ 3
clean-final:
- -rm -f klipper_la.all_cpp.cpp klipper.all_cpp.cpp
+ -rm -f libklipper_main_la.all_cpp.cpp klipper_la.all_cpp.cpp klipper.all_cpp.cpp
#>+ 2
final:
- $(MAKE) klipper_la_OBJECTS="$(klipper_la_final_OBJECTS)" all-am
+ $(MAKE) libklipper_main_la_OBJECTS="$(libklipper_main_la_final_OBJECTS)" all-am
#>+ 2
final-install:
- $(MAKE) klipper_la_OBJECTS="$(klipper_la_final_OBJECTS)" install-am
+ $(MAKE) libklipper_main_la_OBJECTS="$(libklipper_main_la_final_OBJECTS)" install-am
#>+ 2
no-final:
- $(MAKE) klipper_la_OBJECTS="$(klipper_la_nofinal_OBJECTS)" all-am
+ $(MAKE) libklipper_main_la_OBJECTS="$(libklipper_main_la_nofinal_OBJECTS)" all-am
#>+ 2
no-final-install:
- $(MAKE) klipper_la_OBJECTS="$(klipper_la_nofinal_OBJECTS)" install-am
+ $(MAKE) libklipper_main_la_OBJECTS="$(libklipper_main_la_nofinal_OBJECTS)" install-am
#>+ 3
cvs-clean:
$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean
|
