diff options
| author | iovar <iovar@f606c939-3180-4ac9-a4b8-4b8779d57d0a> | 2008-11-16 13:49:11 +0000 |
|---|---|---|
| committer | iovar <iovar@f606c939-3180-4ac9-a4b8-4b8779d57d0a> | 2008-11-16 13:49:11 +0000 |
| commit | e73eff61d0b88ea9a42bd40117454a23a02a47e1 (patch) | |
| tree | 9c7ec3ad054af2580dca7988d13be4d93fe651b6 | |
| parent | dfa21cf84422c2d2a91462ef33a92dd42c85010e (diff) | |
src/Makefile.am, Makefile.am, autogen.sh, configure.ac:
Changed Automake requirement to 1.9 and made some minor changes to accomodate the
removal of the m4 macros, as per rev #570
git-svn-id: https://recordmydesktop.svn.sourceforge.net/svnroot/recordmydesktop/trunk@572 f606c939-3180-4ac9-a4b8-4b8779d57d0a
| -rw-r--r-- | qt-recordmydesktop/Makefile.am | 5 | ||||
| -rw-r--r-- | qt-recordmydesktop/autogen.sh | 4 | ||||
| -rw-r--r-- | qt-recordmydesktop/configure.ac | 4 | ||||
| -rw-r--r-- | qt-recordmydesktop/src/Makefile.am | 1 |
4 files changed, 5 insertions, 9 deletions
diff --git a/qt-recordmydesktop/Makefile.am b/qt-recordmydesktop/Makefile.am index ae4e04c..c708b7e 100644 --- a/qt-recordmydesktop/Makefile.am +++ b/qt-recordmydesktop/Makefile.am @@ -1,10 +1,7 @@ -AUTOMAKE_OPTIONS = 1.5 +AUTOMAKE_OPTIONS = 1.9 ACLOCAL_AMFLAGS = -I m4 -include $(srcdir)/m4/common.mk -include $(srcdir)/m4/pychecker.mk - SUBDIRS = src po m4 EXTRA_DIST= config.rpath diff --git a/qt-recordmydesktop/autogen.sh b/qt-recordmydesktop/autogen.sh index 55f5e93..30259c7 100644 --- a/qt-recordmydesktop/autogen.sh +++ b/qt-recordmydesktop/autogen.sh @@ -1,7 +1,7 @@ #/bin/bash -aclocal-1.7 -I m4/ -automake-1.7 --add-missing +aclocal -I m4/ +automake --add-missing autoconf diff --git a/qt-recordmydesktop/configure.ac b/qt-recordmydesktop/configure.ac index 5eecfe3..c04dedd 100644 --- a/qt-recordmydesktop/configure.ac +++ b/qt-recordmydesktop/configure.ac @@ -1,7 +1,7 @@ AC_PREREQ(2.59) -AC_INIT(src/rmdSimple.py) -AM_INIT_AUTOMAKE(qt-recordmydesktop, 0.3.7.2) +AC_INIT([qt-recordmydesktop], [0.3.7.2]) +AM_INIT_AUTOMAKE AS_AC_EXPAND(LIBDIR, $libdir) AC_MSG_NOTICE(Storing library files in $LIBDIR) diff --git a/qt-recordmydesktop/src/Makefile.am b/qt-recordmydesktop/src/Makefile.am index a22f187..246f4d7 100644 --- a/qt-recordmydesktop/src/Makefile.am +++ b/qt-recordmydesktop/src/Makefile.am @@ -1,4 +1,3 @@ -include $(top_srcdir)/m4/python.mk bin_SCRIPTS=qt-recordMyDesktop |