head	1.2;
access;
symbols
	netbsd-5-2-3-RELEASE:1.1.1.1.2.1
	netbsd-5-1-5-RELEASE:1.1.1.1.2.1
	netbsd-6-0-6-RELEASE:1.1.1.4
	netbsd-6-1-5-RELEASE:1.1.1.4
	netbsd-6-1-4-RELEASE:1.1.1.4
	netbsd-6-0-5-RELEASE:1.1.1.4
	riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.1.1.4
	riastradh-drm2:1.1.1.4.0.8
	riastradh-drm2-base:1.1.1.4
	netbsd-6-1-3-RELEASE:1.1.1.4
	netbsd-6-0-4-RELEASE:1.1.1.4
	netbsd-5-2-2-RELEASE:1.1.1.1.2.1
	netbsd-5-1-4-RELEASE:1.1.1.1.2.1
	netbsd-6-1-2-RELEASE:1.1.1.4
	netbsd-6-0-3-RELEASE:1.1.1.4
	netbsd-5-2-1-RELEASE:1.1.1.1.2.1
	netbsd-5-1-3-RELEASE:1.1.1.1.2.1
	netbsd-6-1-1-RELEASE:1.1.1.4
	netbsd-6-1:1.1.1.4.0.6
	netbsd-6-0-2-RELEASE:1.1.1.4
	netbsd-6-1-RELEASE:1.1.1.4
	netbsd-6-1-RC4:1.1.1.4
	netbsd-6-1-RC3:1.1.1.4
	netbsd-6-1-RC2:1.1.1.4
	netbsd-6-1-RC1:1.1.1.4
	netbsd-5-2:1.1.1.1.2.1.0.4
	netbsd-6-0-1-RELEASE:1.1.1.4
	netbsd-5-2-RELEASE:1.1.1.1.2.1
	netbsd-5-2-RC1:1.1.1.1.2.1
	netbsd-6-0:1.1.1.4.0.4
	netbsd-6-0-RELEASE:1.1.1.4
	netbsd-6-0-RC2:1.1.1.4
	netbsd-6-0-RC1:1.1.1.4
	netbsd-6:1.1.1.4.0.2
	netbsd-6-base:1.1.1.4
	netbsd-5-1-2-RELEASE:1.1.1.1.2.1
	netbsd-5-1-1-RELEASE:1.1.1.1.2.1
	netbsd-5-1:1.1.1.1.2.1.0.2
	netbsd-5-1-RELEASE:1.1.1.1.2.1
	netbsd-5-1-RC4:1.1.1.1.2.1
	MesaLib-7-8-2:1.1.1.4
	netbsd-5-1-RC3:1.1.1.1.2.1
	MesaLib-7-7-1:1.1.1.3
	netbsd-5-1-RC2:1.1.1.1.2.1
	netbsd-5-1-RC1:1.1.1.1.2.1
	netbsd-5-0-2-RELEASE:1.1.1.1
	MesaLib-7-4-4:1.1.1.2
	netbsd-5-0-1-RELEASE:1.1.1.1
	MesaLib-7-4-2:1.1.1.2
	netbsd-5-0:1.1.1.1.0.4
	netbsd-5-0-RELEASE:1.1.1.1
	netbsd-5-0-RC4:1.1.1.1
	netbsd-5-0-RC3:1.1.1.1
	netbsd-5-0-RC2:1.1.1.1
	netbsd-5-0-RC1:1.1.1.1
	netbsd-5:1.1.1.1.0.2
	netbsd-5-base:1.1.1.1
	MesaLib-7-0-3:1.1.1.1
	xorg:1.1.1;
locks; strict;
comment	@# @;


1.2
date	2014.07.09.19.46.47;	author riastradh;	state dead;
branches;
next	1.1;
commitid	D2zJVI2fYV0xUJHx;

1.1
date	2008.07.29.05.09.22;	author mrg;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2008.07.29.05.09.22;	author mrg;	state Exp;
branches
	1.1.1.1.2.1;
next	1.1.1.2;

1.1.1.2
date	2009.06.11.00.50.18;	author mrg;	state Exp;
branches;
next	1.1.1.3;

1.1.1.3
date	2010.05.23.21.22.22;	author mrg;	state Exp;
branches;
next	1.1.1.4;

1.1.1.4
date	2010.07.19.05.31.36;	author mrg;	state Exp;
branches;
next	;

1.1.1.1.2.1
date	2009.09.17.03.32.11;	author snj;	state Exp;
branches;
next	;


desc
@@


1.2
log
@merge MesaLib 7.11.2
@
text
@# -*-makefile-*-

MESA_MODULES = $(TOP)/src/mesa/libmesa.a

COMMON_SOURCES = \
        ../../common/driverfuncs.c \
        ../common/utils.c \
        ../common/texmem.c \
        ../common/vblank.c \
        ../common/dri_util.c \
        ../common/xmlconfig.c \
        ../common/drirenderbuffer.c 

COMMON_BM_SOURCES = \
	../common/dri_bufmgr.c \
	../common/dri_drmpool.c


