mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2025-12-25 17:20:10 +01:00
Remove last bits of progs/ infrastructure
This commit is contained in:
parent
b4483823d9
commit
56c3cce2a1
4 changed files with 0 additions and 84 deletions
4
Makefile
4
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 = \
|
||||
|
|
|
|||
47
configure.ac
47
configure.ac
|
|
@ -502,40 +502,6 @@ AC_SUBST([GALLIUM_DRIVERS_DIRS])
|
|||
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.
|
||||
|
|
@ -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 | \
|
||||
|
|
|
|||
1
progs/.gitignore
vendored
1
progs/.gitignore
vendored
|
|
@ -1 +0,0 @@
|
|||
*.dSYM
|
||||
|
|
@ -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
|
||||
Loading…
Add table
Reference in a new issue