xkeyboard-config libX11 mesalib git update 12 jan 2011

1 files changed, 3 insertions, 75 deletions

diff --git a/mesalib/src/mesa/Makefile b/mesalib/src/mesa/Makefile
index 1b02849fc..c9a5eaf5b 100644
--- a/mesalib/src/mesa/Makefile
+++ b/mesalib/src/mesa/Makefile
@@ -6,37 +6,20 @@ include $(TOP)/configs/current
 MESA_LIBS := libmesa.a libmesagallium.a

 DEPENDS := depend

 

-ifeq ($(GLES_OVERLAY),1)

-ES1_LIBS := libes1gallium.a

-ES2_LIBS := libes2gallium.a

-DEPENDS += depend.es1 depend.es2

-endif

-

 MESA_OBJ_DIR := .

-ES1_OBJ_DIR := objs-es1

-ES2_OBJ_DIR := objs-es2

 

 

 include sources.mak

 

 # adjust object dirs

-ES1_OBJECTS := $(addprefix $(ES1_OBJ_DIR)/, $(MESA_OBJECTS))

-ES2_OBJECTS := $(addprefix $(ES2_OBJ_DIR)/, $(MESA_OBJECTS))

 MESA_OBJECTS := $(addprefix $(MESA_OBJ_DIR)/, $(MESA_OBJECTS))

-

-ES1_GALLIUM_OBJECTS := $(addprefix $(ES1_OBJ_DIR)/, $(MESA_GALLIUM_OBJECTS))

-ES2_GALLIUM_OBJECTS := $(addprefix $(ES2_OBJ_DIR)/, $(MESA_GALLIUM_OBJECTS))

 MESA_GALLIUM_OBJECTS := $(addprefix $(MESA_OBJ_DIR)/, $(MESA_GALLIUM_OBJECTS))

 

 # define preprocessor flags

 MESA_CPPFLAGS := $(API_DEFINES) $(DEFINES)

-ES1_CPPFLAGS := -DFEATURE_ES1=1 $(DEFINES)

-ES2_CPPFLAGS := -DFEATURE_ES2=1 $(DEFINES)

 

 # append include dirs

 MESA_CPPFLAGS += $(INCLUDE_DIRS) $(TALLOC_CFLAGS)

-ES1_CPPFLAGS += -I$(TOP)/src/mapi/es1api $(INCLUDE_DIRS) $(TALLOC_CFLAGS)

-ES2_CPPFLAGS += -I$(TOP)/src/mapi/es2api $(INCLUDE_DIRS) $(TALLOC_CFLAGS)

 

 # tidy compiler flags

 CFLAGS := $(filter-out $(DEFINES), $(CFLAGS))

@@ -44,8 +27,6 @@ CXXFLAGS := $(filter-out $(DEFINES), $(CXXFLAGS))
 

 # LLVM is needed for the state tracker

 MESA_CFLAGS := $(LLVM_CFLAGS)

-ES1_CFLAGS := $(LLVM_CFLAGS)

-ES2_CFLAGS := $(LLVM_CFLAGS)

 

 define mesa-cc-c

 	@mkdir -p $(dir $@)

@@ -66,29 +47,9 @@ $(MESA_OBJ_DIR)/%.o: %.cpp
 $(MESA_OBJ_DIR)/%.o: %.S

 	$(call mesa-cc-c,MESA)

 

-$(ES1_OBJ_DIR)/%.o: %.c

-	$(call mesa-cc-c,ES1)

-

-$(ES1_OBJ_DIR)/%.o: %.cpp

-	$(call mesa-cxx-c,ES1)

-

-$(ES1_OBJ_DIR)/%.o: %.S

-	$(call mesa-cc-c,ES1)

-

-$(ES2_OBJ_DIR)/%.o: %.c

-	$(call mesa-cc-c,ES2)

-

-$(ES2_OBJ_DIR)/%.o: %.cpp

-	$(call mesa-cxx-c,ES2)

-

-$(ES2_OBJ_DIR)/%.o: %.S

-	$(call mesa-cc-c,ES2)

-

-

 # Default: build dependencies, then asm_subdirs, GLSL built-in lib,

 # then convenience libs (.a) and finally the device drivers:

-default: $(DEPENDS) asm_subdirs \

-	$(MESA_LIBS) $(ES1_LIBS) $(ES2_LIBS) driver_subdirs

