summaryrefslogtreecommitdiff
path: root/x11/kdebase2/patches/patch-ew
blob: 82e2ea7ded17bd4710f0ee4e36a825f44866d3a0 (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
$NetBSD: patch-ew,v 1.1 2001/10/15 22:46:11 skrll Exp $

--- legacyimport/Makefile.in.orig	Sat Sep  8 01:36:51 2001
+++ legacyimport/Makefile.in
@@ -277 +277 @@
-lib_LTLIBRARIES = klegacyimport.la
+lib_LTLIBRARIES = libklegacyimport_main.la klegacyimport.la
@@ -279,2 +279,6 @@
-klegacyimport_la_SOURCES = legacyimport.cpp
-klegacyimport_la_LIBADD = $(LIB_KDEUI) $(LIB_KFILE)
+libklegacyimport_main_la_SOURCES = legacyimport.cpp
+libklegacyimport_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KFILE)
+libklegacyimport_main_la_LDFLAGS = $(all_libraries)
+
+klegacyimport_la_SOURCES = klegacyimport_main.cpp
+klegacyimport_la_LIBADD = libklegacyimport_main.la
@@ -283,2 +287,2 @@
-klegacyimport_SOURCES = dummy.cpp
-klegacyimport_LDADD = klegacyimport.la
+klegacyimport_SOURCES = klegacyimport_main.cpp
+klegacyimport_LDADD = libklegacyimport_main.la
@@ -306,2 +310,2 @@
-klegacyimport_la_DEPENDENCIES = 
-#>- klegacyimport_la_OBJECTS =  legacyimport.lo
+libklegacyimport_main_la_DEPENDENCIES = 
+#>- libklegacyimport_main_la_OBJECTS =  legacyimport.lo
@@ -309,5 +313,9 @@
-klegacyimport_la_final_OBJECTS = klegacyimport_la.all_cpp.lo 
-klegacyimport_la_nofinal_OBJECTS = legacyimport.lo \
-klegacyimport_la_meta_unload.lo 
-@KDE_USE_FINAL_FALSE@klegacyimport_la_OBJECTS = $(klegacyimport_la_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@klegacyimport_la_OBJECTS = $(klegacyimport_la_final_OBJECTS)
+libklegacyimport_main_la_final_OBJECTS = libklegacyimport_main_la.all_cpp.lo 
+libklegacyimport_main_la_nofinal_OBJECTS = legacyimport.lo \
+libklegacyimport_main_la_meta_unload.lo 
+@KDE_USE_FINAL_FALSE@libklegacyimport_main_la_OBJECTS = $(libklegacyimport_main_la_nofinal_OBJECTS)
+@KDE_USE_FINAL_TRUE@libklegacyimport_main_la_OBJECTS = $(libklegacyimport_main_la_final_OBJECTS)
+klegacyimport_la_DEPENDENCIES =  libklegacyimport_main.la
+#>- klegacyimport_la_OBJECTS =  klegacyimport_main.lo
+#>+ 1
+klegacyimport_la_OBJECTS = klegacyimport_main.lo
@@ -317 +325 @@
-#>- klegacyimport_OBJECTS =  dummy.$(OBJEXT)
+#>- klegacyimport_OBJECTS =  klegacyimport_main.$(OBJEXT)
@@ -319,2 +327,2 @@
-klegacyimport_OBJECTS = dummy.$(OBJEXT)
-klegacyimport_DEPENDENCIES =  klegacyimport.la
+klegacyimport_OBJECTS = klegacyimport_main.$(OBJEXT)
+klegacyimport_DEPENDENCIES =  libklegacyimport_main.la
@@ -341 +349 @@
-KDE_DIST=klegacyimport.desktop 
+KDE_DIST=klegacyimport.desktop dummy.cpp 
@@ -348,2 +356,2 @@
-SOURCES = $(klegacyimport_la_SOURCES) $(klegacyimport_SOURCES)
-OBJECTS = $(klegacyimport_la_OBJECTS) $(klegacyimport_OBJECTS)
+SOURCES = $(libklegacyimport_main_la_SOURCES) $(klegacyimport_la_SOURCES) $(klegacyimport_SOURCES)
+OBJECTS = $(libklegacyimport_main_la_OBJECTS) $(klegacyimport_la_OBJECTS) $(klegacyimport_OBJECTS)
@@ -435,0 +444,3 @@
+libklegacyimport_main.la: $(libklegacyimport_main_la_OBJECTS) $(libklegacyimport_main_la_DEPENDENCIES)
+	$(CXXLINK) -rpath $(libdir) $(libklegacyimport_main_la_LDFLAGS) $(libklegacyimport_main_la_OBJECTS) $(libklegacyimport_main_la_LIBADD) $(LIBS)
+
@@ -527,11 +537,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
@@ -661,8 +661,8 @@
-klegacyimport_la_meta_unload.cpp:  legacyimport.moc
-	@echo 'creating klegacyimport_la_meta_unload.cpp'
-	@-rm -f klegacyimport_la_meta_unload.cpp
-	@echo 'static const char * _metalist_klegacyimport_la[] = {' > klegacyimport_la_meta_unload.cpp
-	@cat  legacyimport.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> klegacyimport_la_meta_unload.cpp
-	@echo '0};' >> klegacyimport_la_meta_unload.cpp
-	@echo '#include <kunload.h>' >> klegacyimport_la_meta_unload.cpp
-	@echo '_UNLOAD(klegacyimport_la)' >> klegacyimport_la_meta_unload.cpp
+libklegacyimport_main_la_meta_unload.cpp:  legacyimport.moc
+	@echo 'creating libklegacyimport_main_la_meta_unload.cpp'
+	@-rm -f libklegacyimport_main_la_meta_unload.cpp
+	@echo 'static const char * _metalist_libklegacyimport_main_la[] = {' > libklegacyimport_main_la_meta_unload.cpp
+	@cat  legacyimport.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libklegacyimport_main_la_meta_unload.cpp
+	@echo '0};' >> libklegacyimport_main_la_meta_unload.cpp
+	@echo '#include <kunload.h>' >> libklegacyimport_main_la_meta_unload.cpp
+	@echo '_UNLOAD(libklegacyimport_main_la)' >> libklegacyimport_main_la_meta_unload.cpp
@@ -673 +673,13 @@
-	-rm -f  klegacyimport_la_meta_unload.cpp
+	-rm -f  libklegacyimport_main_la_meta_unload.cpp
+
+#>+ 11
+libklegacyimport_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/legacyimport.cpp libklegacyimport_main_la_meta_unload.cpp   legacyimport.moc 
+	@echo 'creating libklegacyimport_main_la.all_cpp.cpp ...'; \
+	rm -f libklegacyimport_main_la.all_cpp.files libklegacyimport_main_la.all_cpp.final; \
+	echo "#define KDE_USE_FINAL 1" >> libklegacyimport_main_la.all_cpp.final; \
+	for file in legacyimport.cpp libklegacyimport_main_la_meta_unload.cpp ; do \
+	  echo "#include \"$$file\"" >> libklegacyimport_main_la.all_cpp.files; \
+	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libklegacyimport_main_la.all_cpp.final; \
+	done; \
+	cat libklegacyimport_main_la.all_cpp.final libklegacyimport_main_la.all_cpp.files  > libklegacyimport_main_la.all_cpp.cpp; \
+	rm -f libklegacyimport_main_la.all_cpp.final libklegacyimport_main_la.all_cpp.files
@@ -676 +688 @@
-klegacyimport_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/legacyimport.cpp klegacyimport_la_meta_unload.cpp   legacyimport.moc 
+klegacyimport_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/klegacyimport_main.cpp  
@@ -680 +692 @@
-	for file in legacyimport.cpp klegacyimport_la_meta_unload.cpp ; do \
+	for file in klegacyimport_main.cpp ; do \
@@ -688 +700 @@
-klegacyimport.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dummy.cpp  
+klegacyimport.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/klegacyimport_main.cpp  
@@ -692 +704 @@
-	for file in dummy.cpp ; do \
+	for file in klegacyimport_main.cpp ; do \
@@ -701 +713 @@
-	-rm -f klegacyimport_la.all_cpp.cpp klegacyimport.all_cpp.cpp
+	-rm -f libklegacyimport_main_la.all_cpp.cpp klegacyimport_la.all_cpp.cpp klegacyimport.all_cpp.cpp
@@ -705 +717 @@
-	$(MAKE) klegacyimport_la_OBJECTS="$(klegacyimport_la_final_OBJECTS)" all-am
+	$(MAKE) libklegacyimport_main_la_OBJECTS="$(libklegacyimport_main_la_final_OBJECTS)" all-am
@@ -708 +720 @@
-	$(MAKE) klegacyimport_la_OBJECTS="$(klegacyimport_la_nofinal_OBJECTS)" all-am
+	$(MAKE) libklegacyimport_main_la_OBJECTS="$(libklegacyimport_main_la_nofinal_OBJECTS)" all-am