summaryrefslogtreecommitdiff
path: root/x11/kdebase3/patches/patch-bs
blob: d9f54bd63637eadc12da5d8fc9cf6de18a0aed6e (plain)
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
$NetBSD: patch-bs,v 1.5 2003/05/22 02:42:49 markd Exp $

--- kicker/proxy/Makefile.in.orig	Tue May 13 23:07:58 2003
+++ kicker/proxy/Makefile.in
@@ -422,27 +422,35 @@ x_includes = @x_includes@
 x_libraries = @x_libraries@
 INCLUDES = -I$(srcdir)/../share $(all_includes)
 
-CLEANFILES = dummy.cpp
-
 bin_PROGRAMS = appletproxy extensionproxy
-lib_LTLIBRARIES = appletproxy.la extensionproxy.la
+lib_LTLIBRARIES = libappletproxy_main.la appletproxy.la \
+	libextensionproxy_main.la extensionproxy.la
+
+
+libappletproxy_main_la_LIBADD = $(LIB_KDEUI) ../share/libkickermain.la
+libappletproxy_main_la_SOURCES = appletproxy.cpp
+#>- libappletproxy_main_la_METASOURCES = appletproxy.moc
+libappletproxy_main_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 
-appletproxy_la_LIBADD = $(LIB_KDEUI) ../share/libkickermain.la
-appletproxy_la_SOURCES = appletproxy.cpp
-#>- appletproxy_la_METASOURCES = appletproxy.moc
+appletproxy_la_LIBADD = libappletproxy_main.la
+appletproxy_la_SOURCES = appletproxy_main.cpp
 appletproxy_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version
 
-appletproxy_LDADD = appletproxy.la
-appletproxy_SOURCES = dummy.cpp
+appletproxy_LDADD = libappletproxy_main.la
+appletproxy_SOURCES = appletproxy_main.cpp
 appletproxy_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 
-extensionproxy_la_LIBADD = $(LIB_KDEUI) ../share/libkickermain.la
-extensionproxy_la_SOURCES = extensionproxy.cpp
-#>- extensionproxy_la_METASOURCES = extensionproxy.moc
+libextensionproxy_main_la_LIBADD = $(LIB_KDEUI) ../share/libkickermain.la
+libextensionproxy_main_la_SOURCES = extensionproxy.cpp
+#>- libextensionproxy_main_la_METASOURCES = extensionproxy.moc
+libextensionproxy_main_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+
+extensionproxy_la_LIBADD = libextensionproxy_main.la
+extensionproxy_la_SOURCES = extensionproxy_main.cpp
 extensionproxy_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version
 
-extensionproxy_LDADD = extensionproxy.la
-extensionproxy_SOURCES = dummy.cpp
+extensionproxy_LDADD = libextensionproxy_main.la
+extensionproxy_SOURCES = extensionproxy_main.cpp
 extensionproxy_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 
 noinst_HEADERS = appletproxy.h extensionproxy.h
@@ -453,38 +461,57 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 LTLIBRARIES = $(lib_LTLIBRARIES)
 
-appletproxy_la_DEPENDENCIES = ../share/libkickermain.la
-am_appletproxy_la_OBJECTS = appletproxy.lo
+appletproxy_la_DEPENDENCIES = libappletproxy_main.la
+am_appletproxy_la_OBJECTS = appletproxy_main.lo
 #>- appletproxy_la_OBJECTS = $(am_appletproxy_la_OBJECTS)
 #>+ 1
-appletproxy_la_OBJECTS = appletproxy.lo
-extensionproxy_la_DEPENDENCIES = ../share/libkickermain.la
-am_extensionproxy_la_OBJECTS = extensionproxy.lo
+appletproxy_la_OBJECTS = appletproxy_main.lo
+extensionproxy_la_DEPENDENCIES = libextensionproxy_main.la
+am_extensionproxy_la_OBJECTS = extensionproxy_main.lo
 #>- extensionproxy_la_OBJECTS = $(am_extensionproxy_la_OBJECTS)
 #>+ 1
-extensionproxy_la_OBJECTS = extensionproxy.lo
+extensionproxy_la_OBJECTS = extensionproxy_main.lo
+libappletproxy_main_la_DEPENDENCIES = ../share/libkickermain.la
+am_libappletproxy_main_la_OBJECTS = appletproxy.lo
+#>- libappletproxy_main_la_OBJECTS = $(am_libappletproxy_main_la_OBJECTS)
+#>+ 1
+libappletproxy_main_la_OBJECTS = appletproxy.lo
+libextensionproxy_main_la_DEPENDENCIES = ../share/libkickermain.la
+am_libextensionproxy_main_la_OBJECTS = extensionproxy.lo
+#>- libextensionproxy_main_la_OBJECTS = \
+#>- 	$(am_libextensionproxy_main_la_OBJECTS)
+#>+ 1
+libextensionproxy_main_la_OBJECTS = extensionproxy.lo
 bin_PROGRAMS = appletproxy$(EXEEXT) extensionproxy$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS)
 
-am_appletproxy_OBJECTS = dummy.$(OBJEXT)
+am_appletproxy_OBJECTS = appletproxy_main.$(OBJEXT)
 #>- appletproxy_OBJECTS = $(am_appletproxy_OBJECTS)
 #>+ 1