+default: $(DEPENDS) asm_subdirs $(MESA_LIBS) driver_subdirs

 

 main/api_exec_es1.c: main/APIspec.xml main/es_generator.py main/APIspecutil.py main/APIspec.py

 	$(PYTHON2) $(PYTHON_FLAGS) main/es_generator.py -S main/APIspec.xml -V GLES1.1 > $@

@@ -103,22 +64,10 @@ main/api_exec_es2.c: main/APIspec.xml main/es_generator.py main/APIspecutil.py m
 libmesa.a: $(MESA_OBJECTS) $(GLSL_LIBS)

 	@ $(MKLIB) -o mesa -static $(MESA_OBJECTS) $(GLSL_LIBS)

 

-libes1.a: $(ES1_OBJECTS) $(GLSL_LIBS)

-	@$(MKLIB) -o es1 -static $(ES1_OBJECTS) $(GLSL_LIBS)

-

-libes2.a: $(ES2_OBJECTS) $(GLSL_LIBS)

-	@$(MKLIB) -o es2 -static $(ES2_OBJECTS) $(GLSL_LIBS)

-

 # Make archive of subset of core mesa object files for gallium

 libmesagallium.a: $(MESA_GALLIUM_OBJECTS) $(GLSL_LIBS)

 	@ $(MKLIB) -o mesagallium -static $(MESA_GALLIUM_OBJECTS) $(GLSL_LIBS)

 

-libes1gallium.a: $(ES1_GALLIUM_OBJECTS) $(GLSL_LIBS)

-	@$(MKLIB) -o es1gallium -static $(ES1_GALLIUM_OBJECTS) $(GLSL_LIBS)

-

-libes2gallium.a: $(ES2_GALLIUM_OBJECTS) $(GLSL_LIBS)

-	@$(MKLIB) -o es2gallium -static $(ES2_GALLIUM_OBJECTS) $(GLSL_LIBS)

-

 ######################################################################

 # Device drivers

 driver_subdirs: $(MESA_LIBS)

@@ -146,18 +95,6 @@ depend: $(ALL_SOURCES)
 	@$(MKDEP) $(MKDEP_OPTIONS) -p$(MESA_OBJ_DIR)/ $(MESA_CPPFLAGS) \

 		$(ALL_SOURCES) > /dev/null 2>/dev/null

 

-depend.es1: $(ALL_SOURCES)

-	@echo "running $(MKDEP) for ES1"

-	@touch $@

-	@$(MKDEP) $(MKDEP_OPTIONS) -f$@ -p$(ES1_OBJ_DIR)/ $(ES1_CPPFLAGS) \

-		$(ALL_SOURCES) > /dev/null 2>/dev/null

-

-depend.es2: $(ALL_SOURCES)

-	@echo "running $(MKDEP) for ES2"

-	@touch $@

-	@$(MKDEP) $(MKDEP_OPTIONS) -f$@ -p$(ES2_OBJ_DIR)/ $(ES2_CPPFLAGS) \

-		$(ALL_SOURCES) > /dev/null 2>/dev/null

-

 ######################################################################

 # Installation rules

 

@@ -192,6 +129,7 @@ gl_pcedit = sed \
 	-e 's,@GL_PC_REQ_PRIV@,$(GL_PC_REQ_PRIV),' \

 	-e 's,@GL_PC_LIB_PRIV@,$(GL_PC_LIB_PRIV),' \

 	-e 's,@GL_PC_CFLAGS@,$(GL_PC_CFLAGS),' \

+	-e 's,@GLX_TLS@,$(GLX_TLS),' \

 	-e 's,@GL_LIB@,$(GL_LIB),'

 

 gl.pc: gl.pc.in

@@ -234,17 +172,7 @@ install-dri: default
 tags:

 	etags `find . -name \*.[ch]` $(TOP)/include/GL/*.h

 

-clean-es1:

-	-rm -f $(ES1_LIBS)

-	-rm -rf $(ES1_OBJ_DIR)

-	-rm -f depend.es1 depend.es1.bak

-

-clean-es2:

-	-rm -f $(ES2_LIBS)

-	-rm -rf $(ES2_OBJ_DIR)

-	-rm -f depend.es2 depend.es2.bak

-

-clean: clean-es1 clean-es2

+clean:

 	-rm -f */*.o

 	-rm -f */*/*.o

 	-rm -f depend depend.bak libmesa.a libmesagallium.a