reactos/ccache
1
0
Fork 0
mirror of https://github.com/reactos/ccache.git synced 2025-03-03 16:27:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Get rid of configure-dev; dev mode is given by dev.mk.in presence

Browse Source
This commit is contained in:
Joel Rosdahl 2010-07-14 12:15:35 +02:00
parent 97ea9fd4fa
commit 9df9bc81f8
4 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
autogen.sh
View File

@ -4,4 +4,4 @@ set -e
autoheader
autoconf
echo "Now run ./configure-dev and make"
echo "Now run ./configure and make"

3
configure-dev
View File

@ -1,3 +0,0 @@
#!/bin/sh
`dirname $0`/configure --enable-dev "$@"

28
configure.ac
View File

@ -10,12 +10,6 @@ AC_CONFIG_HEADER(config.h)
AC_SUBST(extra_sources)
AC_SUBST(include_dev_mk)
ccache_dev=no
AC_ARG_ENABLE(
dev,
AS_HELP_STRING(--enable-dev, enable developer mode (requires GNU make)),
[include_dev_mk='include dev.mk'; ccache_dev=yes])
dnl Checks for programs.
AC_PROG_CC
AC_PROG_CPP
@ -281,7 +275,19 @@ if test "$ac_cv_c_extern_inline" != no ; then
Define to 1 if your compiler supports extern inline)
fi
AC_CONFIG_FILES([Makefile dev.mk])
dnl Enable developer mode if dev.mk.in exists.
if test -f $srcdir/dev.mk.in; then
AC_MSG_NOTICE(Enabling developer mode)
AC_CONFIG_FILES([dev.mk])
include_dev_mk='include dev.mk'
version=`(git describe --dirty 2>/dev/null || echo vunknown) | sed -e 's/v//' -e 's/-/+/' -e 's/-/_/g'`
echo "const char CCACHE_VERSION@<:@@:>@ = \"$version\";" >version.c
elif test ! -f $srcdir/version.c; then
AC_MSG_WARN(unable to determine ccache version)
echo "const char CCACHE_VERSION@<:@@:>@ = \"unknown\";" >version.c
fi
AC_CONFIG_FILES([Makefile])
AC_OUTPUT
cat <<EOF >config.h.tmp
@ -292,14 +298,6 @@ cat config.h >>config.h.tmp
echo '#endif' >>config.h.tmp
mv config.h.tmp config.h
if test "x$ccache_dev" = "xyes"; then
version=`(git describe --dirty 2>/dev/null || echo vunknown) | sed -e 's/v//' -e 's/-/+/' -e 's/-/_/g'`
echo "const char CCACHE_VERSION@<:@@:>@ = \"$version\";" >version.c
elif test ! -f version.c; then
AC_MSG_WARN(unable to determine ccache version)
echo "const char CCACHE_VERSION@<:@@:>@ = \"unknown\";" >version.c
fi
mkdir -p .deps
if test x$use_bundled_zlib = xyes; then

2
dev.mk.in
View File

@ -24,7 +24,7 @@ files_to_clean += *.xml
source_dist_files = \
$(sources) $(headers) zlib/*.c zlib/*.h \
config.h.in configure configure-dev dev.mk.in install-sh Makefile.in \
config.h.in configure install-sh Makefile.in \
test.sh COPYING INSTALL.txt NEWS.txt README.txt
dist_files = \
$(addprefix $(srcdir)/, $(source_dist_files)) \