author | Alan Coopersmith <Alan.Coopersmith@Oracle.COM> |
Wed, 05 May 2010 14:06:42 -0700 | |
changeset 947 | ef9da9d336f5 |
parent 935 | f812f9863e75 |
child 949 | bb628c4ae116 |
permissions | -rw-r--r-- |
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
1 |
############################################################################### |
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
2 |
# |
822
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
3 |
# TigerVNC (Xvnc server & vncviewer) Makefile |
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
4 |
# Based on Fedora's tigervnc.spec revision 1.20 from |
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
5 |
# http://cvs.fedoraproject.org/viewvc/rpms/tigervnc/devel/tigervnc.spec |
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
6 |
# |
935
f812f9863e75
6941861 Collected X gate build fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
922
diff
changeset
|
7 |
# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. |
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
8 |
# |
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
9 |
# Permission is hereby granted, free of charge, to any person obtaining a |
919
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
916
diff
changeset
|
10 |
# copy of this software and associated documentation files (the "Software"), |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
916
diff
changeset
|
11 |
# to deal in the Software without restriction, including without limitation |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
916
diff
changeset
|
12 |
# the rights to use, copy, modify, merge, publish, distribute, sublicense, |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
916
diff
changeset
|
13 |
# and/or sell copies of the Software, and to permit persons to whom the |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
916
diff
changeset
|
14 |
# Software is furnished to do so, subject to the following conditions: |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
916
diff
changeset
|
15 |
# |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
916
diff
changeset
|
16 |
# The above copyright notice and this permission notice (including the next |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
916
diff
changeset
|
17 |
# paragraph) shall be included in all copies or substantial portions of the |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
916
diff
changeset
|
18 |
# Software. |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
916
diff
changeset
|
19 |
# |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
916
diff
changeset
|
20 |
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
916
diff
changeset
|
21 |
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
916
diff
changeset
|
22 |
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
916
diff
changeset
|
23 |
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
916
diff
changeset
|
24 |
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
916
diff
changeset
|
25 |
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
916
diff
changeset
|
26 |
# DEALINGS IN THE SOFTWARE. |
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
27 |
# |
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
28 |
# |
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
29 |
|
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
30 |
# Package name used in tarballs |
822
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
31 |
MODULE_NAME=tigervnc |
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
32 |
|
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
33 |
# Version number (used in path names) |
822
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
34 |
MODULE_VERSION=1.0.0 |
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
35 |
|
911
a3e7e197651c
6929667 Automate downloading and verification of tarballs used to build X gate
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
907
diff
changeset
|
36 |
# Checksums for upstream tarball |
a3e7e197651c
6929667 Automate downloading and verification of tarballs used to build X gate
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
907
diff
changeset
|
37 |
TARBALL_MD5 = 622c6689a66651419b5431efdee99d5a |
a3e7e197651c
6929667 Automate downloading and verification of tarballs used to build X gate
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
907
diff
changeset
|
38 |
TARBALL_SHA1 = 2435ea2e3c34a4055350f7680a94cea580b92979 |
a3e7e197651c
6929667 Automate downloading and verification of tarballs used to build X gate
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
907
diff
changeset
|
39 |
|
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
40 |
# Source tarball |
493
f43507b5737d
6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
480
diff
changeset
|
41 |
SOURCE_TARBALL_NAME=$(MODULE_NAME)-$(MODULE_VERSION).tar.gz |
f43507b5737d
6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
480
diff
changeset
|
42 |
SOURCE_TARBALL_NAME_SET=yes |
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
43 |
|
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
44 |
# Xorg server source tarball to use sources from |
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
45 |
XORG_TARBALL=$(TARBALLDIR)/xorg-server-$(XORGSERVER_VERS).tar.bz2 |
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
46 |
XORG_SOURCE_DIR=$(BUILD_DIR)/xorg-server-$(XORGSERVER_VERS) |
822
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
47 |
XORG_BUILD_DIR=$(SOURCE_DIR)/unix/xserver |
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
48 |
|
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
49 |
# Download site for source |
822
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
50 |
SOURCE_URL=$(SF_DOWNLOADS_URL)/project/tigervnc/tigervnc/$(MODULE_VERSION)/$(SOURCE_TARBALL_NAME) |
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
51 |
SOURCE_URL_SET=yes |
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
52 |
SOURCE_UNCOMPRESS=gzcat |
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
53 |
|
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
54 |
# Patches to apply to source after unpacking, in order |
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
55 |
SOURCE_PATCHES = \ |
851
d428083dbbdd
6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
822
diff
changeset
|
56 |
upstream-xorg-version.patch,-p1 \ |
d428083dbbdd
6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
822
diff
changeset
|
57 |
upstream-input-refactor.patch,-p1 \ |
d428083dbbdd
6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
822
diff
changeset
|
58 |
tigervnc-port-to-1.7.patch \ |
d428083dbbdd
6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
822
diff
changeset
|
59 |
tigervnc-xserver17.patch \ |
822
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
60 |
vnc-samemachine-ipv6.patch,-p1 \ |
851
d428083dbbdd
6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
822
diff
changeset
|
61 |
c++public.patch,-p1 \ |
d428083dbbdd
6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
822
diff
changeset
|
62 |
vncserver-urandom.patch,-p1 \ |
822
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
63 |
vnc-nobuildtime.patch \ |
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
64 |
vnc-nohttpd.patch \ |
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
65 |
vncviewer-connect.patch,-p1 \ |
865
2830e8bf613b
6911361 vnc has problems with sticky modifier keys
Stuart Kreitman <Stuart.Kreitman@Sun.COM>
parents:
851
diff
changeset
|
66 |
upstream-modkeystick.patch,-p0 \ |
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
67 |
solaris-port.patch |
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
68 |
|
947
ef9da9d336f5
6950022 X man page cleanups
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
935
diff
changeset
|
69 |
|
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
70 |
# Man pages to apply Sun footer to & attributes to list |
247
eec255d17972
6616573 Ship RealVNC vncviewer in Solaris [LSARC 2007/625]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
241
diff
changeset
|
71 |
SUNTOUCHED_MANPAGES= \ |
947
ef9da9d336f5
6950022 X man page cleanups
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
935
diff
changeset
|
72 |
unix/xserver/hw/vnc/Xvnc.man unix/vncviewer/vncviewer.man \ |
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
73 |
unix/vncconfig/vncconfig.man unix/vncpasswd/vncpasswd.man \ |
247
eec255d17972
6616573 Ship RealVNC vncviewer in Solaris [LSARC 2007/625]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
241
diff
changeset
|
74 |
unix/vncserver.man unix/x0vncserver/x0vncserver.man |
947
ef9da9d336f5
6950022 X man page cleanups
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
935
diff
changeset
|
75 |
SUN_PACKAGE = SUNWxvnc |
ef9da9d336f5
6950022 X man page cleanups
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
935
diff
changeset
|
76 |
MODULE_STABILITY = Volatile |
ef9da9d336f5
6950022 X man page cleanups
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
935
diff
changeset
|
77 |
|
ef9da9d336f5
6950022 X man page cleanups
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
935
diff
changeset
|
78 |
# Additional package name used for vncviewer package |
ef9da9d336f5
6950022 X man page cleanups
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
935
diff
changeset
|
79 |
VNCVIEWER_PKGNAME=SUNWvncviewer |
ef9da9d336f5
6950022 X man page cleanups
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
935
diff
changeset
|
80 |
|
ef9da9d336f5
6950022 X man page cleanups
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
935
diff
changeset
|
81 |
# Override specific attributes for specific man pages |
ef9da9d336f5
6950022 X man page cleanups
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
935
diff
changeset
|
82 |
MODULE_SUNTOUCH_MAN_FLAGS= \ |
ef9da9d336f5
6950022 X man page cleanups
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
935
diff
changeset
|
83 |
$(SUNTOUCH_MAN_FLAGS_$(@F:%.man.$(FIXED_MAN_SUFFIX)=%)) |
ef9da9d336f5
6950022 X man page cleanups
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
935
diff
changeset
|
84 |
SUNTOUCH_MAN_FLAGS_vncviewer = -o '{Availability, $(VNCVIEWER_PKGNAME)}' \ |
ef9da9d336f5
6950022 X man page cleanups
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
935
diff
changeset
|
85 |
-o '{Interface Stability, Path: Committed, Options: Volatile}' |
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
86 |
|
241
30e6f29a3171
6624562 Xvnc should be built with Sun Studio
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
235
diff
changeset
|
87 |
# Compiler to use |
493
f43507b5737d
6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
480
diff
changeset
|
88 |
MODULE_COMPILER=suncc |
f43507b5737d
6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
480
diff
changeset
|
89 |
MODULE_COMPILER_SET=yes |
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
90 |
|
493
f43507b5737d
6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
480
diff
changeset
|
91 |
# Xvnc has to configure, build, and install in different directories due to |
f43507b5737d
6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
480
diff
changeset
|
92 |
# the mixed codebases and unusual directory layout |
947
ef9da9d336f5
6950022 X man page cleanups
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
935
diff
changeset
|
93 |
MODULE_ADD_SOURCE_TARGETS=Xvnc_source_init |
ef9da9d336f5
6950022 X man page cleanups
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
935
diff
changeset
|
94 |
MODULE_SOURCE_DEPS = Xvnc_source_init |
493
f43507b5737d
6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
480
diff
changeset
|
95 |
CONFIGURE_TARGETS=$(SOURCE_DIR)/unix/Makefile $(XORG_BUILD_DIR)/Makefile |
f43507b5737d
6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
480
diff
changeset
|
96 |
CONFIGURE_TARGETS_SET=yes |
822
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
97 |
BUILD_TARGETS_common=Xvnc_build set-elf-comments |
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
98 |
BUILD_TARGETS_32=java_build |
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
99 |
BUILD_TARGETS=$(BUILD_TARGETS_common) $(BUILD_TARGETS_$(BUILD_TYPE)) |
493
f43507b5737d
6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
480
diff
changeset
|
100 |
BUILD_TARGETS_SET=yes |
822
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
101 |
INSTALL_TARGETS_common=Xvnc_install_module |
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
102 |
INSTALL_TARGETS_32=Xvnc_install_programs java_install |
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
103 |
INSTALL_TARGETS=$(INSTALL_TARGETS_common) $(INSTALL_TARGETS_$(BUILD_TYPE)) |
493
f43507b5737d
6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
480
diff
changeset
|
104 |
INSTALL_TARGETS_SET=yes |
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
105 |
|
916
a2113251a45c
6928167 Integrate X server mdb module into xorg-server build & packages (fix SPARC build)
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
911
diff
changeset
|
106 |
# Since we only build 64-bit versions of the Xorg servers on SPARC, |
a2113251a45c
6928167 Integrate X server mdb module into xorg-server build & packages (fix SPARC build)
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
911
diff
changeset
|
107 |
# need to build a 32-bit version of the Xserver mdb module to allow |
a2113251a45c
6928167 Integrate X server mdb module into xorg-server build & packages (fix SPARC build)
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
911
diff
changeset
|
108 |
# use with Xvnc on SPARC |
a2113251a45c
6928167 Integrate X server mdb module into xorg-server build & packages (fix SPARC build)
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
911
diff
changeset
|
109 |
BUILD_TARGETS_sparc = build_mdb |
a2113251a45c
6928167 Integrate X server mdb module into xorg-server build & packages (fix SPARC build)
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
911
diff
changeset
|
110 |
BUILD_TARGETS += $(BUILD_TARGETS_$(MACH)) |
a2113251a45c
6928167 Integrate X server mdb module into xorg-server build & packages (fix SPARC build)
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
911
diff
changeset
|
111 |
INSTALL_TARGETS_sparc = install_mdb |
a2113251a45c
6928167 Integrate X server mdb module into xorg-server build & packages (fix SPARC build)
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
911
diff
changeset
|
112 |
INSTALL_TARGETS += $(INSTALL_TARGETS_$(MACH)) |
a2113251a45c
6928167 Integrate X server mdb module into xorg-server build & packages (fix SPARC build)
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
911
diff
changeset
|
113 |
|
822
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
114 |
include ../Makefile.inc |
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
115 |
|
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
116 |
# Merge in additional sources from Xorg tarball & sun-src directory |
822
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
117 |
# This step has to be done before default_source, so that patches applied |
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
118 |
# in that step work correctly. |
935
f812f9863e75
6941861 Collected X gate build fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
922
diff
changeset
|
119 |
XORG_SOURCE_INIT_TARGET = $(XORG_BUILD_DIR)/$(SOURCE_INIT_TARGET_FILE) |
f812f9863e75
6941861 Collected X gate build fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
922
diff
changeset
|
120 |
XORG_PATCHED_TARGET = $(XORG_BUILD_DIR)/$(PATCHED_TARGET_FILE) |
f812f9863e75
6941861 Collected X gate build fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
922
diff
changeset
|
121 |
Xvnc_source_init: $(XORG_PATCHED_TARGET) |
f812f9863e75
6941861 Collected X gate build fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
922
diff
changeset
|
122 |
|
f812f9863e75
6941861 Collected X gate build fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
922
diff
changeset
|
123 |
$(XORG_TARBALL): |
f812f9863e75
6941861 Collected X gate build fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
922
diff
changeset
|
124 |
(cd ../xorg && $(MAKE) $(MAKEFLAGS) download) |
f812f9863e75
6941861 Collected X gate build fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
922
diff
changeset
|
125 |
|
f812f9863e75
6941861 Collected X gate build fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
922
diff
changeset
|
126 |
$(XORG_SOURCE_INIT_TARGET): $(XORG_TARBALL) |
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
127 |
mkdir -p $(SOURCE_DIR)/unix |
935
f812f9863e75
6941861 Collected X gate build fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
922
diff
changeset
|
128 |
$(MAKE) $(MAKEFLAGS) init_source \ |
f812f9863e75
6941861 Collected X gate build fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
922
diff
changeset
|
129 |
SOURCE_TARBALL="$(XORG_TARBALL)" \ |
f812f9863e75
6941861 Collected X gate build fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
922
diff
changeset
|
130 |
SOURCE_UNCOMPRESS="bzcat" \ |
f812f9863e75
6941861 Collected X gate build fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
922
diff
changeset
|
131 |
SOURCE_DIR="$(XORG_SOURCE_DIR)" |
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
132 |
mv $(XORG_SOURCE_DIR) $(XORG_BUILD_DIR) |
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
133 |
(cd $(XORG_BUILD_DIR) && $(LNDIR) ../../../../../xorg/sun-src) |
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
134 |
|
935
f812f9863e75
6941861 Collected X gate build fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
922
diff
changeset
|
135 |
$(XORG_PATCHED_TARGET): $(XORG_SOURCE_INIT_TARGET) |
f812f9863e75
6941861 Collected X gate build fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
922
diff
changeset
|
136 |
$(MAKE) $(MAKEFLAGS) patched_source \ |
f812f9863e75
6941861 Collected X gate build fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
922
diff
changeset
|
137 |
SOURCE_PATCHES="$(XORG_SOURCE_PATCHES:%=../xorg/%)" \ |
f812f9863e75
6941861 Collected X gate build fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
922
diff
changeset
|
138 |
SOURCE_DIR="$(XORG_BUILD_DIR)" |
f812f9863e75
6941861 Collected X gate build fixes
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
922
diff
changeset
|
139 |
|
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
140 |
|
493
f43507b5737d
6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
480
diff
changeset
|
141 |
# Command line options to GNU autoconf configure script for vnc clients |
f43507b5737d
6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
480
diff
changeset
|
142 |
VNC_CONFIG_OPTS= --with-installed-zlib --prefix=/usr \ |
f43507b5737d
6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
480
diff
changeset
|
143 |
--mandir='$${prefix}/share/man' --libdir='$${exec_prefix}/lib/vnc' \ |
851
d428083dbbdd
6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
822
diff
changeset
|
144 |
--localstatedir=/var --with-system-jpeg --without-simd |
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
145 |
|
493
f43507b5737d
6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
480
diff
changeset
|
146 |
# Command line options to GNU autoconf configure script for Xvnc |
f43507b5737d
6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
480
diff
changeset
|
147 |
XVNC_CONFIG_OPTS = $(DEFAULT_CONFIG_OPTS) $(XSERVER_CONFIG_OPTS) \ |
822
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
148 |
--disable-builddocs --without-int10 \ |
606
068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
599
diff
changeset
|
149 |
--disable-dga --disable-xfree86-utils --disable-config-hal \ |
822
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
150 |
--disable-xorg --disable-xnest --disable-xvfb --disable-dmx \ |
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
151 |
--disable-xwin --disable-xephyr --disable-kdrive |
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
152 |
|
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
153 |
|
493
f43507b5737d
6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
480
diff
changeset
|
154 |
MODULE_CPPFLAGS = \ |
822
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
155 |
-D_XOPEN_SOURCE=500 -D__EXTENSIONS__ \ |
241
30e6f29a3171
6624562 Xvnc should be built with Sun Studio
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
235
diff
changeset
|
156 |
-D__extension__=\"\" \ |
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
157 |
-I$(PWD)/$(SOURCE_DIR)/common \ |
493
f43507b5737d
6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
480
diff
changeset
|
158 |
-I$(PWD)/$(SOURCE_DIR)/unix/vncconfig |
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
159 |
|
493
f43507b5737d
6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
480
diff
changeset
|
160 |
CFLAGS_gcc += -fPIC |
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
161 |
|
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
162 |
# Environment variable options to GNU autoconf configure script |
493
f43507b5737d
6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
480
diff
changeset
|
163 |
XVNC_CONFIG_ENV = LIBS="-lsocket -lnsl" \ |
f43507b5737d
6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
480
diff
changeset
|
164 |
LDFLAGS="$(DEFAULT_CONFIG_LDFLAGS) $(MODTYPE_LDFLAGS) $(MODULE_LDFLAGS)" |
f43507b5737d
6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
480
diff
changeset
|
165 |
CONFIG_ENV += $(XVNC_CONFIG_ENV) |
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
166 |
|
454
1b3bd10d7087
6704555 SUNWvncviewer RUNPATH issue with snv_89
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
387
diff
changeset
|
167 |
LDPATH_ADDITIONS_sparc = \ |
1b3bd10d7087
6704555 SUNWvncviewer RUNPATH issue with snv_89
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
387
diff
changeset
|
168 |
-L$(PROTODIR)$(X11_SERVERMODS_DIR)/extensions$(ARCHLIBSUBDIR) \ |
1b3bd10d7087
6704555 SUNWvncviewer RUNPATH issue with snv_89
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
387
diff
changeset
|
169 |
-R$(X11_SERVERMODS_DIR)/extensions$(ARCHLIBSUBDIR) |
1b3bd10d7087
6704555 SUNWvncviewer RUNPATH issue with snv_89
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
387
diff
changeset
|
170 |
LDPATH_ADDITIONS_i386 = \ |
1b3bd10d7087
6704555 SUNWvncviewer RUNPATH issue with snv_89
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
387
diff
changeset
|
171 |
-L$(PROTODIR)$(X11_SERVERMODS_DIR)/extensions$(ARCHLIBSUBDIR) \ |
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
172 |
-R$(X11_SERVERMODS_DIR)/extensions$(ARCHLIBSUBDIR) |
454
1b3bd10d7087
6704555 SUNWvncviewer RUNPATH issue with snv_89
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
387
diff
changeset
|
173 |
LDPATH_ADDITIONS=$(LDPATH_ADDITIONS_$(MACH)) |
1b3bd10d7087
6704555 SUNWvncviewer RUNPATH issue with snv_89
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
387
diff
changeset
|
174 |
|
493
f43507b5737d
6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
480
diff
changeset
|
175 |
MODULE_LDFLAGS = $(LDPATH_ADDITIONS) |
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
176 |
|
606
068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
599
diff
changeset
|
177 |
# Needed by unix/xorg-x11-server-source/hw/vnc/Makefile.am to find libpixman |
068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
599
diff
changeset
|
178 |
# headers in proto area after solaris-port.patch is applied |
068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
599
diff
changeset
|
179 |
MODULE_MAKEFLAGS = PROTODIR=$(PROTODIR) |
068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
599
diff
changeset
|
180 |
|
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
181 |
# Run configure scripts for vnc sources |
922
db66e53f0c94
6933880 Simplify building the same X workspace on sparc & x86
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
919
diff
changeset
|
182 |
$(SOURCE_DIR)/unix/Makefile: $(SOURCE_TARGETS) |
599
c195ef96916e
6787756 Use Solaris-bundled GNU tools where possible, instead of JDS CBE, when building X
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
591
diff
changeset
|
183 |
(cd $(SOURCE_DIR)/common && \ |
c195ef96916e
6787756 Use Solaris-bundled GNU tools where possible, instead of JDS CBE, when building X
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
591
diff
changeset
|
184 |
$(AUTORECONF_ENV) autoreconf --install --force && \ |
493
f43507b5737d
6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
480
diff
changeset
|
185 |
$(CONFIG_ENV) $(SHELL) ./configure $(VNC_CONFIG_OPTS) ) |
599
c195ef96916e
6787756 Use Solaris-bundled GNU tools where possible, instead of JDS CBE, when building X
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
591
diff
changeset
|
186 |
(cd $(SOURCE_DIR)/unix && \ |
c195ef96916e
6787756 Use Solaris-bundled GNU tools where possible, instead of JDS CBE, when building X
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
591
diff
changeset
|
187 |
$(AUTORECONF_ENV) autoreconf --install --force && \ |
493
f43507b5737d
6735203 open-src Makefile cleanup & enhancements
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
480
diff
changeset
|
188 |
$(CONFIG_ENV) $(SHELL) ./configure $(VNC_CONFIG_OPTS) ) |
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
189 |
|
822
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
190 |
|
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
191 |
# Run configure script for Xvnc |
922
db66e53f0c94
6933880 Simplify building the same X workspace on sparc & x86
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
919
diff
changeset
|
192 |
$(XORG_BUILD_DIR)/Makefile: $(SOURCE_TARGETS) |
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
193 |
(cd $(XORG_BUILD_DIR) && \ |
599
c195ef96916e
6787756 Use Solaris-bundled GNU tools where possible, instead of JDS CBE, when building X
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
591
diff
changeset
|
194 |
$(AUTORECONF_ENV) autoreconf --install --force && \ |
c195ef96916e
6787756 Use Solaris-bundled GNU tools where possible, instead of JDS CBE, when building X
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
591
diff
changeset
|
195 |
$(CONFIG_ENV) $(SHELL) ./configure $(XVNC_CONFIG_OPTS) ) |
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
196 |
|
822
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
197 |
Xvnc_build: $(CONFIGURE_TARGETS) |
606
068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
599
diff
changeset
|
198 |
(cd $(SOURCE_DIR)/unix ; \ |
068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
599
diff
changeset
|
199 |
$(BUILD_ENV) $(MAKE) $(MAKEFLAGS) $(DEFAULT_BUILD_MAKEFLAGS)) |
068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
599
diff
changeset
|
200 |
(cd $(XORG_BUILD_DIR) ; \ |
068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
599
diff
changeset
|
201 |
$(BUILD_ENV) $(MAKE) $(MAKEFLAGS) $(DEFAULT_BUILD_MAKEFLAGS)) |
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
202 |
|
822
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
203 |
Xvnc_install_module: $(BUILD_TARGETS) |
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
204 |
(cd $(XORG_BUILD_DIR)/hw/vnc \ |
606
068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
599
diff
changeset
|
205 |
&& $(BUILD_ENV) $(MAKE) $(MAKEFLAGS) $(DEFAULT_INSTALL_MAKEFLAGS) \ |
068c11b419c9
6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
599
diff
changeset
|
206 |
CPPROG="cp -p" install) |
822
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
207 |
|
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
208 |
Xvnc_install_programs: $(BUILD_TARGETS) |
247
eec255d17972
6616573 Ship RealVNC vncviewer in Solaris [LSARC 2007/625]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
241
diff
changeset
|
209 |
mkdir -p $(PROTODIR)/usr/bin/$(ARCHLIBSUBDIR) \ |
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
210 |
$(PROTODIR)/usr/share/man/man1 \ |
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
211 |
$(PROTODIR)/var/svc/manifest/application/x11 |
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
212 |
cp -pf $(SOURCE_DIR)/unix/vncserver \ |
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
213 |
$(SOURCE_DIR)/unix/vncpasswd/vncpasswd \ |
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
214 |
$(SOURCE_DIR)/unix/vncconfig/vncconfig \ |
247
eec255d17972
6616573 Ship RealVNC vncviewer in Solaris [LSARC 2007/625]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
241
diff
changeset
|
215 |
$(SOURCE_DIR)/unix/vncviewer/vncviewer \ |
822
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
216 |
$(SOURCE_DIR)/unix/x0vncserver/x0vncserver \ |
247
eec255d17972
6616573 Ship RealVNC vncviewer in Solaris [LSARC 2007/625]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
241
diff
changeset
|
217 |
$(PROTODIR)/usr/bin/$(ARCHLIBSUBDIR) |
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
218 |
cp -pf $(SOURCE_DIR)/unix/vncserver.man \ |
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
219 |
$(PROTODIR)/usr/share/man/man1/vncserver.1 |
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
220 |
cp -pf $(SOURCE_DIR)/unix/vncconfig/vncconfig.man \ |
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
221 |
$(PROTODIR)/usr/share/man/man1/vncconfig.1 |
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
222 |
cp -pf $(SOURCE_DIR)/unix/vncpasswd/vncpasswd.man \ |
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
223 |
$(PROTODIR)/usr/share/man/man1/vncpasswd.1 |
247
eec255d17972
6616573 Ship RealVNC vncviewer in Solaris [LSARC 2007/625]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
241
diff
changeset
|
224 |
cp -pf $(SOURCE_DIR)/unix/vncviewer/vncviewer.man \ |
eec255d17972
6616573 Ship RealVNC vncviewer in Solaris [LSARC 2007/625]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
241
diff
changeset
|
225 |
$(PROTODIR)/usr/share/man/man1/vncviewer.1 |
822
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
226 |
cp -pf $(SOURCE_DIR)/unix/x0vncserver/x0vncserver.man \ |
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
227 |
$(PROTODIR)/usr/share/man/man1/x0vncserver.1 |
235
06772554f851
6572087 ship Xvnc for Solaris [PSARC/2007/545]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
228 |
cp -pf xvnc-inetd.xml $(PROTODIR)/var/svc/manifest/application/x11/ |
822
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
229 |
|
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
230 |
# Java VNCviewer applet for connecting from a web browser |
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
231 |
JAVA_SOURCE_DIR = $(SOURCE_DIR)/java/src |
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
232 |
JAVA_INSTALL_DIR = $(PROTODIR)/usr/share/vnc/classes |
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
233 |
JAVA_JAR_FILE = $(JAVA_SOURCE_DIR)/VncViewer.jar |
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
234 |
|
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
235 |
# Temporary special handling of Java build fix submitted upstream |
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
236 |
JAVA_MAKEFILE = $(JAVA_SOURCE_DIR)/Makefile |
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
237 |
BUILD_TARGETS += $(JAVA_MAKEFILE) |
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
238 |
|
922
db66e53f0c94
6933880 Simplify building the same X workspace on sparc & x86
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
919
diff
changeset
|
239 |
$(JAVA_MAKEFILE): $(SOURCE_TARGETS) |
822
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
240 |
cp $(JAVA_SOURCE_DIR)/com/tigervnc/vncviewer/Makefile $@ |
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
241 |
gpatch -d $(SOURCE_DIR) -p0 < applet-build.patch |
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
242 |
gpatch -d $(SOURCE_DIR) -p0 < icon.patch |
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
243 |
cp tigervnc_16.gif $(JAVA_SOURCE_DIR) |
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
244 |
|
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
245 |
java_build: $(JAVA_JAR_FILE) |
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
246 |
|
922
db66e53f0c94
6933880 Simplify building the same X workspace on sparc & x86
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
919
diff
changeset
|
247 |
$(JAVA_JAR_FILE): $(SOURCE_TARGETS) $(JAVA_MAKEFILE) |
822
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
248 |
(cd $(JAVA_SOURCE_DIR) ; \ |
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
249 |
$(BUILD_ENV) $(MAKE) $(MAKEFLAGS) $(DEFAULT_BUILD_MAKEFLAGS)) |
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
250 |
|
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
251 |
java_install: $(JAVA_JAR_FILE) |
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
252 |
-rm -rf $(JAVA_INSTALL_DIR) |
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
253 |
mkdir -p $(JAVA_INSTALL_DIR) |
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
254 |
(cd $(JAVA_SOURCE_DIR) ; \ |
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
255 |
$(BUILD_ENV) $(MAKE) $(MAKEFLAGS) $(DEFAULT_BUILD_MAKEFLAGS) \ |
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
256 |
install INSTALL_DIR=$(JAVA_INSTALL_DIR)) |
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
257 |
cp -pf $(JAVA_SOURCE_DIR)/com/tigervnc/vncviewer/README \ |
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
258 |
$(JAVA_SOURCE_DIR)/com/tigervnc/vncviewer/LICENCE.TXT \ |
2a89ea3c59be
6898535 Upgrade VNC from RealVNC 4.1.3 to TigerVNC 1.0 [PSARC/2009/592]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
810
diff
changeset
|
259 |
$(JAVA_INSTALL_DIR) |