1 # Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. |
1 # Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. |
2 # |
2 # |
3 # Permission is hereby granted, free of charge, to any person obtaining a |
3 # Permission is hereby granted, free of charge, to any person obtaining a |
4 # copy of this software and associated documentation files (the "Software"), |
4 # copy of this software and associated documentation files (the "Software"), |
5 # to deal in the Software without restriction, including without limitation |
5 # to deal in the Software without restriction, including without limitation |
6 # the rights to use, copy, modify, merge, publish, distribute, sublicense, |
6 # the rights to use, copy, modify, merge, publish, distribute, sublicense, |
82 $(top_srcdir)/tx/libtx.la @INET_LIB@ @X_PRE_LIBS@ @X_LIBS@ \ |
82 $(top_srcdir)/tx/libtx.la @INET_LIB@ @X_PRE_LIBS@ @X_LIBS@ \ |
83 @XTEST_LIB@ -lXext -lX11 @X_EXTRA_LIBS@ |
83 @XTEST_LIB@ -lXext -lX11 @X_EXTRA_LIBS@ |
84 diff -urp -x '*~' -x '*.orig' unix/xserver/hw/vnc/Makefile.am unix/xserver/hw/vnc/Makefile.am |
84 diff -urp -x '*~' -x '*.orig' unix/xserver/hw/vnc/Makefile.am unix/xserver/hw/vnc/Makefile.am |
85 --- unix/xserver/hw/vnc/Makefile.am 2010-01-07 18:27:33.782620873 -0800 |
85 --- unix/xserver/hw/vnc/Makefile.am 2010-01-07 18:27:33.782620873 -0800 |
86 +++ unix/xserver/hw/vnc/Makefile.am 2010-01-07 18:27:36.002105937 -0800 |
86 +++ unix/xserver/hw/vnc/Makefile.am 2010-01-07 18:27:36.002105937 -0800 |
87 @@ -34,7 +34,14 @@ Xvnc_CPPFLAGS = $(XVNC_CPPFLAGS) -DNO_HW |
87 @@ -17,7 +17,7 @@ |
|
88 |
|
89 libvnccommon_la_CPPFLAGS = -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \ |
88 -DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(LIB_DIR) \ |
90 -DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(LIB_DIR) \ |
89 -I$(top_srcdir)/include -I$(includedir)/pixman-1 -I$(includedir) |
91 - -I$(BIN_DIR)/vncconfig $(XVNC_CPPFLAGS) -I$(includedir)/pixman-1 -I$(includedir) |
90 |
92 + -I$(BIN_DIR)/vncconfig $(XVNC_CPPFLAGS) $(PIXMAN_CFLAGS) |
|
93 |
|
94 bin_PROGRAMS = Xvnc |
|
95 |
|
96 @@ -32,10 +32,17 @@ Xvnc_CPPFLAGS = $(XVNC_CPPFLAGS) -DNO_HW |
|
97 Xvnc_CPPFLAGS = $(XVNC_CPPFLAGS) -DNO_HW_ONLY_EXTS -DNO_MODULE_EXTS \ |
|
98 -DXFree86Server -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \ |
|
99 -DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(LIB_DIR) \ |
|
100 - -I$(top_srcdir)/include -I$(includedir)/pixman-1 -I$(includedir) |
|
101 + -I$(top_srcdir)/include $(PIXMAN_CFLAGS) |
|
102 + |
91 +if BUILD_TSOL_MODULE |
103 +if BUILD_TSOL_MODULE |
92 +TSOL_LIBS = ../../tsol/libxtsol.la -ltsol -ltsnet -lbsm |
104 +TSOL_LIBS = ../../tsol/libxtsol.la |
93 +endif |
105 +endif |
94 + |
106 |
95 Xvnc_LDADD = $(XVNC_LIBS) libvnccommon.la $(COMMON_LIBS) \ |
107 Xvnc_LDADD = $(XVNC_LIBS) libvnccommon.la $(COMMON_LIBS) \ |
96 - $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) -lX11 |
108 - $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) -lX11 |
97 + -ljpeg -lz \ |
109 + -ljpeg -lz \ |
98 + ../../IA/libIA.la \ |
110 + ../../IA/libIA.la \ |
99 + $(TSOL_LIBS) \ |
111 + $(TSOL_LIBS) \ |
100 + $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) |
112 + $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) |
101 |
113 |
102 Xvnc_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) |
114 Xvnc_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) |
|
115 |
|
116 @@ -55,7 +55,7 @@ |
|
117 -I$(top_srcdir)/hw/xfree86/common \ |
|
118 -I$(top_srcdir)/hw/xfree86/os-support \ |
|
119 -I$(top_srcdir)/hw/xfree86/os-support/bus \ |
|
120 - -I$(includedir)/pixman-1 -I$(includedir) |
|
121 + $(PIXMAN_CFLAGS) |
|
122 |
|
123 libvnc_la_LDFLAGS = -module -avoid-version |
|
124 |
103 @@ -62,8 +69,8 @@ BUILT_SOURCES = $(nodist_Xvnc_SOURCES) |
125 @@ -62,8 +69,8 @@ BUILT_SOURCES = $(nodist_Xvnc_SOURCES) |
104 fb.h: $(top_srcdir)/fb/fb.h |
126 fb.h: $(top_srcdir)/fb/fb.h |
105 cat $(top_srcdir)/fb/fb.h | sed -e 's,and,c_and,' -e 's,xor,c_xor,' > $(srcdir)/fb.h |
127 cat $(top_srcdir)/fb/fb.h | sed -e 's,and,c_and,' -e 's,xor,c_xor,' > $(srcdir)/fb.h |
106 |
128 |
107 -pixman.h: $(includedir)/pixman-1/pixman.h |
129 -pixman.h: $(includedir)/pixman-1/pixman.h |
108 - cat $(includedir)/pixman-1/pixman.h | sed 's/xor/c_xor/' > $(srcdir)/pixman.h |
130 - cat $(includedir)/pixman-1/pixman.h | sed 's/xor/c_xor/' > $(srcdir)/pixman.h |
109 +pixman.h: $(PROTODIR)/usr/include/pixman-1/pixman.h |
131 +pixman.h: $(PROTODIR)$(includedir)/pixman-1/pixman.h |
110 + cat $(PROTODIR)/usr/include/pixman-1/pixman.h | sed 's/xor/c_xor/' > $(srcdir)/pixman.h |
132 + cat $(PROTODIR)$(includedir)/pixman-1/pixman.h | sed 's/xor/c_xor/' > $(srcdir)/pixman.h |
111 |
133 |
112 fbrop.h: $(top_srcdir)/fb/fbrop.h |
134 fbrop.h: $(top_srcdir)/fb/fbrop.h |
113 cat $(top_srcdir)/fb/fbrop.h | sed -e 's,and,c_and,' -e 's,xor,c_xor,' > $(srcdir)/fbrop.h |
135 cat $(top_srcdir)/fb/fbrop.h | sed -e 's,and,c_and,' -e 's,xor,c_xor,' > $(srcdir)/fbrop.h |
114 diff -urp -x '*~' -x '*.orig' unix/xserver/hw/vnc/Xvnc.man unix/xserver/hw/vnc/Xvnc.man |
136 diff -urp -x '*~' -x '*.orig' unix/xserver/hw/vnc/Xvnc.man unix/xserver/hw/vnc/Xvnc.man |
115 --- unix/xserver/hw/vnc/Xvnc.man 2010-01-07 18:27:33.915455692 -0800 |
137 --- unix/xserver/hw/vnc/Xvnc.man 2010-01-07 18:27:33.915455692 -0800 |