open-src/xserver/xvnc/Makefile
changeset 1019 2479b048f8d0
parent 1003 a4d17d6bc179
child 1020 289eb346d944
equal deleted inserted replaced
1018:baa7bc85407b 1019:2479b048f8d0
    24 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
    24 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
    25 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
    25 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
    26 # DEALINGS IN THE SOFTWARE.
    26 # DEALINGS IN THE SOFTWARE.
    27 #
    27 #
    28 #
    28 #
       
    29 # Build 32-bit or 64-bit?
       
    30 BUILD_TYPES_SET=yes
       
    31 BUILD_TYPES_sparc=64
       
    32 BUILD_TYPES_i386=32 64
       
    33 BUILD_TYPES=$(BUILD_TYPES_$(MACH))
    29 
    34 
    30 # Package name used in tarballs
    35 # Package name used in tarballs
    31 MODULE_NAME=tigervnc
    36 MODULE_NAME=tigervnc
    32 
    37 
    33 # Package metadata
    38 # Package metadata
   109 BUILD_TARGETS_32=java_build
   114 BUILD_TARGETS_32=java_build
   110 BUILD_TARGETS=$(BUILD_TARGETS_common) $(BUILD_TARGETS_$(BUILD_TYPE))
   115 BUILD_TARGETS=$(BUILD_TARGETS_common) $(BUILD_TARGETS_$(BUILD_TYPE))
   111 BUILD_TARGETS_SET=yes
   116 BUILD_TARGETS_SET=yes
   112 INSTALL_TARGETS_common=Xvnc_install_module
   117 INSTALL_TARGETS_common=Xvnc_install_module
   113 INSTALL_TARGETS_32=Xvnc_install_programs java_install
   118 INSTALL_TARGETS_32=Xvnc_install_programs java_install
       
   119 INSTALL_TARGETS_64=Xvnc_install_programs
   114 INSTALL_TARGETS=$(INSTALL_TARGETS_common) $(INSTALL_TARGETS_$(BUILD_TYPE))
   120 INSTALL_TARGETS=$(INSTALL_TARGETS_common) $(INSTALL_TARGETS_$(BUILD_TYPE))
   115 INSTALL_TARGETS_SET=yes
   121 INSTALL_TARGETS_SET=yes
   116 
   122 
   117 # Since we only build 64-bit versions of the Xorg servers on SPARC,
   123 # Since we only build 64-bit versions of the Xorg servers on SPARC,
   118 # need to build a 32-bit version of the Xserver mdb module to allow
   124 # need to build a 32-bit version of the Xserver mdb module to allow
   119 # use with Xvnc on SPARC
   125 # use with Xvnc on SPARC
   120 BUILD_TARGETS_sparc = build_mdb
   126 BUILD_TARGETS_sparc = build_mdb
   121 BUILD_TARGETS += $(BUILD_TARGETS_$(MACH))
   127 BUILD_TARGETS += $(BUILD_TARGETS_$(MACH))
   122 INSTALL_TARGETS_sparc = install_mdb
   128 INSTALL_TARGETS_sparc = install_mdb
   123 INSTALL_TARGETS += $(INSTALL_TARGETS_$(MACH))
   129 INSTALL_TARGETS += $(INSTALL_TARGETS_$(MACH))
   124 
       
   125 # Since we only build Xvnc in 32-bit mode, don't need ARCHBINSUBDIR set
       
   126 # like in the Xorg builds
       
   127 MODULE_BUILD_32_FLAGS = ARCHBINSUBDIR=""
       
   128 
   130 
   129 # Compatibility links from /usr/X11/bin to /usr/bin
   131 # Compatibility links from /usr/X11/bin to /usr/bin
   130 MODULE_X11_BINCOMPAT_LINKS = Xvnc
   132 MODULE_X11_BINCOMPAT_LINKS = Xvnc
   131 
   133 
   132 include ../Makefile.inc
   134 include ../Makefile.inc
   224 	(cd $(XORG_BUILD_DIR)/hw/vnc \
   226 	(cd $(XORG_BUILD_DIR)/hw/vnc \
   225 	 &&  $(BUILD_ENV) $(MAKE) $(MAKEFLAGS) $(DEFAULT_INSTALL_MAKEFLAGS) \
   227 	 &&  $(BUILD_ENV) $(MAKE) $(MAKEFLAGS) $(DEFAULT_INSTALL_MAKEFLAGS) \
   226 	 CPPROG="cp -p" install)
   228 	 CPPROG="cp -p" install)
   227 
   229 
   228 Xvnc_install_programs: $(BUILD_TARGETS)
   230 Xvnc_install_programs: $(BUILD_TARGETS)
   229 	mkdir -p $(PROTODIR)/usr/bin/$(ARCHLIBSUBDIR) \
   231 	mkdir -p $(PROTODIR)/usr/bin/$(ARCHBINSUBDIR) \
   230 		$(PROTODIR)/usr/share/man/man1 \
   232 		$(PROTODIR)/usr/share/man/man1 \
   231 		$(PROTODIR)$(SMF_MANIFEST_DIR)/application/x11 
   233 		$(PROTODIR)$(SMF_MANIFEST_DIR)/application/x11 
   232 	$(INSTALL_SCRIPT) -m 0755 $(SOURCE_DIR)/unix/vncserver \
   234 	$(INSTALL_SCRIPT) -m 0755 $(SOURCE_DIR)/unix/vncserver \
   233 		$(SOURCE_DIR)/unix/vncpasswd/vncpasswd \
   235 		$(SOURCE_DIR)/unix/vncpasswd/vncpasswd \
   234 		$(SOURCE_DIR)/unix/vncconfig/vncconfig \
   236 		$(SOURCE_DIR)/unix/vncconfig/vncconfig \
   235 		$(SOURCE_DIR)/unix/vncviewer/vncviewer \
   237 		$(SOURCE_DIR)/unix/vncviewer/vncviewer \
   236 		$(SOURCE_DIR)/unix/x0vncserver/x0vncserver \
   238 		$(SOURCE_DIR)/unix/x0vncserver/x0vncserver \
   237 		$(PROTODIR)/usr/bin/$(ARCHLIBSUBDIR)
   239 		$(PROTODIR)/usr/bin/$(ARCHBINSUBDIR)
   238 	$(INSTALL_SCRIPT) -m 0444 $(SOURCE_DIR)/unix/vncserver.man \
   240 	$(INSTALL_SCRIPT) -m 0444 $(SOURCE_DIR)/unix/vncserver.man \
   239 		$(PROTODIR)/usr/share/man/man1/vncserver.1
   241 		$(PROTODIR)/usr/share/man/man1/vncserver.1
   240 	$(INSTALL_SCRIPT) -m 0444 $(SOURCE_DIR)/unix/vncconfig/vncconfig.man \
   242 	$(INSTALL_SCRIPT) -m 0444 $(SOURCE_DIR)/unix/vncconfig/vncconfig.man \
   241 		$(PROTODIR)/usr/share/man/man1/vncconfig.1
   243 		$(PROTODIR)/usr/share/man/man1/vncconfig.1
   242 	$(INSTALL_SCRIPT) -m 0444 $(SOURCE_DIR)/unix/vncpasswd/vncpasswd.man \
   244 	$(INSTALL_SCRIPT) -m 0444 $(SOURCE_DIR)/unix/vncpasswd/vncpasswd.man \