summaryrefslogtreecommitdiff
path: root/x11/kdebase2/patches/patch-cp
blob: 3f91c7a71679438ec0b432d85849e56ebd92941c (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
$NetBSD: patch-cp,v 1.1 2001/10/15 22:46:06 skrll Exp $

--- konqueror/client/Makefile.in.orig	Sat Sep  8 01:36:39 2001
+++ konqueror/client/Makefile.in
@@ -277 +277 @@
-lib_LTLIBRARIES = kfmclient.la
+lib_LTLIBRARIES = libkfmclient_main.la kfmclient.la
@@ -280,3 +280,3 @@
-kfmclient_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kfmclient_la_LIBADD = $(LIB_KFILE)
-#>- kfmclient_la_SOURCES = kfmclient.cc KonquerorIface.stub KDesktopIface.stub
+libkfmclient_main_la_LDFLAGS = $(all_libraries)
+libkfmclient_main_la_LIBADD = $(LIB_KFILE)
+#>- libkfmclient_main_la_SOURCES = kfmclient.cc KonquerorIface.stub KDesktopIface.stub
@@ -284 +284,5 @@
-kfmclient_la_SOURCES=kfmclient.cc   KonquerorIface_stub.cc KDesktopIface_stub.cc
+libkfmclient_main_la_SOURCES=kfmclient.cc   KonquerorIface_stub.cc KDesktopIface_stub.cc
+
+kfmclient_la_LDFLAGS = $(all_libraries) -module -avoid-version
+kfmclient_la_LIBADD = libkfmclient_main.la
+kfmclient_la_SOURCES = kfmclient_main.cc
@@ -292 +296 @@
-kfmclient_SOURCES = dummy.cc
+kfmclient_SOURCES = kfmclient_main.cc
@@ -294 +298 @@
-kfmclient_LDADD = kfmclient.la
+kfmclient_LDADD = libkfmclient_main.la
@@ -307,2 +311,2 @@
-kfmclient_la_DEPENDENCIES = 
-#>- kfmclient_la_OBJECTS =  kfmclient.lo
+libkfmclient_main_la_DEPENDENCIES = 
+#>- libkfmclient_main_la_OBJECTS =  kfmclient.lo
@@ -310,5 +314,9 @@
-kfmclient_la_final_OBJECTS = kfmclient_la.all_cc.lo 
-kfmclient_la_nofinal_OBJECTS = kfmclient.lo KonquerorIface_stub.lo KDesktopIface_stub.lo \
-kfmclient_la_meta_unload.lo 
-@KDE_USE_FINAL_FALSE@kfmclient_la_OBJECTS = $(kfmclient_la_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@kfmclient_la_OBJECTS = $(kfmclient_la_final_OBJECTS)
+libkfmclient_main_la_final_OBJECTS = libkfmclient_main_la.all_cc.lo 
+libkfmclient_main_la_nofinal_OBJECTS = kfmclient.lo KonquerorIface_stub.lo KDesktopIface_stub.lo \
+libkfmclient_main_la_meta_unload.lo 
+@KDE_USE_FINAL_FALSE@libkfmclient_main_la_OBJECTS = $(libkfmclient_main_la_nofinal_OBJECTS)
+@KDE_USE_FINAL_TRUE@libkfmclient_main_la_OBJECTS = $(libkfmclient_main_la_final_OBJECTS)
+kfmclient_la_DEPENDENCIES =  libkfmclient_main.la
+#>- kfmclient_la_OBJECTS =  kfmclient_main.lo
+#>+ 1
+kfmclient_la_OBJECTS = kfmclient_main.lo
@@ -318 +326 @@
-#>- kfmclient_OBJECTS =  dummy.$(OBJEXT)
+#>- kfmclient_OBJECTS =  kfmclient_main.$(OBJEXT)
@@ -320,2 +328,2 @@
-kfmclient_OBJECTS = dummy.$(OBJEXT)
-kfmclient_DEPENDENCIES =  kfmclient.la
+kfmclient_OBJECTS = kfmclient_main.$(OBJEXT)
+kfmclient_DEPENDENCIES =  libkfmclient_main.la
@@ -342,2 +350,2 @@
-SOURCES = $(kfmclient_la_SOURCES) $(kfmclient_SOURCES)
-OBJECTS = $(kfmclient_la_OBJECTS) $(kfmclient_OBJECTS)
+SOURCES = $(libkfmclient_main_la_SOURCES) $(kfmclient_la_SOURCES) $(kfmclient_SOURCES)
+OBJECTS = $(libkfmclient_main_la_OBJECTS) $(kfmclient_la_OBJECTS) $(kfmclient_OBJECTS)
@@ -429,0 +438,3 @@
+libkfmclient_main.la: $(libkfmclient_main_la_OBJECTS) $(libkfmclient_main_la_DEPENDENCIES)
+	$(CXXLINK) -rpath $(libdir) $(libkfmclient_main_la_LDFLAGS) $(libkfmclient_main_la_OBJECTS) $(libkfmclient_main_la_LIBADD) $(LIBS)
+
@@ -502,11 +512,0 @@
-#>- 	@for file in $(DISTFILES); do \
-#>- 	  d=$(srcdir); \
-#>- 	  if test -d $$d/$$file; then \
-#>- 	    cp -pr $$/$$file $(distdir)/$$file; \
-#>- 	  else \
-#>- 	    test -f $(distdir)/$$file \
-#>- 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-#>- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-#>- 	  fi; \
-#>- 	done
-#>+ 10
@@ -609,3 +608,0 @@
-dummy.cc:
-	echo > dummy.cc
-
@@ -653,8 +650,8 @@
-kfmclient_la_meta_unload.cc:  kfmclient.moc
-	@echo 'creating kfmclient_la_meta_unload.cc'
-	@-rm -f kfmclient_la_meta_unload.cc
-	@echo 'static const char * _metalist_kfmclient_la[] = {' > kfmclient_la_meta_unload.cc
-	@cat  kfmclient.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kfmclient_la_meta_unload.cc
-	@echo '0};' >> kfmclient_la_meta_unload.cc
-	@echo '#include <kunload.h>' >> kfmclient_la_meta_unload.cc
-	@echo '_UNLOAD(kfmclient_la)' >> kfmclient_la_meta_unload.cc
+libkfmclient_main_la_meta_unload.cc:  kfmclient.moc
+	@echo 'creating libkfmclient_main_la_meta_unload.cc'
+	@-rm -f libkfmclient_main_la_meta_unload.cc
+	@echo 'static const char * _metalist_libkfmclient_main_la[] = {' > libkfmclient_main_la_meta_unload.cc
+	@cat  kfmclient.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkfmclient_main_la_meta_unload.cc
+	@echo '0};' >> libkfmclient_main_la_meta_unload.cc
+	@echo '#include <kunload.h>' >> libkfmclient_main_la_meta_unload.cc
+	@echo '_UNLOAD(libkfmclient_main_la)' >> libkfmclient_main_la_meta_unload.cc
@@ -665 +662,13 @@
-	-rm -f  kfmclient_la_meta_unload.cc
+	-rm -f  libkfmclient_main_la_meta_unload.cc
+
+#>+ 11
+libkfmclient_main_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kfmclient.cc KonquerorIface_stub.cc KDesktopIface_stub.cc libkfmclient_main_la_meta_unload.cc   kfmclient.moc 
+	@echo 'creating libkfmclient_main_la.all_cc.cc ...'; \
+	rm -f libkfmclient_main_la.all_cc.files libkfmclient_main_la.all_cc.final; \
+	echo "#define KDE_USE_FINAL 1" >> libkfmclient_main_la.all_cc.final; \
+	for file in kfmclient.cc KonquerorIface_stub.cc KDesktopIface_stub.cc libkfmclient_main_la_meta_unload.cc ; do \
+	  echo "#include \"$$file\"" >> libkfmclient_main_la.all_cc.files; \
+	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkfmclient_main_la.all_cc.final; \
+	done; \
+	cat libkfmclient_main_la.all_cc.final libkfmclient_main_la.all_cc.files  > libkfmclient_main_la.all_cc.cc; \
+	rm -f libkfmclient_main_la.all_cc.final libkfmclient_main_la.all_cc.files
@@ -668 +677 @@
-kfmclient_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kfmclient.cc KonquerorIface_stub.cc KDesktopIface_stub.cc kfmclient_la_meta_unload.cc   kfmclient.moc 
+kfmclient_la.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kfmclient_main.cc  
@@ -672 +681 @@
-	for file in kfmclient.cc KonquerorIface_stub.cc KDesktopIface_stub.cc kfmclient_la_meta_unload.cc ; do \
+	for file in kfmclient_main.cc ; do \
@@ -680 +689 @@
-kfmclient.all_cc.cc: $(srcdir)/Makefile.in dummy.cc  
+kfmclient.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/kfmclient_main.cc  
@@ -684 +693 @@
-	for file in dummy.cc ; do \
+	for file in kfmclient_main.cc ; do \
@@ -693 +702 @@
-	-rm -f kfmclient_la.all_cc.cc kfmclient.all_cc.cc
+	-rm -f libkfmclient_main_la.all_cc.cc kfmclient_la.all_cc.cc kfmclient.all_cc.cc
@@ -697 +706 @@
-	$(MAKE) kfmclient_la_OBJECTS="$(kfmclient_la_final_OBJECTS)" all-am
+	$(MAKE) libkfmclient_main_la_OBJECTS="$(libkfmclient_main_la_final_OBJECTS)" all-am
@@ -700 +709 @@
-	$(MAKE) kfmclient_la_OBJECTS="$(kfmclient_la_nofinal_OBJECTS)" all-am
+	$(MAKE) libkfmclient_main_la_OBJECTS="$(libkfmclient_main_la_nofinal_OBJECTS)" all-am