equal
deleted
inserted
replaced
79 -I$(PROTODIR)$(X11_INCLUDES_DIR)/X11/dri \ |
79 -I$(PROTODIR)$(X11_INCLUDES_DIR)/X11/dri \ |
80 -I$(PROTODIR)$(X11_INCLUDES_DIR)/X11/extensions \ |
80 -I$(PROTODIR)$(X11_INCLUDES_DIR)/X11/extensions \ |
81 $(DPMS_DEFINES) -DSUNSOFT -DTSOL \ |
81 $(DPMS_DEFINES) -DSUNSOFT -DTSOL \ |
82 $(MODTYPE_CPPFLAGS_$(MODULE_COMPILER)) |
82 $(MODTYPE_CPPFLAGS_$(MODULE_COMPILER)) |
83 |
83 |
84 XSERVER_LDFLAGS_suncc= # No extra flags needed |
|
85 XSERVER_LDFLAGS_gcc= -L/usr/sfw/lib$(ARCHLIBSUBDIR) \ |
|
86 -R/usr/sfw/lib$(ARCHLIBSUBDIR) |
|
87 |
|
88 # Environment variable options to GNU autoconf configure script |
84 # Environment variable options to GNU autoconf configure script |
89 # - XSERVERCFLAGS_CFLAGS - force CFLAGS to avoid -I /usr/X11/include breaking |
85 # - XSERVERCFLAGS_CFLAGS - force CFLAGS to avoid -I /usr/X11/include breaking |
90 # use of headers from proto area |
86 # use of headers from proto area |
91 # - PATH - include /usr/sbin for dtrace command (needed for building probes) |
87 # - PATH - include /usr/sbin for dtrace command (needed for building probes) |
92 MODTYPE_CONFIG_ENV = \ |
88 MODTYPE_CONFIG_ENV = \ |
98 MODTYPE_DEBUG_FLAGS_sparc_suncc = -xmemalign=8i |
94 MODTYPE_DEBUG_FLAGS_sparc_suncc = -xmemalign=8i |
99 MODTYPE_DEBUG_FLAGS=$(MODTYPE_DEBUG_FLAGS_$(MACH)_$(MODULE_COMPILER)) |
95 MODTYPE_DEBUG_FLAGS=$(MODTYPE_DEBUG_FLAGS_$(MACH)_$(MODULE_COMPILER)) |
100 |
96 |
101 MODTYPE_CFLAGS=$(PROG_CFLAGS) |
97 MODTYPE_CFLAGS=$(PROG_CFLAGS) |
102 MODTYPE_CXXFLAGS=$(PROG_CXXFLAGS) |
98 MODTYPE_CXXFLAGS=$(PROG_CXXFLAGS) |
103 MODTYPE_LDFLAGS=$(PROG_LDFLAGS) $(XSERVER_LDFLAGS_$(MODULE_COMPILER)) \ |
99 MODTYPE_LDFLAGS=$(PROG_LDFLAGS) |
|
100 |
|
101 XSERVER_LDFLAGS = \ |
104 -L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \ |
102 -L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \ |
105 -R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \ |
103 -R$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \ |
106 -L$(PROTODIR)$(X11_DIR)/lib$(ARCHLIBSUBDIR) \ |
104 -L$(PROTODIR)$(X11_DIR)/lib$(ARCHLIBSUBDIR) \ |
107 -R$(X11_DIR)/lib$(ARCHLIBSUBDIR) |
105 -R$(X11_LIB_DIR)$(ARCHLIBSUBDIR) |
108 |
106 |
109 MODTYPE_BUILD_32_FLAGS=ARCHBINSUBDIR="$(SUBDIR32)" |
107 MODTYPE_BUILD_32_FLAGS=ARCHBINSUBDIR="$(SUBDIR32)" |
110 |
108 |
111 MODTYPE_BUILD_64_FLAGS_sparc=ARCHBINSUBDIR="" |
109 MODTYPE_BUILD_64_FLAGS_sparc=ARCHBINSUBDIR="" |
112 MODTYPE_BUILD_64_FLAGS_i386=ARCHBINSUBDIR="$(SUBDIR64)" |
110 MODTYPE_BUILD_64_FLAGS_i386=ARCHBINSUBDIR="$(SUBDIR64)" |