summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoriovar <iovar@f606c939-3180-4ac9-a4b8-4b8779d57d0a>2008-11-16 13:57:16 +0000
committeriovar <iovar@f606c939-3180-4ac9-a4b8-4b8779d57d0a>2008-11-16 13:57:16 +0000
commit51d3bac1328cfeb435e105d730b3d751bf75fc2b (patch)
tree33c15a81047ec0be7eedbeda8284d182a24f6982
parent478b415ecf219e1ad73400bb852f5eac76f7a1d6 (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 #573 git-svn-id: https://recordmydesktop.svn.sourceforge.net/svnroot/recordmydesktop/trunk@575 f606c939-3180-4ac9-a4b8-4b8779d57d0a
-rw-r--r--gtk-recordmydesktop/Makefile.am5
-rw-r--r--gtk-recordmydesktop/autogen.sh4
-rw-r--r--gtk-recordmydesktop/configure.ac4
-rw-r--r--gtk-recordmydesktop/src/Makefile.am2
4 files changed, 5 insertions, 10 deletions
diff --git a/gtk-recordmydesktop/Makefile.am b/gtk-recordmydesktop/Makefile.am
index ae4e04c..c708b7e 100644
--- a/gtk-recordmydesktop/Makefile.am
+++ b/gtk-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/gtk-recordmydesktop/autogen.sh b/gtk-recordmydesktop/autogen.sh
index 55f5e93..30259c7 100644
--- a/gtk-recordmydesktop/autogen.sh
+++ b/gtk-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/gtk-recordmydesktop/configure.ac b/gtk-recordmydesktop/configure.ac
index 2ade5d3..0e205ef 100644
--- a/gtk-recordmydesktop/configure.ac
+++ b/gtk-recordmydesktop/configure.ac
@@ -1,7 +1,7 @@
AC_PREREQ(2.59)
-AC_INIT(src/rmdSimple.py)
-AM_INIT_AUTOMAKE(gtk-recordmydesktop, 0.3.7.2)
+AC_INIT([gtk-recordmydesktop], [0.3.7.2])
+AM_INIT_AUTOMAKE
AS_AC_EXPAND(LIBDIR, $libdir)
AC_MSG_NOTICE(Storing library files in $LIBDIR)
diff --git a/gtk-recordmydesktop/src/Makefile.am b/gtk-recordmydesktop/src/Makefile.am
index d0d2057..1527d23 100644
--- a/gtk-recordmydesktop/src/Makefile.am
+++ b/gtk-recordmydesktop/src/Makefile.am
@@ -1,5 +1,3 @@
-include $(top_srcdir)/m4/python.mk
-
bin_SCRIPTS=gtk-recordMyDesktop
gtk_recordMyDesktopdir=$(pythondir)/recordMyDesktop
© All Rights Reserved