-appletproxy_OBJECTS = dummy.$(OBJEXT)
-appletproxy_DEPENDENCIES = appletproxy.la
-am_extensionproxy_OBJECTS = dummy.$(OBJEXT)
+appletproxy_OBJECTS = appletproxy_main.$(OBJEXT)
+appletproxy_DEPENDENCIES = libappletproxy_main.la
+am_extensionproxy_OBJECTS = extensionproxy_main.$(OBJEXT)
 #>- extensionproxy_OBJECTS = $(am_extensionproxy_OBJECTS)
 #>+ 1
-extensionproxy_OBJECTS = dummy.$(OBJEXT)
-extensionproxy_DEPENDENCIES = extensionproxy.la
+extensionproxy_OBJECTS = extensionproxy_main.$(OBJEXT)
+extensionproxy_DEPENDENCIES = libextensionproxy_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)/appletproxy.Plo ./$(DEPDIR)/dummy.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/extensionproxy.Plo
-#>+ 3
-@AMDEP_TRUE@DEP_FILES =   ./$(DEPDIR)/appletproxy.Plo ./$(DEPDIR)/dummy.Po \
-@AMDEP_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/extensionproxy.Plo
+#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/appletproxy.Plo \
+#>- @AMDEP_TRUE@	./$(DEPDIR)/appletproxy_main.Plo \
+#>- @AMDEP_TRUE@	./$(DEPDIR)/appletproxy_main.Po \
+#>- @AMDEP_TRUE@	./$(DEPDIR)/extensionproxy.Plo \
+#>- @AMDEP_TRUE@	./$(DEPDIR)/extensionproxy_main.Plo \
+#>- @AMDEP_TRUE@	./$(DEPDIR)/extensionproxy_main.Po
+#>+ 7
+@AMDEP_TRUE@DEP_FILES =   ./$(DEPDIR)/appletproxy.Plo \
+@AMDEP_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/appletproxy_main.Plo \
+@AMDEP_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/appletproxy_main.Po \
+@AMDEP_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/extensionproxy.Plo \
+@AMDEP_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/extensionproxy_main.Plo \
+@AMDEP_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/extensionproxy_main.Po
 
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 #>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -505,11 +532,13 @@ CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 DIST_SOURCES = $(appletproxy_la_SOURCES) $(extensionproxy_la_SOURCES) \
-	$(appletproxy_SOURCES) $(extensionproxy_SOURCES)
+	$(libappletproxy_main_la_SOURCES) \
+	$(libextensionproxy_main_la_SOURCES) $(appletproxy_SOURCES) \
+	$(extensionproxy_SOURCES)
 HEADERS = $(noinst_HEADERS)
 
 DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
-SOURCES = $(appletproxy_la_SOURCES) $(extensionproxy_la_SOURCES) $(appletproxy_SOURCES) $(extensionproxy_SOURCES)
+SOURCES = $(appletproxy_la_SOURCES) $(extensionproxy_la_SOURCES) $(libappletproxy_main_la_SOURCES) $(libextensionproxy_main_la_SOURCES) $(appletproxy_SOURCES) $(extensionproxy_SOURCES)
 
 #>- all: all-am
 #>+ 1
@@ -558,6 +587,10 @@ appletproxy.la: $(appletproxy_la_OBJECTS
 	$(CXXLINK) -rpath $(libdir) $(appletproxy_la_LDFLAGS) $(appletproxy_la_OBJECTS) $(appletproxy_la_LIBADD) $(LIBS)
 extensionproxy.la: $(extensionproxy_la_OBJECTS) $(extensionproxy_la_DEPENDENCIES) 
 	$(CXXLINK) -rpath $(libdir) $(extensionproxy_la_LDFLAGS) $(extensionproxy_la_OBJECTS) $(extensionproxy_la_LIBADD) $(LIBS)
+libappletproxy_main.la: $(libappletproxy_main_la_OBJECTS) $(libappletproxy_main_la_DEPENDENCIES) 
+	$(CXXLINK) -rpath $(libdir) $(libappletproxy_main_la_LDFLAGS) $(libappletproxy_main_la_OBJECTS) $(libappletproxy_main_la_LIBADD) $(LIBS)
+libextensionproxy_main.la: $(libextensionproxy_main_la_OBJECTS) $(libextensionproxy_main_la_DEPENDENCIES) 
+	$(CXXLINK) -rpath $(libdir) $(libextensionproxy_main_la_LDFLAGS) $(libextensionproxy_main_la_OBJECTS) $(libextensionproxy_main_la_LIBADD) $(LIBS)
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
@@ -601,8 +634,11 @@ distclean-compile:
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/appletproxy.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/appletproxy_main.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/appletproxy_main.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/extensionproxy.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/extensionproxy_main.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/extensionproxy_main.Po@am__quote@
 
 distclean-depend:
 	-rm -rf ./$(DEPDIR)
@@ -761,7 +797,6 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-rm -f Makefile $(CONFIG_CLEAN_FILES)
@@ -840,9 +875,6 @@ uninstall-am: uninstall-binPROGRAMS unin
 messages:
 	$(XGETTEXT) appletproxy.cpp -o $(podir)/appletproxy.pot
 	$(XGETTEXT) extensionproxy.cpp -o $(podir)/extensionproxy.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:
@@ -890,7 +922,7 @@ kde-rpo-clean:
 	-rm -f *.rpo
 
 #>+ 5
-appletproxy.lo: appletproxy.moc 
 appletproxy.o: appletproxy.moc 
+appletproxy.lo: appletproxy.moc 
 extensionproxy.o: extensionproxy.moc 
 extensionproxy.lo: extensionproxy.moc