Magellan Linux

Contents of /trunk/vnc/patches/vnc-fPIC.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 153 - (show annotations) (download)
Tue May 8 20:52:56 2007 UTC (17 years ago) by niro
File size: 3119 byte(s)
-import

1 --- vnc-4_1-unixsrc/unix/xc/programs/Xserver/vnc/module/Imakefile.fPIC 2005-03-04 14:33:47.000000000 +0000
2 +++ vnc-4_1-unixsrc/unix/xc/programs/Xserver/vnc/module/Imakefile 2005-03-04 14:34:16.000000000 +0000
3 @@ -21,7 +21,8 @@
4 LinkSourceFile(xf86vncModule.cc,..)
5 LinkSourceFile(XserverDesktop.cc,..)
6
7 -ModuleObjectRule()
8 +.CCsuf.Osuf:
9 + NormalSharedLibObjCplusplusCompile($(_NOOP_))
10 /*
11 LibraryModuleTarget(vnc,$(OBJS) $(VNCLIBS))
12 InstallLibraryModule(vnc,$(MODULEDIR),extensions)
13 --- vnc-4_1-unixsrc/unix/xc/programs/Xserver/vnc/Imakefile.fPIC 2005-03-04 14:34:24.000000000 +0000
14 +++ vnc-4_1-unixsrc/unix/xc/programs/Xserver/vnc/Imakefile 2005-03-04 14:34:52.000000000 +0000
15 @@ -36,8 +36,8 @@
16 NormalLintTarget($(SRCS))
17
18 NormalLibraryObjectRule()
19 -NormalCplusplusObjectRule()
20 -
21 +.CCsuf.Osuf:
22 + NormalSharedLibObjCplusplusCompile($(_NOOP_))
23
24 MakeSubdirs($(SUBDIRS))
25 DependSubdirs($(SUBDIRS))
26 --- vnc-4_1-unixsrc/unix/boilerplate.mk.fPIC 2005-03-04 14:35:03.000000000 +0000
27 +++ vnc-4_1-unixsrc/unix/boilerplate.mk 2005-03-04 14:35:23.000000000 +0000
28 @@ -15,7 +15,7 @@
29 CFLAGS = @CFLAGS@ $(DIR_CFLAGS)
30 CCLD = $(CC)
31 CXX = @CXX@
32 -CXXFLAGS = @CXXFLAGS@
33 +CXXFLAGS = @CXXFLAGS@ $(DIR_CXXFLAGS)
34 CXXLD = $(CXX)
35 CPPFLAGS = @CPPFLAGS@
36 DEFS = @DEFS@
37 --- vnc-4_1-unixsrc/common/Xregion/Makefile.in.fPIC 2005-03-04 14:32:24.000000000 +0000
38 +++ vnc-4_1-unixsrc/common/Xregion/Makefile.in 2005-03-04 14:32:36.000000000 +0000
39 @@ -12,4 +12,5 @@
40 $(AR) $(library) $(OBJS)
41 $(RANLIB) $(library)
42
43 +DIR_CFLAGS = -DPIC -fPIC
44 # followed by boilerplate.mk
45 --- vnc-4_1-unixsrc/common/network/Makefile.in.fPIC 2005-03-04 14:32:44.000000000 +0000
46 +++ vnc-4_1-unixsrc/common/network/Makefile.in 2005-03-04 14:32:58.000000000 +0000
47 @@ -14,4 +14,5 @@
48 $(AR) $(library) $(OBJS)
49 $(RANLIB) $(library)
50
51 +DIR_CXXFLAGS = -DPIC -fPIC
52 # followed by boilerplate.mk
53 --- vnc-4_1-unixsrc/common/rdr/Makefile.in.fPIC 2005-03-04 14:33:05.000000000 +0000
54 +++ vnc-4_1-unixsrc/common/rdr/Makefile.in 2005-03-04 14:33:16.000000000 +0000
55 @@ -16,4 +16,5 @@
56 $(AR) $(library) $(OBJS)
57 $(RANLIB) $(library)
58
59 +DIR_CXXFLAGS = -DPIC -fPIC
60 # followed by boilerplate.mk
61 --- vnc-4_1-unixsrc/common/rfb/Makefile.in.fPIC 2005-03-04 14:33:20.000000000 +0000
62 +++ vnc-4_1-unixsrc/common/rfb/Makefile.in 2005-03-04 14:33:33.000000000 +0000
63 @@ -65,4 +65,6 @@
64 $(AR) $(library) $(OBJS)
65 $(RANLIB) $(library)
66
67 +DIR_CFLAGS = -DPIC -fPIC
68 +DIR_CXXFLAGS = -DPIC -fPIC
69 # followed by boilerplate.mk
70 --- vnc-4_1-unixsrc/common/Makefile.in.fPIC 2005-03-04 15:08:57.000000000 +0000
71 +++ vnc-4_1-unixsrc/common/Makefile.in 2005-03-04 15:09:25.000000000 +0000
72 @@ -1,4 +1,6 @@
73
74 SUBDIRS = @ZLIB_DIR@ rdr network Xregion rfb
75
76 +DIR_CFLAGS = -DPIC -fPIC
77 +DIR_CXXFLAGS = -DPIC -fPIC
78 # followed by boilerplate.mk
79 --- vnc-4_1-unixsrc/common/boilerplate.mk.fPIC 2005-03-04 15:09:32.000000000 +0000
80 +++ vnc-4_1-unixsrc/common/boilerplate.mk 2005-03-04 15:09:49.000000000 +0000
81 @@ -15,7 +15,7 @@
82 CFLAGS = @CFLAGS@ $(DIR_CFLAGS)
83 CCLD = $(CC)
84 CXX = @CXX@
85 -CXXFLAGS = @CXXFLAGS@
86 +CXXFLAGS = @CXXFLAGS@ $(DIR_CXXFLAGS)
87 CXXLD = $(CXX)
88 CPPFLAGS = @CPPFLAGS@
89 DEFS = @DEFS@