diff options
| author | Jakob Bornecrantz <[email protected]> | 2009-12-02 14:52:51 +0100 |
|---|---|---|
| committer | Jakob Bornecrantz <[email protected]> | 2009-12-02 14:52:51 +0100 |
| commit | 0c75854cc1650dc870e042aa66a053e70b3d4556 (patch) | |
| tree | 72eb2c040bd10b6210bdc7f2b25df5e8c405095f /progs | |
| parent | 4598942b1b88a2a7d5af7febae7e79eedf00e385 (diff) | |
| parent | 2b5618fc5bdcbee3434f8b5aa3a31eb06fb479c0 (diff) | |
Merge commit 'mesa_7_6_branch' into mesa_7_7_branch
Conflicts:
src/mesa/main/version.h
Diffstat (limited to 'progs')
| -rw-r--r-- | progs/Makefile | 26 | ||||
| -rw-r--r-- | progs/demos/fogcoord.c | 2 |
2 files changed, 11 insertions, 17 deletions
diff --git a/progs/Makefile b/progs/Makefile index d5852fa416c..5bc444e9524 100644 --- a/progs/Makefile +++ b/progs/Makefile @@ -4,7 +4,7 @@ TOP = .. include $(TOP)/configs/current -SUBDIRS = "$(strip "$(PROGRAM_DIRS)")" +SUBDIRS = $(PROGRAM_DIRS) default: message subdirs @@ -15,22 +15,18 @@ message: subdirs: - @if test -n "$(SUBDIRS)" ; then \ - for dir in $(SUBDIRS) ; do \ - if [ -d $$dir ] ; then \ - (cd $$dir && $(MAKE)) || exit 1 ; \ - fi \ - done \ - fi + @list='$(SUBDIRS)'; for dir in $$list ; do \ + if [ -d $$dir ] ; then \ + (cd $$dir && $(MAKE)) || exit 1 ; \ + fi \ + done # Dummy install target install: clean: - -@if test -n "$(SUBDIRS)" ; then \ - for dir in $(SUBDIRS) tests ; do \ - if [ -d $$dir ] ; then \ - (cd $$dir && $(MAKE) clean) ; \ - fi \ - done \ - fi + @list='$(SUBDIRS)'; for dir in $$list tests ; do \ + if [ -d $$dir ] ; then \ + (cd $$dir && $(MAKE) clean) ; \ + fi \ + done diff --git a/progs/demos/fogcoord.c b/progs/demos/fogcoord.c index 6f50993c98f..7d5c11aabf3 100644 --- a/progs/demos/fogcoord.c +++ b/progs/demos/fogcoord.c @@ -15,8 +15,6 @@ #define DEPTH 5.0f -static PFNGLFOGCOORDPOINTEREXTPROC glFogCoordPointer_ext; - static GLfloat camz; static GLint fogMode; |