head	1.2;
access;
symbols
	netbsd-7-2-RELEASE:1.1.1.1.2.1
	netbsd-7-1-2-RELEASE:1.1.1.1.2.1
	netbsd-7-1-1-RELEASE:1.1.1.1.2.1
	netbsd-7-1:1.1.1.1.2.1.0.4
	netbsd-7-1-RELEASE:1.1.1.1.2.1
	netbsd-7-1-RC2:1.1.1.1.2.1
	netbsd-7-1-RC1:1.1.1.1.2.1
	netbsd-7-0-2-RELEASE:1.1.1.1.2.1
	netbsd-7-0-1-RELEASE:1.1.1.1.2.1
	netbsd-7-0:1.1.1.1.2.1.0.2
	netbsd-7-0-RELEASE:1.1.1.1.2.1
	netbsd-7-0-RC3:1.1.1.1.2.1
	netbsd-7-0-RC2:1.1.1.1.2.1
	netbsd-7-0-RC1:1.1.1.1.2.1
	netbsd-7:1.1.1.1.0.2
	netbsd-7-base:1.1.1.1
	MesaLib-7-11-2:1.1.1.1
	xorg:1.1.1;
locks; strict;
comment	@# @;


1.2
date	2014.12.18.06.11.37;	author mrg;	state dead;
branches;
next	1.1;
commitid	Ae59RsLlS9l0cu2y;

1.1
date	2014.07.09.19.39.00;	author riastradh;	state Exp;
branches
	1.1.1.1;
next	;
commitid	h96CLViPL8qdRJHx;

1.1.1.1
date	2014.07.09.19.39.00;	author riastradh;	state Exp;
branches
	1.1.1.1.2.1;
next	;
commitid	h96CLViPL8qdRJHx;

1.1.1.1.2.1
date	2015.01.06.09.26.25;	author martin;	state dead;
branches;
next	;
commitid	2BxXkbQgg8gLEW4y;


desc
@@


1.2
log
@merge Mesa 10.3.5.
@
text
@# -*-makefile-*-


ifeq ($(MESA_LLVM),1)
PIPE_DRIVERS += $(TOP)/src/gallium/drivers/llvmpipe/libllvmpipe.a
LDFLAGS += $(LLVM_LDFLAGS)
DRIVER_EXTRAS = $(LLVM_LIBS)
else
LDFLAGS += -lstdc++
endif

MESA_MODULES = \
	$(TOP)/src/mesa/libmesagallium.a \
	$(GALLIUM_AUXILIARIES)

COMMON_GALLIUM_SOURCES = \
        $(TOP)/src/mesa/drivers/dri/common/utils.c \
        $(TOP)/src/mesa/drivers/dri/common/vblank.c \
        $(TOP)/src/mesa/drivers/dri/common/dri_util.c \
        $(TOP)/src/mesa/drivers/dri/common/xmlconfig.c

COMMON_SOURCES = $(COMMON_GALLIUM_SOURCES) \
        $(TOP)/src/mesa/drivers/common/driverfuncs.c \
        $(TOP)/src/mesa/drivers/dri/common/texmem.c \
        $(TOP)/src/mesa/drivers/dri/common/drirenderbuffer.c

COMMON_BM_SOURCES = \
	$(TOP)/src/mesa/drivers/dri/common/dri_bufmgr.c \
	$(TOP)/src/mesa/drivers/dri/common/dri_drmpool.c

INCLUDES = $(SHARED_INCLUDES) $(EXPAT_INCLUDES)

OBJECTS = \
	$(C_SOURCES:.c=.o) \
	$(ASM_SOURCES:.S=.o) 


### Include directories
SHARED_INCLUDES = \
	-I. \
	-I$(TOP)/src/mesa/drivers/dri/common \
	-Iserver \
	-I$(TOP)/include \
	-I$(TOP)/include/GL/internal \
	-I$(TOP)/src/mapi \
	-I$(TOP)/src/gallium/include \
	-I$(TOP)/src/gallium/auxiliary \
	-I$(TOP)/src/gallium/drivers \
	-I$(TOP)/src/gallium/winsys \
	-I$(TOP)/src/mesa \
	-I$(TOP)/src/mesa/main \
	-I$(TOP)/src/mesa/math \
	-I$(TOP)/src/mesa/transform \
	-I$(TOP)/src/mesa/shader \
	-I$(TOP)/src/mesa/swrast \
	-I$(TOP)/src/mesa/swrast_setup \
	-I$(TOP)/src/egl/main \
	-I$(TOP)/src/egl/drivers/dri \
	$(LIBDRM_CFLAGS)

LIBNAME_STAGING = $(TOP)/$(LIB_DIR)/gallium/$(LIBNAME)


##### RULES #####

.c.o:
	$(CC) -c $(INCLUDES) $(CFLAGS) $(DRIVER_DEFINES) $< -o $@@

.S.o:
	$(CC) -c $(INCLUDES) $(CFLAGS) $(DRIVER_DEFINES) $< -o $@@


##### TARGETS #####

default: depend symlinks $(TOP)/$(LIB_DIR)/gallium $(LIBNAME) $(LIBNAME_STAGING)

$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(PIPE_DRIVERS) Makefile \
		$(TOP)/src/mesa/drivers/dri/Makefile.targets $(TOP)/src/mesa/drivers/dri/common/dri_test.o
	$(MKLIB) -o $@@.tmp -noprefix -linker '$(CXX)' -ldflags '$(LDFLAGS)' \
		$(OBJECTS) $(PIPE_DRIVERS) \
                -Wl,--start-group $(MESA_MODULES) -Wl,--end-group \
                 $(DRI_LIB_DEPS) $(DRIVER_EXTRAS)
	$(CXX) $(CFLAGS) -o $@@.test $(TOP)/src/mesa/drivers/dri/common/dri_test.o $@@.tmp $(DRI_LIB_DEPS) $(LDFLAGS);
	@@rm -f $@@.test
	mv -f $@@.tmp $@@

$(TOP)/$(LIB_DIR)/gallium:
	mkdir -p $@@

$(LIBNAME_STAGING): $(LIBNAME)
	$(INSTALL) $(LIBNAME) $(TOP)/$(LIB_DIR)/gallium

depend: $(C_SOURCES) $(ASM_SOURCES) $(SYMLINKS)
	rm -f depend
	touch depend
	$(MKDEP) $(MKDEP_OPTIONS) $(DRIVER_DEFINES) $(INCLUDES) $(C_SOURCES) \
		$(ASM_SOURCES) 2> /dev/null


# Emacs tags
tags:
	etags `find . -name \*.[ch]` `find ../include`


# Remove .o and backup files
clean:
	-rm -f *.o */*.o *~ *.so *~ server/*.o $(SYMLINKS)
	-rm -f depend depend.bak


install: $(LIBNAME)
	$(INSTALL) -d $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
	$(MINSTALL) -m 755 $(LIBNAME) $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)


include depend
@


1.1
log
@Initial revision
@
text
@@


1.1.1.1
log
@import MesaLib 7.11.2

Brings in support for Intel Sandy Bridge and Ivy Bridge hardware, a
new shader language compiler, and various other improvements too
numerous to list here; see <http://www.mesa3d.org/relnotes.html> for
details.
@
text
@@


1.1.1.1.2.1
log
@File removals that accidently did not happen during pullup of the new
MesaLib for ticket #381
@
text
@@