Do not use libtool

This commit is contained in:
Yevgen Muntyan 2010-09-20 00:33:43 -07:00
parent 5cb3ada955
commit 52f19f437f
4 changed files with 22 additions and 73 deletions

View File

@ -16,7 +16,7 @@ run_cmd() {
"$@" || exit $!
}
run_cmd libtoolize --copy --force
# run_cmd libtoolize --copy --force
run_cmd intltoolize --copy --force
echo "sed -e s/@GETTEXT_PACKAGE@/moo-gsv/ po/Makefile.in.in > po-gsv/Makefile.in.in"

View File

@ -18,7 +18,7 @@ AC_CONFIG_MACRO_DIR([m4])
AC_SUBST(ACLOCAL_FLAGS)
AM_INIT_AUTOMAKE([1.11 silent-rules foreign dist-bzip2 dist-zip no-dist-gzip])
LT_INIT([disable-shared])
# LT_INIT([disable-shared])
AC_ARG_ENABLE(release,
AC_HELP_STRING([--enable-release],[assume it's a release build]),[
@ -71,7 +71,7 @@ AH_TOP([#ifndef __CONFIG_H__
AH_BOTTOM([#include <moo-config.h>
#endif // __CONFIG_H__])
LT_LIB_M
MOO_LT_LIB_M
AC_DEFINE(MOO_BUILD_APP,[1],[MOO_BUILD_APP])
AC_DEFINE(MOO_BUILD_EDIT,[1],[MOO_BUILD_EDIT])

View File

@ -43,3 +43,22 @@ AM_CONDITIONAL(MOO_OS_[]_moo_os_,[$MOO_OS_[]_moo_os_])
])
])
# LT_LIB_M macro from libtool.m4
AC_DEFUN([MOO_LT_LIB_M],
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
LIBM=
case $host in
*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
# These system don't have libm, or don't need it
;;
*-ncr-sysv4.3*)
AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
;;
*)
AC_CHECK_LIB(m, cos, LIBM="-lm")
;;
esac
AC_SUBST([LIBM])
])# LT_LIB_M

View File

@ -1,70 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<medit-project version="2.0" type="C" name="moo">
<active>debug</active>
<configurations>
<configuration name="debug">
<build_dir>build/debug</build_dir>
<configure>
<args>--enable-debug --enable-all-warnings --enable-project --enable-unit-tests --prefix=${PREFIX:-/usr/local}</args>
<vars>
<var name="CC">gcc-4.2</var>
<var name="CFLAGS">-g</var>
<var name="CXX">g++-4.2</var>
<var name="CXXFLAGS">-g</var>
</vars>
</configure>
</configuration>
<configuration name="gtk-2.10">
<build_dir>/home/muntyan/projects/gtk-2.10/moo</build_dir>
<configure>
<args>--configure-manually</args>
</configure>
</configuration>
<configuration name="gtk-2.6">
<build_dir>/home/muntyan/projects/gtk-2.6/moo</build_dir>
<configure>
<args>--enable-debug --enable-all-warnings --prefix=$PREFIX --enable-unit-tests --enable-project</args>
</configure>
</configuration>
<configuration name="gtk-cvs">
<build_dir>/home/muntyan/projects/gtk/build/moo</build_dir>
<configure>
<args>--enable-debug --enable-all-warnings --prefix=$PREFIX --enable-unit-tests --enable-project</args>
</configure>
</configuration>
<configuration name="mingw">
<build_dir>build/mingw</build_dir>
<configure>
<args/>
</configure>
</configuration>
<configuration name="optimized">
<build_dir>build/optimized</build_dir>
<configure>
<args>--enable-all-warnings</args>
<vars>
<var name="CFLAGS">-O2 -g</var>
<var name="OBJCFLAGS">-O2 -g</var>
</vars>
</configure>
</configuration>
<configuration name="pida">
<build_dir>build/pida</build_dir>
<configure>
<args>--enable-debug --enable-all-warnings --enable-moo-module --disable-medit</args>
<vars>
<var name="CC">gcc-4.2</var>
<var name="CFLAGS">-g</var>
</vars>
</configure>
</configuration>
</configurations>
<run>
<args>--app-name foobar</args>
<exe>medit/medit</exe>
<vars>
<var name="LANGUAGE">ru</var>
<var name="MOO_DEBUG">misc</var>
</vars>
</run>
</medit-project>