diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2013-03-02 12:29:26 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@gmail.com> | 2013-03-02 12:29:26 +0000 |
| commit | 0441c8dbc360f22f541cd23e9d3aadeadad24f92 (patch) | |
| tree | 0c7e101fc672f086cc706afe639db1b53c453b24 | |
| parent | Fix build with C++11 (diff) | |
| download | inkscape-0441c8dbc360f22f541cd23e9d3aadeadad24f92.tar.gz inkscape-0441c8dbc360f22f541cd23e9d3aadeadad24f92.zip | |
Fix autotools deprecation warnings
(bzr r12167)
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | src/Makefile.am | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index d32a3018d..d4ebad20e 100644 --- a/configure.ac +++ b/configure.ac @@ -19,7 +19,7 @@ AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([build-aux]) AC_CANONICAL_HOST -AM_INIT_AUTOMAKE([dist-zip dist-bzip2 tar-pax]) +AM_INIT_AUTOMAKE([-Wall dist-zip dist-bzip2 tar-pax]) AC_ARG_ENABLE([lsb], AS_HELP_STRING([--enable-lsb], [LSB-compatible build configuration]), [ prefix=/opt/inkscape @@ -33,7 +33,6 @@ AC_LANG(C++) AC_PROG_CXX AC_PROG_CC AM_PROG_AS -AC_PROG_RANLIB # Initialize libtool LT_PREREQ([2.2]) LT_INIT diff --git a/src/Makefile.am b/src/Makefile.am index a899c7b35..2a4e2960c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -65,7 +65,7 @@ BUILT_SOURCES = # Extra files to distribute EXTRA_DIST = -INCLUDES = \ +AM_CPPFLAGS = \ $(PERL_CFLAGS) $(PYTHON_CFLAGS) \ $(EXIF_CFLAGS) \ $(FREETYPE_CFLAGS) \ @@ -88,8 +88,7 @@ INCLUDES = \ $(WIN32_CFLAGS) \ -I$(srcdir)/bind/javainc \ -I$(srcdir)/bind/javainc/linux \ - -I$(builddir)/extension/dbus \ - $(AM_CPPFLAGS) + -I$(builddir)/extension/dbus CXXTEST_TEMPLATE = $(srcdir)/cxxtest-template.tpl CXXTESTGENFLAGS = --root --have-eh --template=$(CXXTEST_TEMPLATE) |