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
|
$NetBSD: patch-bz,v 1.4 2003/01/02 09:12:34 skrll Exp $
--- klipper/Makefile.in.orig Fri Dec 27 18:19:11 2002
+++ klipper/Makefile.in
@@ -289,24 +289,26 @@ x_libraries = @x_libraries@
INCLUDES = $(all_includes)
bin_PROGRAMS = klipper
-lib_LTLIBRARIES = klipper.la
+lib_LTLIBRARIES = libklipper_main.la klipper.la
kde_module_LTLIBRARIES = klipper_panelapplet.la
-CLEANFILES = dummy.cpp
-
-klipper_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA)
-#>- klipper_la_SOURCES = main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp toplevel.skel
+libklipper_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA)
+#>- libklipper_main_la_SOURCES = main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp toplevel.skel
#>+ 1
-klipper_la_SOURCES=main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp toplevel_skel.cpp
+libklipper_main_la_SOURCES=main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp toplevel_skel.cpp
+
+#>- libklipper_main_la_METASOURCES = AUTO
+libklipper_main_la_LDFLAGS = $(all_libraries)
-#>- klipper_la_METASOURCES = AUTO
+klipper_la_LIBADD = libklipper_main.la
+klipper_la_SOURCES = klipper_main.cpp
klipper_la_LDFLAGS = $(all_libraries) -module -avoid-version
-klipper_LDADD = klipper.la $(LIB_KSYCOCA)
-klipper_SOURCES = dummy.cpp
+klipper_LDADD = libklipper_main.la
+klipper_SOURCES = klipper_main.cpp
klipper_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-klipper_panelapplet_la_LIBADD = klipper.la
+klipper_panelapplet_la_LIBADD = libklipper_main.la
klipper_panelapplet_la_SOURCES = applet.cpp
klipper_panelapplet_la_LDFLAGS = $(all_libraries) -module -avoid-version
@@ -332,29 +334,34 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES)
-klipper_la_DEPENDENCIES =
-am_klipper_la_OBJECTS = main.lo toplevel.lo urlgrabber.lo \
- configdialog.lo
+klipper_la_DEPENDENCIES = libklipper_main.la
+am_klipper_la_OBJECTS = klipper_main.lo
#>- klipper_la_OBJECTS = $(am_klipper_la_OBJECTS)
-#>+ 5
-klipper_la_final_OBJECTS = klipper_la.all_cpp.lo
-klipper_la_nofinal_OBJECTS = main.lo toplevel.lo urlgrabber.lo \
- configdialog.lo toplevel_skel.lo
-@KDE_USE_FINAL_FALSE@klipper_la_OBJECTS = $(klipper_la_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@klipper_la_OBJECTS = $(klipper_la_final_OBJECTS)
-klipper_panelapplet_la_DEPENDENCIES = klipper.la
+#>+ 1
+klipper_la_OBJECTS = klipper_main.lo
+klipper_panelapplet_la_DEPENDENCIES = libklipper_main.la
am_klipper_panelapplet_la_OBJECTS = applet.lo
#>- klipper_panelapplet_la_OBJECTS = $(am_klipper_panelapplet_la_OBJECTS)
#>+ 1
klipper_panelapplet_la_OBJECTS = applet.lo
+libklipper_main_la_DEPENDENCIES =
+am_libklipper_main_la_OBJECTS = main.lo toplevel.lo urlgrabber.lo \
+ configdialog.lo
+#>- libklipper_main_la_OBJECTS = $(am_libklipper_main_la_OBJECTS)
+#>+ 5
+libklipper_main_la_final_OBJECTS = libklipper_main_la.all_cpp.lo
+libklipper_main_la_nofinal_OBJECTS = main.lo toplevel.lo urlgrabber.lo \
+ configdialog.lo toplevel_skel.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)
bin_PROGRAMS = klipper$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS)
-am_klipper_OBJECTS = dummy.$(OBJEXT)
+am_klipper_OBJECTS = klipper_main.$(OBJEXT)
#>- klipper_OBJECTS = $(am_klipper_OBJECTS)
#>+ 1
-klipper_OBJECTS = dummy.$(OBJEXT)
-klipper_DEPENDENCIES = klipper.la
+klipper_OBJECTS = klipper_main.$(OBJEXT)
+klipper_DEPENDENCIES = libklipper_main.la
DEFS = @DEFS@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
@@ -363,14 +370,17 @@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
#>- @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/applet.Plo $(DEPDIR)/configdialog.Plo \
-#>- @AMDEP_TRUE@ $(DEPDIR)/dummy.Po $(DEPDIR)/main.Plo \
+#>- @AMDEP_TRUE@ $(DEPDIR)/klipper_main.Plo \
+#>- @AMDEP_TRUE@ $(DEPDIR)/klipper_main.Po $(DEPDIR)/main.Plo \
#>- @AMDEP_TRUE@ $(DEPDIR)/toplevel.Plo $(DEPDIR)/urlgrabber.Plo
-#>+ 7
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/toplevel_skel.P $(DEPDIR)/klipper_la.all_cpp.P $(DEPDIR)/applet.Plo $(DEPDIR)/configdialog.Plo \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/dummy.Po $(DEPDIR)/main.Plo \
+#>+ 9
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES = $(DEPDIR)/toplevel_skel.P $(DEPDIR)/libklipper_main_la.all_cpp.P $(DEPDIR)/applet.Plo $(DEPDIR)/configdialog.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/klipper_main.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/klipper_main.Po $(DEPDIR)/main.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@ @AMDEP_TRUE@ $(DEPDIR)/toplevel.Plo $(DEPDIR)/urlgrabber.Plo
@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES = $(DEPDIR)/toplevel_skel.P $(DEPDIR)/applet.Plo $(DEPDIR)/configdialog.Plo \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/dummy.Po $(DEPDIR)/main.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/klipper_main.Plo \
+@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/klipper_main.Po $(DEPDIR)/main.Plo \
@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@ @AMDEP_TRUE@ $(DEPDIR)/toplevel.Plo $(DEPDIR)/urlgrabber.Plo
#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -393,12 +403,12 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C
$(AM_LDFLAGS) $(LDFLAGS) -o $@
CXXFLAGS = @CXXFLAGS@
DIST_SOURCES = $(klipper_la_SOURCES) $(klipper_panelapplet_la_SOURCES) \
- $(klipper_SOURCES)
+ $(libklipper_main_la_SOURCES) $(klipper_SOURCES)
DATA = $(appl_DATA) $(apps_DATA) $(autostart_DATA) $(dockicon_DATA) \
$(update_DATA)
DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(klipper_la_SOURCES) $(klipper_panelapplet_la_SOURCES) $(klipper_SOURCES)
+SOURCES = $(klipper_la_SOURCES) $(klipper_panelapplet_la_SOURCES) $(libklipper_main_la_SOURCES) $(klipper_SOURCES)
#>- all: all-am
#>+ 1
@@ -468,6 +478,8 @@ klipper.la: $(klipper_la_OBJECTS) $(klip
$(CXXLINK) -rpath $(libdir) $(klipper_la_LDFLAGS) $(klipper_la_OBJECTS) $(klipper_la_LIBADD) $(LIBS)
klipper_panelapplet.la: $(klipper_panelapplet_la_OBJECTS) $(klipper_panelapplet_la_DEPENDENCIES)
$(CXXLINK) -rpath $(kde_moduledir) $(klipper_panelapplet_la_LDFLAGS) $(klipper_panelapplet_la_OBJECTS) $(klipper_panelapplet_la_LIBADD) $(LIBS)
+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)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(bindir)
@@ -504,7 +516,8 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/applet.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/configdialog.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/klipper_main.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/klipper_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@
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/urlgrabber.Plo@am__quote@
@@ -651,7 +664,7 @@ distclean-tags:
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 4
-KDE_DIST=toplevel.h hi48-app-klipper.png klipperrc.desktop klipperbindings.cpp klipper.desktop hi32-app-klipper.png urlgrabber.h hi16-app-klipper.png klipperrc.upd klipper_dock.png configdialog.h klipper-1-2.pl version.h applet.h
+KDE_DIST=applet.h klipper_dock.png hi48-app-klipper.png toplevel.h hi16-app-klipper.png hi32-app-klipper.png klipperbindings.cpp version.h configdialog.h klipper-1-2.pl klipper.desktop klipperrc.upd urlgrabber.h klipperrc.desktop
DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@@ -700,7 +713,6 @@ install-strip:
mostlyclean-generic:
clean-generic:
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
@@ -814,10 +826,6 @@ toplevel_skel.cpp: toplevel.kidl
$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub toplevel.kidl
#>+ 3
-configdialog.moc: $(srcdir)/configdialog.h
- $(MOC) $(srcdir)/configdialog.h -o configdialog.moc
-
-#>+ 3
urlgrabber.moc: $(srcdir)/urlgrabber.h
$(MOC) $(srcdir)/urlgrabber.h -o urlgrabber.moc
@@ -830,8 +838,12 @@ applet.moc: $(srcdir)/applet.h
$(MOC) $(srcdir)/applet.h -o applet.moc
#>+ 3
+configdialog.moc: $(srcdir)/configdialog.h
+ $(MOC) $(srcdir)/configdialog.h -o configdialog.moc
+
+#>+ 3
clean-metasources:
- -rm -f configdialog.moc urlgrabber.moc toplevel.moc applet.moc
+ -rm -f urlgrabber.moc toplevel.moc applet.moc configdialog.moc
#>+ 4
clean-idl:
@@ -863,33 +875,33 @@ force-reedit:
#>+ 11
-klipper_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/urlgrabber.cpp $(srcdir)/configdialog.cpp toplevel_skel.cpp urlgrabber.moc configdialog.moc toplevel.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; \
+libklipper_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/urlgrabber.cpp $(srcdir)/configdialog.cpp toplevel_skel.cpp urlgrabber.moc toplevel.moc configdialog.moc
+ @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 toplevel_skel.cpp ; do \
- echo "#include \"$$file\"" >> klipper_la.all_cpp.files; \
- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> klipper_la.all_cpp.final; \
+ 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 klipper_la.all_cpp.final klipper_la.all_cpp.files > klipper_la.all_cpp.cpp; \
- rm -f klipper_la.all_cpp.final klipper_la.all_cpp.files
+ 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
#>+ 3
clean-final:
- -rm -f klipper_la.all_cpp.cpp
+ -rm -f libklipper_main_la.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) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
@@ -899,11 +911,11 @@ kde-rpo-clean:
-rm -f *.rpo
#>+ 9
-toplevel.lo: toplevel.moc
+urlgrabber.o: urlgrabber.moc
+toplevel.o: toplevel.moc
urlgrabber.lo: urlgrabber.moc
-configdialog.lo: configdialog.moc
+toplevel.lo: toplevel.moc
applet.lo: applet.moc
applet.o: applet.moc
+configdialog.lo: configdialog.moc
configdialog.o: configdialog.moc
-urlgrabber.o: urlgrabber.moc
-toplevel.o: toplevel.moc
|