Mesa (master): Remove last bits of progs/ infrastructure

Kristian Høgsberg krh at kemper.freedesktop.org
Mon Jun 7 07:09:48 PDT 2010


Module: Mesa
Branch: master
Commit: 56c3cce2a199f7f79a48d7633431e1e80fcd4ba2
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=56c3cce2a199f7f79a48d7633431e1e80fcd4ba2

Author: Kristian Høgsberg <krh at bitplanet.net>
Date:   Mon Jun  7 10:08:48 2010 -0400

Remove last bits of progs/ infrastructure

---

 Makefile         |    4 ----
 configure.ac     |   47 -----------------------------------------------
 progs/.gitignore |    1 -
 progs/Makefile   |   32 --------------------------------
 4 files changed, 0 insertions(+), 84 deletions(-)

diff --git a/Makefile b/Makefile
index 726db39..c9f612d 100644
--- a/Makefile
+++ b/Makefile
@@ -288,10 +288,6 @@ MAIN_FILES = \
 	$(DIRECTORY)/src/mesa/x86/rtasm/*.[ch]				\
 	$(DIRECTORY)/src/mesa/x86-64/*.[chS]				\
 	$(DIRECTORY)/src/mesa/x86-64/Makefile				\
-	$(DIRECTORY)/progs/Makefile					\
-	$(DIRECTORY)/progs/util/README					\
-	$(DIRECTORY)/progs/util/*.[ch]					\
-	$(DIRECTORY)/progs/util/sampleMakefile				\
 	$(DIRECTORY)/windows/VC8/
 
 MAPI_FILES = \
diff --git a/configure.ac b/configure.ac
index c4a4f95..6fc0e2a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -503,40 +503,6 @@ AC_SUBST([GALLIUM_STATE_TRACKERS_DIRS])
 AC_SUBST([MESA_LLVM])
 
 dnl
-dnl User supplied program configuration
-dnl
-if test -d "$srcdir/progs/demos"; then
-    default_demos=yes
-else
-    default_demos=no
-fi
-AC_ARG_WITH([demos],
-    [AS_HELP_STRING([--with-demos@<:@=DIRS...@:>@],
-        [optional comma delimited demo directories to build
-        @<:@default=auto if source available@:>@])],
-    [with_demos="$withval"],
-    [with_demos="$default_demos"])
-if test "x$with_demos" = x; then
-    with_demos=no
-fi
-
-dnl If $with_demos is yes, directories will be added as libs available
-PROGRAM_DIRS=""
-case "$with_demos" in
-no) ;;
-yes) ;;
-*)
-    # verify the requested demos directories exist
-    demos=`IFS=,; echo $with_demos`
-    for demo in $demos; do
-        test -d "$srcdir/progs/$demo" || \
-            AC_MSG_ERROR([Program directory '$demo' doesn't exist])
-    done
-    PROGRAM_DIRS="$demos"
-    ;;
-esac
-
-dnl
 dnl Find out if X is available. The variable have_x is set if libX11 is
 dnl found to mimic AC_PATH_XTRA.
 dnl
@@ -1014,10 +980,6 @@ if test "x$enable_egl" = xyes; then
             EGL_DRIVERS_DIRS="$EGL_DRIVERS_DIRS dri2"
         fi
     fi
-
-    if test "$with_demos" = yes; then
-        PROGRAM_DIRS="$PROGRAM_DIRS egl/eglut"
-    fi
 fi
 AC_SUBST([EGL_LIB_DEPS])
 AC_SUBST([EGL_DRIVERS_DIRS])
@@ -1634,15 +1596,6 @@ echo "        GLU:             $enable_glu"
 echo "        GLw:             $enable_glw (Motif: $enable_motif)"
 echo "        glut:            $enable_glut"
 
-dnl Programs
-# cleanup the programs var for display
-program_dirs=`echo $PROGRAM_DIRS | $SED 's/^ *//;s/  */ /;s/ *$//'`
-if test "x$program_dirs" = x; then
-    echo "        Demos:           no"
-else
-    echo "        Demos:           $program_dirs"
-fi
-
 dnl Compiler options
 # cleanup the CFLAGS/CXXFLAGS/DEFINES vars
 cflags=`echo $CFLAGS $OPT_FLAGS $PIC_FLAGS $ARCH_FLAGS | \
diff --git a/progs/.gitignore b/progs/.gitignore
deleted file mode 100644
index cb77d18..0000000
--- a/progs/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.dSYM
diff --git a/progs/Makefile b/progs/Makefile
deleted file mode 100644
index 2d14fa9..0000000
--- a/progs/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# progs/Makefile
-
-TOP = ..
-
-include $(TOP)/configs/current
-
-#SUBDIRS = $(PROGRAM_DIRS)
-SUBDIRS = 
-
-default: message subdirs
-
-
-message:
-	@echo "Making programs for" $(CONFIG_NAME)
-
-
-subdirs:
-	@list='$(SUBDIRS)'; for dir in $$list ; do \
-		if [ -d $$dir ] ; then \
-			(cd $$dir && $(MAKE)) || exit 1 ; \
-		fi \
-	done
-
-# Dummy install target
-install:
-
-clean:
-	@list='$(SUBDIRS)'; for dir in $$list tests ; do \
-		if [ -d $$dir ] ; then \
-			(cd $$dir && $(MAKE) clean) ; \
-		fi \
-	done



More information about the mesa-commit mailing list