projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i915g: Fix fallout from 8e4540ec2a82e72be491bc8fe23c10551d29a96c
[mesa.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index b0a2d8065f62131b1284e69e8f357a72895300a3..6120fbe9f45af1c994c161f93306ee7742ef1d0c 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-21,6
+21,10
@@
all: default
doxygen:
cd doxygen && $(MAKE)
doxygen:
cd doxygen && $(MAKE)
+check:
+ cd src/glsl/tests/ && ./optimization-test
+ make -C tests check
+
clean:
-@touch $(TOP)/configs/current
-@for dir in $(SUBDIRS) ; do \
clean:
-@touch $(TOP)/configs/current
-@for dir in $(SUBDIRS) ; do \
@@
-51,7
+55,7
@@
install:
done
done
-.PHONY: default doxygen clean realclean distclean install
+.PHONY: default doxygen clean realclean distclean install
check
# If there's no current configuration file
$(TOP)/configs/current:
# If there's no current configuration file
$(TOP)/configs/current:
@@
-78,7
+82,6
@@
aix-static \
autoconf \
bluegene-osmesa \
bluegene-xlc-osmesa \
autoconf \
bluegene-osmesa \
bluegene-xlc-osmesa \
-beos \
catamount-osmesa-pgi \
darwin \
darwin-fat-32bit \
catamount-osmesa-pgi \
darwin \
darwin-fat-32bit \
@@
-109,8
+112,6
@@
linux \
linux-i965 \
linux-alpha \
linux-alpha-static \
linux-i965 \
linux-alpha \
linux-alpha-static \
-linux-cell \
-linux-cell-debug \
linux-debug \
linux-dri \
linux-dri-debug \
linux-debug \
linux-dri \
linux-dri-debug \
@@
-183,13
+184,15
@@
ultrix-gcc:
# Rules for making release tarballs
# Rules for making release tarballs
-PACKAGE_VERSION=
7.12
-devel
+PACKAGE_VERSION=
8.1
-devel
PACKAGE_DIR = Mesa-$(PACKAGE_VERSION)
PACKAGE_NAME = MesaLib-$(PACKAGE_VERSION)
EXTRA_FILES = \
aclocal.m4 \
configure \
PACKAGE_DIR = Mesa-$(PACKAGE_VERSION)
PACKAGE_NAME = MesaLib-$(PACKAGE_VERSION)
EXTRA_FILES = \
aclocal.m4 \
configure \
+ tests/Makefile.in \
+ tests/glx/Makefile.in \
src/glsl/glsl_parser.cpp \
src/glsl/glsl_parser.h \
src/glsl/glsl_lexer.cpp \
src/glsl/glsl_parser.cpp \
src/glsl/glsl_parser.h \
src/glsl/glsl_lexer.cpp \
@@
-203,12
+206,6
@@
EXTRA_FILES = \
IGNORE_FILES = \
-x autogen.sh
IGNORE_FILES = \
-x autogen.sh
-DEPEND_FILES = \
- src/mesa/depend \
- src/glx/depend \
- src/glw/depend \
- src/glu/sgi/depend
-
parsers: configure
-@touch $(TOP)/configs/current
parsers: configure
-@touch $(TOP)/configs/current
@@
-231,15
+228,9
@@
AUTOCONF = autoconf
AC_FLAGS =
aclocal.m4: configure.ac acinclude.m4
$(ACLOCAL) $(ACLOCAL_FLAGS)
AC_FLAGS =
aclocal.m4: configure.ac acinclude.m4
$(ACLOCAL) $(ACLOCAL_FLAGS)
-configure:
rm_depend
configure.ac aclocal.m4 acinclude.m4
+configure: configure.ac aclocal.m4 acinclude.m4
$(AUTOCONF) $(AC_FLAGS)
$(AUTOCONF) $(AC_FLAGS)
-rm_depend:
- @for dep in $(DEPEND_FILES) ; do \
- rm -f $$dep ; \
- touch $$dep ; \
- done
-
manifest.txt: .git
( \
ls -1 $(EXTRA_FILES) ; \
manifest.txt: .git
( \
ls -1 $(EXTRA_FILES) ; \
@@
-269,4
+260,4
@@
md5: $(ARCHIVES)
@-md5sum $(PACKAGE_NAME).tar.bz2
@-md5sum $(PACKAGE_NAME).zip
@-md5sum $(PACKAGE_NAME).tar.bz2
@-md5sum $(PACKAGE_NAME).zip
-.PHONY: tarballs
rm_depend
md5
+.PHONY: tarballs md5