Skip to content
Permalink
Browse files

Replace shave with automake's silent rules. Fixes issue #20

Signed-off-by: Christoph Schmidt-Hieber <christoph.schmidthieber@googlemail.com>
  • Loading branch information
AdrianBunk authored and neurodroid committed Jun 27, 2012
1 parent 4a1d75e commit f6ad9c6e4a60d58f137df016db235c985cda36a3
@@ -83,7 +83,7 @@ if [ "x$AUTOCONF_VERSION" = "x" ] ; then
fi
# set to minimum acceptable version of automake
if [ "x$AUTOMAKE_VERSION" = "x" ] ; then
AUTOMAKE_VERSION=1.6.0
AUTOMAKE_VERSION=1.11
fi
# set to minimum acceptable version of libtool
if [ "x$LIBTOOL_VERSION" = "x" ] ; then
@@ -1,6 +1,7 @@
AC_INIT([stimfit],[0.11.4])
AC_CONFIG_SRCDIR(src/stimfit/gui/main.cpp)
AM_INIT_AUTOMAKE
AM_INIT_AUTOMAKE([1.11])
AM_SILENT_RULES([yes])
AC_CONFIG_MACRO_DIR([m4])

AC_PROG_CC
@@ -316,7 +317,6 @@ CXXFLAGS="${CXXFLAGS} -Wall"

AC_CONFIG_HEADERS([stfconf.h])

SHAVE_INIT(["."], [enable])
AC_CONFIG_FILES([Makefile src/Makefile src/libstfio/Makefile src/pystfio/Makefile src/stimfit/Makefile src/stimfit/py/Makefile stimfit.plist shave shave-libtool])
AC_CONFIG_FILES([Makefile src/Makefile src/libstfio/Makefile src/pystfio/Makefile src/stimfit/Makefile src/stimfit/py/Makefile stimfit.plist])

AC_OUTPUT

This file was deleted.

@@ -49,7 +49,6 @@ variant python27 description {Use Python version 2.7} {

configure.args --with-wx-config=${prefix}/bin/wx-config \
--disable-dependency-tracking \
--disable-shave \
CC="`${prefix}/bin/wx-config --cc`" \
CXX="`${prefix}/bin/wx-config --cxx`" \
LD="`${prefix}/bin/wx-config --ld`"
@@ -2,4 +2,4 @@

arch_flags=""
py_dir="/opt/local/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages/"
../../configure --enable-module --disable-dependency-tracking --disable-shave --prefix=${py_dir}/stfio CPPFLAGS="-DH5_USE_16_API" CFLAGS="" CXXFLAGS="-I/opt/local/include" LDFLAGS="-headerpad_max_install_names -L/opt/local/lib -L/usr/lib" CC=/usr/bin/clang CXX=/usr/bin/clang PYTHON_SITE_PKG=${py_dir}
../../configure --enable-module --disable-dependency-tracking --prefix=${py_dir}/stfio CPPFLAGS="-DH5_USE_16_API" CFLAGS="" CXXFLAGS="-I/opt/local/include" LDFLAGS="-headerpad_max_install_names -L/opt/local/lib -L/usr/lib" CC=/usr/bin/clang CXX=/usr/bin/clang PYTHON_SITE_PKG=${py_dir}
@@ -4,4 +4,4 @@
arch_flags="" # -arch i386 -arch x86_64"

# ../../configure --enable-python --with-wx-config=/Users/cs/wxbin/bin/wx-config CXX="/usr/bin/g++-4.0" CC="/usr/bin/gcc-4.0" LD="/usr/bin/g++-4.0" CPPFLAGS="-DH5_USE_16_API" CFLAGS="$arch_flags" CXXFLAGS="$arch_flags -I/Users/cs/wxPython-2.9/include -I/opt/local/include" LDFLAGS="$arch_flags -headerpad_max_install_names -L/Users/cs/wxbin/lib -L/opt/local/lib -L/usr/lib" PYTHON=/usr/bin/python2.5
../../configure --with-wx-config=/Users/cs/wxbin/bin/wx-config --disable-dependency-tracking --prefix=/Users/cs/stimfit/build/release/stimfit.app/Contents --disable-shave CPPFLAGS="-DH5_USE_16_API" CFLAGS="" CXXFLAGS="-I/Users/cs/wxbin/include/wx-2.9 -I/opt/local/include" LDFLAGS="-headerpad_max_install_names -L/Users/cs/wxbin/lib -L/opt/local/lib -L/usr/lib" PYTHON=/usr/bin/python CC=/usr/bin/llvm-gcc-4.2 CXX=/usr/bin/llvm-g++-4.2
../../configure --with-wx-config=/Users/cs/wxbin/bin/wx-config --disable-dependency-tracking --prefix=/Users/cs/stimfit/build/release/stimfit.app/Contents CPPFLAGS="-DH5_USE_16_API" CFLAGS="" CXXFLAGS="-I/Users/cs/wxbin/include/wx-2.9 -I/opt/local/include" LDFLAGS="-headerpad_max_install_names -L/Users/cs/wxbin/lib -L/opt/local/lib -L/usr/lib" PYTHON=/usr/bin/python CC=/usr/bin/llvm-gcc-4.2 CXX=/usr/bin/llvm-g++-4.2
@@ -7,7 +7,6 @@ MYCXX=`${prefix}/bin/wx-config --cxx`
MYLD=`${prefix}/bin/wx-config --ld`

config_args="--with-wx-config=${prefix}/bin/wx-config \
--disable-dependency-tracking \
--disable-shave"
--disable-dependency-tracking"

../../configure ${config_args} CC="${MYCC} -I${prefix}/include" CXX="${MYCXX} -I${prefix}/include" LD="${MYLD}" LDFLAGS="-headerpad_max_install_names -L${prefix}/lib"
115 shave

This file was deleted.

This file was deleted.

0 comments on commit f6ad9c6

Please sign in to comment.
You can’t perform that action at this time.