summaryrefslogtreecommitdiff
path: root/x11/kdelibs2/patches/patch-ah
blob: 70a2f8029742da9dd9bc50e91452906263dd6556 (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
Cannot strip away RCS IDs, please handle manually!
$NetBSD: patch-ah,v 1.2 2001/10/15 22:46:22 skrll Exp $

--- dcop/Makefile.in.orig	Wed Sep 12 06:09:37 2001
+++ dcop/Makefile.in
@@ -2 +2 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
@@ -4 +4 @@
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
@@ -291 +291 @@
-LDFLAGS = $(all_libraries)
+LDFLAGS = $(all_libraries) $(KDE_RPATH)
@@ -296 +296 @@
-lib_LTLIBRARIES = libDCOP.la dcopserver.la
+lib_LTLIBRARIES = libDCOP.la libdcopserver_main.la dcopserver.la
@@ -310,3 +310,7 @@
-dcopserver_la_LDFLAGS = -module -avoid-version
-dcopserver_la_SOURCES = dcopserver.cpp dcopsignals.cpp
-dcopserver_la_LIBADD = libDCOP.la
+#libdcopserver_main_la_LDFLAGS = -export-dynamic
+libdcopserver_main_la_SOURCES = dcopserver.cpp dcopsignals.cpp
+libdcopserver_main_la_LIBADD = libDCOP.la
+
+dcopserver_la_LDFLAGS = -Wl,-export-dynamic -module -avoid-version
+dcopserver_la_SOURCES = dcopserver_main.cpp
+dcopserver_la_LIBADD = libdcopserver_main.la
@@ -315,2 +319,2 @@
-dcopserver_SOURCES = dummy.cpp
-dcopserver_LDADD = dcopserver.la
+dcopserver_SOURCES = dcopserver_main.cpp
+dcopserver_LDADD = libdcopserver_main.la
@@ -341,2 +345,3 @@
-dcopserver_la_DEPENDENCIES =  libDCOP.la
-#>- dcopserver_la_OBJECTS =  dcopserver.lo dcopsignals.lo
+libdcopserver_main_la_LDFLAGS = 
+libdcopserver_main_la_DEPENDENCIES =  libDCOP.la
+#>- libdcopserver_main_la_OBJECTS =  dcopserver.lo dcopsignals.lo
@@ -344,4 +349,8 @@
-dcopserver_la_final_OBJECTS = dcopserver_la.all_cpp.lo 
-dcopserver_la_nofinal_OBJECTS = dcopserver.lo dcopsignals.lo
-@KDE_USE_FINAL_FALSE@dcopserver_la_OBJECTS = $(dcopserver_la_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@dcopserver_la_OBJECTS = $(dcopserver_la_final_OBJECTS)
+libdcopserver_main_la_final_OBJECTS = libdcopserver_main_la.all_cpp.lo 
+libdcopserver_main_la_nofinal_OBJECTS = dcopserver.lo dcopsignals.lo
+@KDE_USE_FINAL_FALSE@libdcopserver_main_la_OBJECTS = $(libdcopserver_main_la_nofinal_OBJECTS)
+@KDE_USE_FINAL_TRUE@libdcopserver_main_la_OBJECTS = $(libdcopserver_main_la_final_OBJECTS)
+dcopserver_la_DEPENDENCIES =  libdcopserver_main.la
+#>- dcopserver_la_OBJECTS =  dcopserver_main.lo
+#>+ 1
+dcopserver_la_OBJECTS = dcopserver_main.lo
@@ -352 +361 @@
-#>- dcopserver_OBJECTS =  dummy.$(OBJEXT)
+#>- dcopserver_OBJECTS =  dcopserver_main.$(OBJEXT)
@@ -354,2 +363,2 @@
-dcopserver_OBJECTS = dummy.$(OBJEXT)
-dcopserver_DEPENDENCIES =  dcopserver.la
+dcopserver_OBJECTS = dcopserver_main.$(OBJEXT)
+dcopserver_DEPENDENCIES =  libdcopserver_main.la
@@ -399,2 +408,2 @@
-SOURCES = $(libDCOP_la_SOURCES) $(dcopserver_la_SOURCES) $(dcopserver_SOURCES) $(testdcop_SOURCES) $(testdcopc_SOURCES)
-OBJECTS = $(libDCOP_la_OBJECTS) $(dcopserver_la_OBJECTS) $(dcopserver_OBJECTS) $(testdcop_OBJECTS) $(testdcopc_OBJECTS)
+SOURCES = $(libDCOP_la_SOURCES) $(libdcopserver_main_la_SOURCES) $(dcopserver_la_SOURCES) $(dcopserver_SOURCES) $(testdcop_SOURCES) $(testdcopc_SOURCES)
+OBJECTS = $(libDCOP_la_OBJECTS) $(libdcopserver_main_la_OBJECTS) $(dcopserver_la_OBJECTS) $(dcopserver_OBJECTS) $(testdcop_OBJECTS) $(testdcopc_OBJECTS)
@@ -492,0 +502,3 @@
+libdcopserver_main.la: $(libdcopserver_main_la_OBJECTS) $(libdcopserver_main_la_DEPENDENCIES)
+	$(CXXLINK) -rpath $(libdir) $(libdcopserver_main_la_LDFLAGS) $(libdcopserver_main_la_OBJECTS) $(libdcopserver_main_la_LIBADD) $(LIBS)
+
@@ -599 +611 @@
-	  test "$$subdir" = "." && dot_seen=yes; \
+	  test "$$subdir" != "." || dot_seen=yes; \
@@ -657,11 +668,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
@@ -788,3 +788,0 @@
-dummy.cpp:
-	echo > dummy.cpp
-
@@ -846 +844,13 @@
-dcopserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dcopserver.cpp $(srcdir)/dcopsignals.cpp  
+libdcopserver_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dcopserver.cpp $(srcdir)/dcopsignals.cpp  
+	@echo 'creating libdcopserver_main_la.all_cpp.cpp ...'; \
+	rm -f libdcopserver_main_la.all_cpp.files libdcopserver_main_la.all_cpp.final; \
+	echo "#define KDE_USE_FINAL 1" >> libdcopserver_main_la.all_cpp.final; \
+	for file in dcopserver.cpp dcopsignals.cpp ; do \
+	  echo "#include \"$$file\"" >> libdcopserver_main_la.all_cpp.files; \
+	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libdcopserver_main_la.all_cpp.final; \
+	done; \
+	cat libdcopserver_main_la.all_cpp.final libdcopserver_main_la.all_cpp.files  > libdcopserver_main_la.all_cpp.cpp; \
+	rm -f libdcopserver_main_la.all_cpp.final libdcopserver_main_la.all_cpp.files
+
+#>+ 11
+dcopserver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dcopserver_main.cpp  
@@ -850 +860 @@
-	for file in dcopserver.cpp dcopsignals.cpp ; do \
+	for file in dcopserver_main.cpp ; do \
@@ -858 +868 @@
-dcopserver.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp  
+dcopserver.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dcopserver_main.cpp  
@@ -862 +872 @@
-	for file in dummy.cpp ; do \
+	for file in dcopserver_main.cpp ; do \
@@ -883 +893 @@
-	-rm -f libDCOP_la.all_cpp.cpp dcopserver_la.all_cpp.cpp dcopserver.all_cpp.cpp testdcop.all_cpp.cpp
+	-rm -f libDCOP_la.all_cpp.cpp libdcopserver_main_la.all_cpp.cpp dcopserver_la.all_cpp.cpp dcopserver.all_cpp.cpp testdcop.all_cpp.cpp
@@ -887 +897 @@
-	$(MAKE) libDCOP_la_OBJECTS="$(libDCOP_la_final_OBJECTS)" dcopserver_la_OBJECTS="$(dcopserver_la_final_OBJECTS)" testdcopc_OBJECTS="$(testdcopc_final_OBJECTS)" all-am
+	$(MAKE) libDCOP_la_OBJECTS="$(libDCOP_la_final_OBJECTS)" libdcopserver_main_la_OBJECTS="$(libdcopserver_main_la_final_OBJECTS)" testdcopc_OBJECTS="$(testdcopc_final_OBJECTS)" all-am
@@ -890 +900 @@
-	$(MAKE) libDCOP_la_OBJECTS="$(libDCOP_la_nofinal_OBJECTS)" dcopserver_la_OBJECTS="$(dcopserver_la_nofinal_OBJECTS)" testdcopc_OBJECTS="$(testdcopc_nofinal_OBJECTS)" all-am
+	$(MAKE) libDCOP_la_OBJECTS="$(libDCOP_la_nofinal_OBJECTS)" libdcopserver_main_la_OBJECTS="$(libdcopserver_main_la_nofinal_OBJECTS)" testdcopc_OBJECTS="$(testdcopc_nofinal_OBJECTS)" all-am