24 --- common/rfb/Makefile.am 2009-08-20 02:46:42.000000000 -0700 |
24 --- common/rfb/Makefile.am 2009-08-20 02:46:42.000000000 -0700 |
25 +++ common/rfb/Makefile.am 2010-01-07 18:27:36.001256905 -0800 |
25 +++ common/rfb/Makefile.am 2010-01-07 18:27:36.001256905 -0800 |
26 @@ -42,7 +42,7 @@ librfb_la_SOURCES = $(HDRS) Blacklist.cx |
26 @@ -42,7 +42,7 @@ librfb_la_SOURCES = $(HDRS) Blacklist.cx |
27 secTypes.cxx util.cxx |
27 secTypes.cxx util.cxx |
28 |
28 |
29 librfb_la_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/../win |
29 librfb_la_CPPFLAGS = -I$(top_srcdir)/common -I$(top_srcdir)/win |
30 -librfb_la_LIBADD = |
30 -librfb_la_LIBADD = @GNUTLS_LIBS@ |
31 +librfb_la_LIBADD = $(LIBS) |
31 +librfb_la_LIBADD = @GNUTLS_LIBS@ $(LIBS) |
32 |
32 |
33 if INCLUDED_JPEG |
33 if INCLUDED_JPEG |
34 librfb_la_CPPFLAGS += -I$(top_srcdir)/jpeg |
34 librfb_la_CPPFLAGS += -I$(top_srcdir)/jpeg |
35 diff -urp -x '*~' -x '*.orig' unix/vncserver unix/vncserver |
35 diff -urp -x '*~' -x '*.orig' unix/vncserver unix/vncserver |
36 --- unix/vncserver 2010-01-07 18:27:33.839953181 -0800 |
36 --- unix/vncserver 2010-01-07 18:27:33.839953181 -0800 |
57 + " exec /usr/dt/config/Xsession.jds\n". |
57 + " exec /usr/dt/config/Xsession.jds\n". |
58 + "fi\n". |
58 + "fi\n". |
59 "[ -r \$HOME/.Xresources ] && xrdb \$HOME/.Xresources\n". |
59 "[ -r \$HOME/.Xresources ] && xrdb \$HOME/.Xresources\n". |
60 "xsetroot -solid grey\n". |
60 "xsetroot -solid grey\n". |
61 "xterm -geometry 80x24+10+10 -ls -title \"\$VNCDESKTOP Desktop\" &\n". |
61 "xterm -geometry 80x24+10+10 -ls -title \"\$VNCDESKTOP Desktop\" &\n". |
62 diff -urp -x '*~' -x '*.orig' unix/vncviewer/Makefile.am unix/vncviewer/Makefile.am |
|
63 --- unix/vncviewer/Makefile.am 2009-08-20 02:46:42.000000000 -0700 |
|
64 +++ unix/vncviewer/Makefile.am 2010-01-07 18:27:36.001729152 -0800 |
|
65 @@ -13,6 +13,7 @@ vncviewer_CPPFLAGS = -I$(COMMON_DIR) -I$ |
|
66 |
|
67 vncviewer_LDADD = $(top_srcdir)/tx/libtx.la $(COMMON_DIR)/rfb/librfb.la \ |
|
68 $(COMMON_DIR)/network/libnetwork.la $(COMMON_DIR)/rdr/librdr.la \ |
|
69 + -ljpeg -lz \ |
|
70 @X_PRE_LIBS@ @X_LIBS@ -lXext -lX11 @X_EXTRA_LIBS@ # @LIBINTL@ |
|
71 |
|
72 EXTRA_DIST = vncviewer.man |
|
73 diff -urp -x '*~' -x '*.orig' unix/x0vncserver/Makefile.am unix/x0vncserver/Makefile.am |
|
74 --- unix/x0vncserver/Makefile.am 2009-08-20 02:46:42.000000000 -0700 |
|
75 +++ unix/x0vncserver/Makefile.am 2010-01-07 18:27:36.001861492 -0800 |
|
76 @@ -15,6 +15,7 @@ x0vncserver_CPPFLAGS = -I$(COMMON_DIR) - |
|
77 @MITSHM_DEFINE@ @X_CFLAGS@ |
|
78 |
|
79 x0vncserver_LDADD = $(COMMON_DIR)/rfb/librfb.la \ |
|
80 + -ljpeg -lz \ |
|
81 $(COMMON_DIR)/network/libnetwork.la $(COMMON_DIR)/rdr/librdr.la \ |
|
82 $(top_srcdir)/tx/libtx.la @INET_LIB@ @X_PRE_LIBS@ @X_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 |
62 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 |
63 --- 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 |
64 +++ unix/xserver/hw/vnc/Makefile.am 2010-01-07 18:27:36.002105937 -0800 |
87 @@ -17,7 +17,7 @@ |
65 @@ -17,7 +17,7 @@ |
88 |
66 |
89 libvnccommon_la_CPPFLAGS = -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \ |
67 libvnccommon_la_CPPFLAGS = -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \ |
90 -DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(LIB_DIR) \ |
68 -DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(TIGERVNC_SRCDIR)/common -UHAVE_CONFIG_H \ |
91 - -I$(BIN_DIR)/vncconfig $(XVNC_CPPFLAGS) -I$(includedir)/pixman-1 -I$(includedir) |
69 - -I$(TIGERVNC_SRCDIR)/unix/vncconfig $(XVNC_CPPFLAGS) -I$(includedir)/pixman-1 -I$(includedir) |
92 + -I$(BIN_DIR)/vncconfig $(XVNC_CPPFLAGS) $(PIXMAN_CFLAGS) |
70 + -I$(TIGERVNC_SRCDIR)/unix/vncconfig $(XVNC_CPPFLAGS) $(PIXMAN_CFLAGS) -I$(includedir) |
93 |
71 |
94 bin_PROGRAMS = Xvnc |
72 bin_PROGRAMS = Xvnc |
95 |
73 |
96 @@ -32,10 +32,17 @@ Xvnc_CPPFLAGS = $(XVNC_CPPFLAGS) -DNO_HW |
74 @@ -32,10 +32,17 @@ Xvnc_CPPFLAGS = $(XVNC_CPPFLAGS) -DNO_HW |
97 Xvnc_CPPFLAGS = $(XVNC_CPPFLAGS) -DNO_HW_ONLY_EXTS -DNO_MODULE_EXTS \ |
75 Xvnc_CPPFLAGS = $(XVNC_CPPFLAGS) -DNO_HW_ONLY_EXTS -DNO_MODULE_EXTS -UHAVE_CONFIG_H \ |
98 -DXFree86Server -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \ |
76 -DXFree86Server -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \ |
99 -DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(LIB_DIR) \ |
77 -DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(TIGERVNC_SRCDIR)/common \ |
100 - -I$(top_srcdir)/include -I$(includedir)/pixman-1 -I$(includedir) |
78 - -I$(top_srcdir)/include -I$(includedir)/pixman-1 -I$(includedir) |
101 + -I$(top_srcdir)/include $(PIXMAN_CFLAGS) |
79 + -I$(top_srcdir)/include $(PIXMAN_CFLAGS) |
102 + |
80 + |
103 +if BUILD_TSOL_MODULE |
81 +if BUILD_TSOL_MODULE |
104 +TSOL_LIBS = ../../tsol/libxtsol.la |
82 +TSOL_LIBS = ../../tsol/libxtsol.la |