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

--- kdeprint/kjobviewer/Makefile.in.orig	Sat Sep  8 01:36:29 2001
+++ kdeprint/kjobviewer/Makefile.in
@@ -277 +277 @@
-lib_LTLIBRARIES = kjobviewer.la
+lib_LTLIBRARIES = libkjobviewer_main.la kjobviewer.la
@@ -279,2 +279,2 @@
-kjobviewer_SOURCES = dummy.cpp
-kjobviewer_LDADD = kjobviewer.la
+kjobviewer_SOURCES = kjobviewer_main.cpp
+kjobviewer_LDADD = libkjobviewer_main.la
@@ -283 +283,6 @@
-kjobviewer_la_SOURCES = kjobviewer.cpp main.cpp
+libkjobviewer_main_la_SOURCES = kjobviewer.cpp main.cpp
+#>- libkjobviewer_main_la_METASOURCES = AUTO
+libkjobviewer_main_la_LIBADD = -lkdeprint_management $(LIB_KDEUI)
+libkjobviewer_main_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+
+kjobviewer_la_SOURCES = kjobviewer_main.cpp
@@ -285 +290 @@
-kjobviewer_la_LIBADD = -lkdeprint_management $(LIB_KDEUI)
+kjobviewer_la_LIBADD = libkjobviewer_main.la
@@ -309,2 +314,2 @@
-kjobviewer_la_DEPENDENCIES = 
-#>- kjobviewer_la_OBJECTS =  kjobviewer.lo main.lo
+libkjobviewer_main_la_DEPENDENCIES = 
+#>- libkjobviewer_main_la_OBJECTS =  kjobviewer.lo main.lo
@@ -312,5 +317,9 @@
-kjobviewer_la_final_OBJECTS = kjobviewer_la.all_cpp.lo 
-kjobviewer_la_nofinal_OBJECTS = kjobviewer.lo main.lo \
-kjobviewer_la_meta_unload.lo 
-@KDE_USE_FINAL_FALSE@kjobviewer_la_OBJECTS = $(kjobviewer_la_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@kjobviewer_la_OBJECTS = $(kjobviewer_la_final_OBJECTS)
+libkjobviewer_main_la_final_OBJECTS = libkjobviewer_main_la.all_cpp.lo 
+libkjobviewer_main_la_nofinal_OBJECTS = kjobviewer.lo main.lo \
+libkjobviewer_main_la_meta_unload.lo 
+@KDE_USE_FINAL_FALSE@libkjobviewer_main_la_OBJECTS = $(libkjobviewer_main_la_nofinal_OBJECTS)
+@KDE_USE_FINAL_TRUE@libkjobviewer_main_la_OBJECTS = $(libkjobviewer_main_la_final_OBJECTS)
+kjobviewer_la_DEPENDENCIES =  libkjobviewer_main.la
+#>- kjobviewer_la_OBJECTS =  kjobviewer_main.lo
+#>+ 1
+kjobviewer_la_OBJECTS = kjobviewer_main.lo
@@ -320 +329 @@
-#>- kjobviewer_OBJECTS =  dummy.$(OBJEXT)
+#>- kjobviewer_OBJECTS =  kjobviewer_main.$(OBJEXT)
@@ -322,2 +331,2 @@
-kjobviewer_OBJECTS = dummy.$(OBJEXT)
-kjobviewer_DEPENDENCIES =  kjobviewer.la
+kjobviewer_OBJECTS = kjobviewer_main.$(OBJEXT)
+kjobviewer_DEPENDENCIES =  libkjobviewer_main.la
@@ -344 +353 @@
-KDE_DIST=kjobviewerui.rc hi32-app-kjobviewer.png kjobviewer.desktop hi16-app-kjobviewer.png 
+KDE_DIST=hi32-app-kjobviewer.png hi16-app-kjobviewer.png kjobviewerui.rc kjobviewer.desktop 
@@ -351,2 +360,2 @@
-SOURCES = $(kjobviewer_la_SOURCES) $(kjobviewer_SOURCES)
-OBJECTS = $(kjobviewer_la_OBJECTS) $(kjobviewer_OBJECTS)
+SOURCES = $(libkjobviewer_main_la_SOURCES) $(kjobviewer_la_SOURCES) $(kjobviewer_SOURCES)
+OBJECTS = $(libkjobviewer_main_la_OBJECTS) $(kjobviewer_la_OBJECTS) $(kjobviewer_OBJECTS)
@@ -438,0 +448,3 @@
+libkjobviewer_main.la: $(libkjobviewer_main_la_OBJECTS) $(libkjobviewer_main_la_DEPENDENCIES)
+	$(CXXLINK) -rpath $(libdir) $(libkjobviewer_main_la_LDFLAGS) $(libkjobviewer_main_la_OBJECTS) $(libkjobviewer_main_la_LIBADD) $(LIBS)
+
@@ -549,11 +560,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
@@ -664,3 +664,0 @@
-dummy.cpp:
-	echo > dummy.cpp
-
@@ -678,0 +677,4 @@
+kjobviewer.moc: $(srcdir)/kjobviewer.h
+	$(MOC) $(srcdir)/kjobviewer.h -o kjobviewer.moc
+
+#>+ 3
@@ -680 +682 @@
-	-rm -f  kjobviewer.moc
+	-rm -f  kjobviewer.moc kjobviewer.moc
@@ -703,8 +705,8 @@
-kjobviewer_la_meta_unload.cpp:  kjobviewer.moc
-	@echo 'creating kjobviewer_la_meta_unload.cpp'
-	@-rm -f kjobviewer_la_meta_unload.cpp
-	@echo 'static const char * _metalist_kjobviewer_la[] = {' > kjobviewer_la_meta_unload.cpp
-	@cat  kjobviewer.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kjobviewer_la_meta_unload.cpp
-	@echo '0};' >> kjobviewer_la_meta_unload.cpp
-	@echo '#include <kunload.h>' >> kjobviewer_la_meta_unload.cpp
-	@echo '_UNLOAD(kjobviewer_la)' >> kjobviewer_la_meta_unload.cpp
+libkjobviewer_main_la_meta_unload.cpp:  kjobviewer.moc
+	@echo 'creating libkjobviewer_main_la_meta_unload.cpp'
+	@-rm -f libkjobviewer_main_la_meta_unload.cpp
+	@echo 'static const char * _metalist_libkjobviewer_main_la[] = {' > libkjobviewer_main_la_meta_unload.cpp
+	@cat  kjobviewer.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkjobviewer_main_la_meta_unload.cpp
+	@echo '0};' >> libkjobviewer_main_la_meta_unload.cpp
+	@echo '#include <kunload.h>' >> libkjobviewer_main_la_meta_unload.cpp
+	@echo '_UNLOAD(libkjobviewer_main_la)' >> libkjobviewer_main_la_meta_unload.cpp
@@ -715 +717,13 @@
-	-rm -f  kjobviewer_la_meta_unload.cpp
+	-rm -f  libkjobviewer_main_la_meta_unload.cpp
+
+#>+ 11
+libkjobviewer_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kjobviewer.cpp $(srcdir)/main.cpp libkjobviewer_main_la_meta_unload.cpp   kjobviewer.moc 
+	@echo 'creating libkjobviewer_main_la.all_cpp.cpp ...'; \
+	rm -f libkjobviewer_main_la.all_cpp.files libkjobviewer_main_la.all_cpp.final; \
+	echo "#define KDE_USE_FINAL 1" >> libkjobviewer_main_la.all_cpp.final; \
+	for file in kjobviewer.cpp main.cpp libkjobviewer_main_la_meta_unload.cpp ; do \
+	  echo "#include \"$$file\"" >> libkjobviewer_main_la.all_cpp.files; \
+	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkjobviewer_main_la.all_cpp.final; \
+	done; \
+	cat libkjobviewer_main_la.all_cpp.final libkjobviewer_main_la.all_cpp.files  > libkjobviewer_main_la.all_cpp.cpp; \
+	rm -f libkjobviewer_main_la.all_cpp.final libkjobviewer_main_la.all_cpp.files
@@ -718 +732 @@
-kjobviewer_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kjobviewer.cpp $(srcdir)/main.cpp kjobviewer_la_meta_unload.cpp   kjobviewer.moc 
+kjobviewer_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kjobviewer_main.cpp   kjobviewer.moc 
@@ -722 +736 @@
-	for file in kjobviewer.cpp main.cpp kjobviewer_la_meta_unload.cpp ; do \
+	for file in kjobviewer_main.cpp ; do \
@@ -730 +744 @@
-kjobviewer.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp  
+kjobviewer.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kjobviewer_main.cpp  
@@ -734 +748 @@
-	for file in dummy.cpp ; do \
+	for file in kjobviewer_main.cpp ; do \
@@ -743 +757 @@
-	-rm -f kjobviewer_la.all_cpp.cpp kjobviewer.all_cpp.cpp
+	-rm -f libkjobviewer_main_la.all_cpp.cpp kjobviewer_la.all_cpp.cpp kjobviewer.all_cpp.cpp
@@ -747 +761 @@
-	$(MAKE) kjobviewer_la_OBJECTS="$(kjobviewer_la_final_OBJECTS)" all-am
+	$(MAKE) libkjobviewer_main_la_OBJECTS="$(libkjobviewer_main_la_final_OBJECTS)" all-am
@@ -750 +764 @@
-	$(MAKE) kjobviewer_la_OBJECTS="$(kjobviewer_la_nofinal_OBJECTS)" all-am
+	$(MAKE) libkjobviewer_main_la_OBJECTS="$(libkjobviewer_main_la_nofinal_OBJECTS)" all-am
@@ -760 +774 @@
-$(srcdir)/kjobviewer.cpp: kjobviewer.moc 
+$(srcdir)/kjobviewer.cpp: kjobviewer.moc kjobviewer.moc