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

--- konqueror/keditbookmarks/Makefile.in.orig	Sat Sep  8 01:36:40 2001
+++ konqueror/keditbookmarks/Makefile.in
@@ -277 +277 @@
-lib_LTLIBRARIES = keditbookmarks.la
+lib_LTLIBRARIES = libkeditbookmarks_main.la keditbookmarks.la
@@ -279 +279,4 @@
-keditbookmarks_la_SOURCES = main.cpp toplevel.cpp commands.cpp
+libkeditbookmarks_main_la_SOURCES = main.cpp toplevel.cpp commands.cpp
+libkeditbookmarks_main_la_LIBADD = $(top_builddir)/libkonq/libkonq.la
+libkeditbookmarks_main_la_LDFLAGS = $(all_libraries)
+#>- libkeditbookmarks_main_la_METASOURCES = AUTO
@@ -281 +284,2 @@
-keditbookmarks_la_LIBADD = $(top_builddir)/libkonq/libkonq.la
+keditbookmarks_la_SOURCES = keditbookmarks_main.cpp
+keditbookmarks_la_LIBADD = libkeditbookmarks_main.la
@@ -287,2 +291,2 @@
-keditbookmarks_SOURCES = dummy.cpp
-keditbookmarks_LDADD = keditbookmarks.la
+keditbookmarks_SOURCES = keditbookmarks_main.cpp
+keditbookmarks_LDADD = libkeditbookmarks_main.la
@@ -310,2 +314,3 @@
-keditbookmarks_la_DEPENDENCIES =  $(top_builddir)/libkonq/libkonq.la
-#>- keditbookmarks_la_OBJECTS =  main.lo toplevel.lo commands.lo
+libkeditbookmarks_main_la_DEPENDENCIES =  \
+$(top_builddir)/libkonq/libkonq.la
+#>- libkeditbookmarks_main_la_OBJECTS =  main.lo toplevel.lo commands.lo
@@ -313,5 +318,9 @@
-keditbookmarks_la_final_OBJECTS = keditbookmarks_la.all_cpp.lo 
-keditbookmarks_la_nofinal_OBJECTS = main.lo toplevel.lo commands.lo \
-keditbookmarks_la_meta_unload.lo 
-@KDE_USE_FINAL_FALSE@keditbookmarks_la_OBJECTS = $(keditbookmarks_la_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@keditbookmarks_la_OBJECTS = $(keditbookmarks_la_final_OBJECTS)
+libkeditbookmarks_main_la_final_OBJECTS = libkeditbookmarks_main_la.all_cpp.lo 
+libkeditbookmarks_main_la_nofinal_OBJECTS = main.lo toplevel.lo commands.lo \
+libkeditbookmarks_main_la_meta_unload.lo 
+@KDE_USE_FINAL_FALSE@libkeditbookmarks_main_la_OBJECTS = $(libkeditbookmarks_main_la_nofinal_OBJECTS)
+@KDE_USE_FINAL_TRUE@libkeditbookmarks_main_la_OBJECTS = $(libkeditbookmarks_main_la_final_OBJECTS)
+keditbookmarks_la_DEPENDENCIES =  libkeditbookmarks_main.la
+#>- keditbookmarks_la_OBJECTS =  keditbookmarks_main.lo
+#>+ 1
+keditbookmarks_la_OBJECTS = keditbookmarks_main.lo
@@ -321 +330 @@
-#>- keditbookmarks_OBJECTS =  dummy.$(OBJEXT)
+#>- keditbookmarks_OBJECTS =  keditbookmarks_main.$(OBJEXT)
@@ -323,2 +332,2 @@
-keditbookmarks_OBJECTS = dummy.$(OBJEXT)
-keditbookmarks_DEPENDENCIES =  keditbookmarks.la
+keditbookmarks_OBJECTS = keditbookmarks_main.$(OBJEXT)
+keditbookmarks_DEPENDENCIES =  libkeditbookmarks_main.la
@@ -343 +352 @@
-KDE_DIST=kinsertionsort.h hi32-app-keditbookmarks.png commands.h toplevel.h hi16-app-keditbookmarks.png keditbookmarks.desktop keditbookmarksui.rc 
+KDE_DIST=commands.h kinsertionsort.h keditbookmarks.desktop hi16-app-keditbookmarks.png hi32-app-keditbookmarks.png toplevel.h keditbookmarksui.rc 
@@ -350,2 +359,2 @@
-SOURCES = $(keditbookmarks_la_SOURCES) $(keditbookmarks_SOURCES)
-OBJECTS = $(keditbookmarks_la_OBJECTS) $(keditbookmarks_OBJECTS)
+SOURCES = $(libkeditbookmarks_main_la_SOURCES) $(keditbookmarks_la_SOURCES) $(keditbookmarks_SOURCES)
+OBJECTS = $(libkeditbookmarks_main_la_OBJECTS) $(keditbookmarks_la_OBJECTS) $(keditbookmarks_OBJECTS)
@@ -437,0 +447,3 @@
+libkeditbookmarks_main.la: $(libkeditbookmarks_main_la_OBJECTS) $(libkeditbookmarks_main_la_DEPENDENCIES)
+	$(CXXLINK) -rpath $(libdir) $(libkeditbookmarks_main_la_LDFLAGS) $(libkeditbookmarks_main_la_OBJECTS) $(libkeditbookmarks_main_la_LIBADD) $(LIBS)
+
@@ -548,11 +559,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
@@ -663,3 +663,0 @@
-dummy.cpp:
-	echo > dummy.cpp
-
@@ -678,0 +677,8 @@
+commands.moc: $(srcdir)/commands.h
+	$(MOC) $(srcdir)/commands.h -o commands.moc
+
+#>+ 3
+toplevel.moc: $(srcdir)/toplevel.h
+	$(MOC) $(srcdir)/toplevel.h -o toplevel.moc
+
+#>+ 3
@@ -680 +686 @@
-	-rm -f  commands.moc toplevel.moc
+	-rm -f  commands.moc toplevel.moc commands.moc toplevel.moc
@@ -703,8 +709,8 @@
-keditbookmarks_la_meta_unload.cpp:  commands.moc toplevel.moc
-	@echo 'creating keditbookmarks_la_meta_unload.cpp'
-	@-rm -f keditbookmarks_la_meta_unload.cpp
-	@echo 'static const char * _metalist_keditbookmarks_la[] = {' > keditbookmarks_la_meta_unload.cpp
-	@cat  commands.moc toplevel.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> keditbookmarks_la_meta_unload.cpp
-	@echo '0};' >> keditbookmarks_la_meta_unload.cpp
-	@echo '#include <kunload.h>' >> keditbookmarks_la_meta_unload.cpp
-	@echo '_UNLOAD(keditbookmarks_la)' >> keditbookmarks_la_meta_unload.cpp
+libkeditbookmarks_main_la_meta_unload.cpp:  commands.moc toplevel.moc
+	@echo 'creating libkeditbookmarks_main_la_meta_unload.cpp'
+	@-rm -f libkeditbookmarks_main_la_meta_unload.cpp
+	@echo 'static const char * _metalist_libkeditbookmarks_main_la[] = {' > libkeditbookmarks_main_la_meta_unload.cpp
+	@cat  commands.moc toplevel.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkeditbookmarks_main_la_meta_unload.cpp
+	@echo '0};' >> libkeditbookmarks_main_la_meta_unload.cpp
+	@echo '#include <kunload.h>' >> libkeditbookmarks_main_la_meta_unload.cpp
+	@echo '_UNLOAD(libkeditbookmarks_main_la)' >> libkeditbookmarks_main_la_meta_unload.cpp
@@ -715 +721,13 @@
-	-rm -f  keditbookmarks_la_meta_unload.cpp
+	-rm -f  libkeditbookmarks_main_la_meta_unload.cpp
+
+#>+ 11
+libkeditbookmarks_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/commands.cpp libkeditbookmarks_main_la_meta_unload.cpp   commands.moc toplevel.moc 
+	@echo 'creating libkeditbookmarks_main_la.all_cpp.cpp ...'; \
+	rm -f libkeditbookmarks_main_la.all_cpp.files libkeditbookmarks_main_la.all_cpp.final; \
+	echo "#define KDE_USE_FINAL 1" >> libkeditbookmarks_main_la.all_cpp.final; \
+	for file in main.cpp toplevel.cpp commands.cpp libkeditbookmarks_main_la_meta_unload.cpp ; do \
+	  echo "#include \"$$file\"" >> libkeditbookmarks_main_la.all_cpp.files; \
+	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkeditbookmarks_main_la.all_cpp.final; \
+	done; \
+	cat libkeditbookmarks_main_la.all_cpp.final libkeditbookmarks_main_la.all_cpp.files  > libkeditbookmarks_main_la.all_cpp.cpp; \
+	rm -f libkeditbookmarks_main_la.all_cpp.final libkeditbookmarks_main_la.all_cpp.files
@@ -718 +736 @@
-keditbookmarks_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/commands.cpp keditbookmarks_la_meta_unload.cpp   commands.moc toplevel.moc 
+keditbookmarks_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/keditbookmarks_main.cpp   commands.moc toplevel.moc 
@@ -722 +740 @@
-	for file in main.cpp toplevel.cpp commands.cpp keditbookmarks_la_meta_unload.cpp ; do \
+	for file in keditbookmarks_main.cpp ; do \
@@ -730 +748 @@
-keditbookmarks.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp  
+keditbookmarks.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/keditbookmarks_main.cpp  
@@ -734 +752 @@
-	for file in dummy.cpp ; do \
+	for file in keditbookmarks_main.cpp ; do \
@@ -743 +761 @@
-	-rm -f keditbookmarks_la.all_cpp.cpp keditbookmarks.all_cpp.cpp
+	-rm -f libkeditbookmarks_main_la.all_cpp.cpp keditbookmarks_la.all_cpp.cpp keditbookmarks.all_cpp.cpp
@@ -747 +765 @@
-	$(MAKE) keditbookmarks_la_OBJECTS="$(keditbookmarks_la_final_OBJECTS)" all-am
+	$(MAKE) libkeditbookmarks_main_la_OBJECTS="$(libkeditbookmarks_main_la_final_OBJECTS)" all-am
@@ -750 +768 @@
-	$(MAKE) keditbookmarks_la_OBJECTS="$(keditbookmarks_la_nofinal_OBJECTS)" all-am
+	$(MAKE) libkeditbookmarks_main_la_OBJECTS="$(libkeditbookmarks_main_la_nofinal_OBJECTS)" all-am
@@ -760,2 +778,2 @@
-$(srcdir)/toplevel.cpp: toplevel.moc 
-$(srcdir)/commands.cpp: commands.moc 
+$(srcdir)/toplevel.cpp: toplevel.moc toplevel.moc 
+$(srcdir)/commands.cpp: commands.moc commands.moc