ifeq ($(WINDOW_SYSTEM),dri)
WINOBJ=
WINLIB=
INCLUDES = $(SHARED_INCLUDES) $(EXPAT_INCLUDES)

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

else
# miniglx
WINOBJ=
WINLIB=-L$(MESA)/src/glx/mini
MINIGLX_INCLUDES = -I$(TOP)/src/glx/mini
INCLUDES = $(MINIGLX_INCLUDES) \
	   $(SHARED_INCLUDES) \
	   $(PCIACCESS_CFLAGS)

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


### Include directories
SHARED_INCLUDES = \
	-I. \
	-I$(TOP)/src/mesa/drivers/dri/common \
	-Iserver \
	-I$(TOP)/include \
	-I$(TOP)/include/GL/internal \
	-I$(TOP)/src/mesa \
	-I$(TOP)/src/mesa/main \
	-I$(TOP)/src/mesa/glapi \
	-I$(TOP)/src/mesa/math \
	-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)


##### RULES #####

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

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


##### TARGETS #####

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


$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template
	$(TOP)/bin/mklib -ldflags '$(LDFLAGS)' -noprefix -o $@@ \
		$(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS)


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


depend: $(C_SOURCES) $(ASM_SOURCES) $(SYMLINKS)
	touch depend
	$(MKDEP) $(MKDEP_OPTIONS) $(DRIVER_DEFINES) $(INCLUDES) $(C_SOURCES) \
		$(ASM_SOURCES) 2>&1 /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)
	$(INSTALL) -m 755 $(LIBNAME) $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)


include depend
@


1.1
log
@Initial revision
@
text
@@


1.1.1.1
log
@initial import of MesaLib-7.0.3
@
text
@@


1.1.1.1.2.1
log
@Apply patch (requested by mrg in ticket #958):
Bring over X.Org updates from HEAD.
@
text
@d6 1
d14 5
d48 1
d50 6
d72 1
a72 1
default: symlinks depend $(LIBNAME) $(TOP)/$(LIB_DIR)/$(LIBNAME)
d76 1
a76 1
	$(MKLIB) -o $@@ -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)' \
d87 1
a87 1
		$(ASM_SOURCES)
d106 1
a106 1
-include depend
@


1.1.1.2
log
@initial import of MesaLib-7.4.2
@
text
@d6 1
d14 5
d48 1
d50 6
d72 1
a72 1
default: symlinks depend $(LIBNAME) $(TOP)/$(LIB_DIR)/$(LIBNAME)
d76 1
a76 1
	$(MKLIB) -o $@@ -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)' \
d87 1
a87 1
		$(ASM_SOURCES)
d106 1
a106 1
-include depend
@


1.1.1.3
log
@initial import of MesaLib-7.7.1
@
text
@d5 1
a5 1
COMMON_GALLIUM_SOURCES = \
d7 1
d10 2
a11 7
        ../common/xmlconfig.c

COMMON_SOURCES = $(COMMON_GALLIUM_SOURCES) \
        ../../common/driverfuncs.c \
        ../common/texmem.c \
        ../common/drirenderbuffer.c \
	../common/dri_metaops.c
d59 1
a59 2
default: subdirs lib

a60 3
.PHONY: lib
lib: symlinks subdirs depend
	@@$(MAKE) $(LIBNAME) $(TOP)/$(LIB_DIR)/$(LIBNAME)
d62 1
a62 2
$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) $(WINOBJ) Makefile \
		$(TOP)/src/mesa/drivers/dri/Makefile.template
d64 1
a64 2
		$(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) $(WINOBJ) \
		$(DRI_LIB_DEPS)
a70 16
# If the Makefile defined SUBDIRS, run make in each
.PHONY: subdirs
subdirs:
	@@if test -n "$(SUBDIRS)" ; then \
		for dir in $(SUBDIRS) ; do \
			if [ -d $$dir ] ; then \
				(cd $$dir && $(MAKE)) || exit 1; \
			fi \
		done \
	fi


.PHONY: symlinks
symlinks:


d72 3
a74 5
	@@ echo "running $(MKDEP)"
	@@ rm -f depend
	@@ touch depend
	@@ $(MKDEP) $(MKDEP_OPTIONS) $(DRIVER_DEFINES) $(INCLUDES) $(C_SOURCES) \
		$(ASM_SOURCES) > /dev/null 2>/dev/null
d90 1
a90 1
	$(MINSTALL) -m 755 $(LIBNAME) $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
@


1.1.1.4
log
@import Mesa 7.8.2, lib part.  major changes since 7.7.1:
- several new extensions for various drivers
- many i965, i915 driver fixes
- many glsl fixes
@
text
@d17 3
d25 14
d58 1
a58 1
	$(CC) -c $(INCLUDES) $(CFLAGS) $(DRIVER_DEFINES) $< -o $@@
d70 1
a70 1
$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) Makefile \
d73 2
a74 1
		$(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) $(DRI_LIB_DEPS)
@