equal
deleted
inserted
replaced
28 # Except as contained in this notice, the name of a copyright holder |
28 # Except as contained in this notice, the name of a copyright holder |
29 # shall not be used in advertising or otherwise to promote the sale, use |
29 # shall not be used in advertising or otherwise to promote the sale, use |
30 # or other dealings in this Software without prior written authorization |
30 # or other dealings in this Software without prior written authorization |
31 # of the copyright holder. |
31 # of the copyright holder. |
32 # |
32 # |
33 # @(#)Makefile 1.70 08/11/18 |
33 # @(#)Makefile 1.71 08/11/26 |
34 # |
34 # |
35 |
35 |
36 # Build 32-bit or 64-bit? |
36 # Build 32-bit or 64-bit? |
37 BUILD_TYPES_SET=yes |
37 BUILD_TYPES_SET=yes |
38 BUILD_TYPES_sparc=64 |
38 BUILD_TYPES_sparc=64 |
73 MODULE_COMPILER_SET=yes |
73 MODULE_COMPILER_SET=yes |
74 |
74 |
75 # Binary built in tree |
75 # Binary built in tree |
76 XORGSERVER_BIN=$(SOURCE_DIR)/hw/xfree86/Xorg |
76 XORGSERVER_BIN=$(SOURCE_DIR)/hw/xfree86/Xorg |
77 |
77 |
78 BUILD_TARGETS=fix-xf1bpp $(XORGSERVER_BIN) $(BUILD_DIR)/mapfile-Xorg-externs |
78 BUILD_TARGETS=fix-xf1bpp $(XORGSERVER_BIN) set-elf-comments \ |
|
79 $(BUILD_DIR)/mapfile-Xorg-externs |
79 BUILD_TARGETS_SET=yes |
80 BUILD_TARGETS_SET=yes |
80 |
81 |
81 # Additional license files to install |
82 # Additional license files to install |
82 EXTRA_LICENSES = \ |
83 EXTRA_LICENSES = \ |
83 COPYING.Xprint-fonts \ |
84 COPYING.Xprint-fonts \ |
100 USE_DEFAULT_CONFIG_CPPFLAGS=no |
101 USE_DEFAULT_CONFIG_CPPFLAGS=no |
101 MODULE_CPPFLAGS= \ |
102 MODULE_CPPFLAGS= \ |
102 -I$(PROTODIR)$(X11_INCLUDES_DIR)/drm \ |
103 -I$(PROTODIR)$(X11_INCLUDES_DIR)/drm \ |
103 -I$(PROTODIR)$(X11_INCLUDES_DIR)/X11/dri |
104 -I$(PROTODIR)$(X11_INCLUDES_DIR)/X11/dri |
104 |
105 |
|
106 # Additional install targets beyond the defaults |
|
107 EXTRA_INSTALL_sparc=install_pc |
|
108 EXTRA_INSTALL_i386= |
|
109 MODULE_ADD_INSTALL_TARGETS=install_extras $(EXTRA_INSTALL_$(MACH)) |
|
110 |
105 include ../Makefile.inc |
111 include ../Makefile.inc |
106 |
112 |
107 # Merge in additional sources from sun-src directory |
113 # Merge in additional sources from sun-src directory |
108 source_gen:: $(LNDIR) |
114 source_gen:: $(LNDIR) |
109 -$(RM) -f $(SOURCE_DIR)/hw/xfree86/scanpci/pci.ids \ |
115 -$(RM) -f $(SOURCE_DIR)/hw/xfree86/scanpci/pci.ids \ |
117 (cd $(SOURCE_DIR)/hw/xfree86/xf1bpp && \ |
123 (cd $(SOURCE_DIR)/hw/xfree86/xf1bpp && \ |
118 $(MAKE) $(MAKEFLAGS) maintainer-clean-generic) |
124 $(MAKE) $(MAKEFLAGS) maintainer-clean-generic) |
119 |
125 |
120 $(XORGSERVER_BIN): default_build |
126 $(XORGSERVER_BIN): default_build |
121 |
127 |
122 EXTRA_INSTALL_sparc=install_pc |
128 install_extras: default_install |
123 EXTRA_INSTALL_i386= |
|
124 EXTRA_INSTALL=$(EXTRA_INSTALL_$(MACH)) |
|
125 |
|
126 install_gen:: default_install $(EXTRA_INSTALL) |
|
127 sed -e 's%#define XF86DRI 1%/* #define XF86DRI 1 */%' \ |
129 sed -e 's%#define XF86DRI 1%/* #define XF86DRI 1 */%' \ |
128 -e 's%^.* _XSERVER64 .*$$%#include <sys/isa_defs.h>\ |
130 -e 's%^.* _XSERVER64 .*$$%#include <sys/isa_defs.h>\ |
129 #ifdef _LP64\ |
131 #ifdef _LP64\ |
130 #define _XSERVER64 1\ |
132 #define _XSERVER64 1\ |
131 #endif%' \ |
133 #endif%' \ |