anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-28 20:45:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

use "aclocal -I config" instead of acinclude.m4. Now configure will be rebuilt automatically when a m4 file changes. This means that running autogen.sh should not be needed anymore (famous last words!).

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18032 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2007-04-26 10:06:36 +00:00
parent ea9b792b6a
commit c22d1bb430
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.am
View File

@ -1,10 +1,11 @@
include $(top_srcdir)/config/common.am include $(top_srcdir)/config/common.am
ACLOCAL_AMFLAGS = -I m4 -I config
DISTCLEANFILES += lyx.1 config.status config.cache config.log DISTCLEANFILES += lyx.1 config.status config.cache config.log
MAINTAINERCLEANFILES += $(srcdir)/aclocal.m4 \ MAINTAINERCLEANFILES += $(srcdir)/aclocal.m4 \
$(srcdir)/configure \ $(srcdir)/configure
$(srcdir)/acinclude.m4
DIST_SUBDIRS = m4 config development intl po boost src sourcedoc lib DIST_SUBDIRS = m4 config development intl po boost src sourcedoc lib
@ -66,4 +67,3 @@ lgbtags:
.PHONY: doxydoc .PHONY: doxydoc
ACLOCAL_AMFLAGS = -I m4

9
autogen.sh
View File

@ -1,10 +1,9 @@
#!/bin/sh #!/bin/sh
ACLOCAL="aclocal -I ${PWD}/m4" ACLOCAL="aclocal -I m4 -I config"
AUTOHEADER="autoheader" AUTOHEADER="autoheader"
AUTOMAKE="automake --add-missing --copy --foreign" AUTOMAKE="automake --add-missing --copy --foreign"
AUTOCONF="autoconf" AUTOCONF="autoconf"
ACINCLUDE_FILES="lyxinclude.m4 libtool.m4 pkg.m4 qt4.m4 spell.m4"
# Discover what version of automake we are using. # Discover what version of automake we are using.
automake_version=`$AUTOMAKE --version 2>/dev/null | head -n 1` automake_version=`$AUTOMAKE --version 2>/dev/null | head -n 1`
@ -71,12 +70,6 @@ fi
# automake will stop if their contents was created by an earlier version. # automake will stop if their contents was created by an earlier version.
rm -rf autom4te.cache rm -rf autom4te.cache
# Generate acinclude.m4
echo -n "Generate acinclude.m4... "
rm -f acinclude.m4
(cd config ; cat ${ACINCLUDE_FILES} ${EXTRA_ACINCLUDE_FILES} >../acinclude.m4)
echo "done."
# Generate the Makefiles and configure files # Generate the Makefiles and configure files
if ( $ACLOCAL --version ) < /dev/null > /dev/null 2>&1; then if ( $ACLOCAL --version ) < /dev/null > /dev/null 2>&1; then
echo "Building macros..." echo "Building macros..."