|
0 |
Author: Fabian Greffrath <fabian+debian@greffrath.com>
|
|
1 |
Description: Fix most autotools warnings
|
|
2 |
|
|
3 |
--- a/Makefile.am
|
|
4 |
+++ b/Makefile.am
|
|
5 |
@@ -2,6 +2,8 @@ SUBDIRS = libfaad common frontend plugin
|
|
6 |
|
|
7 |
EXTRA_DIST = faad2.spec
|
|
8 |
|
|
9 |
+ACLOCAL_AMFLAGS = -I m4
|
|
10 |
+
|
|
11 |
rpm: Makefile
|
|
12 |
make dist
|
|
13 |
$(RPMBUILD) -ta $(PACKAGE)-$(VERSION).tar.gz
|
|
14 |
--- a/configure.in
|
|
15 |
+++ b/configure.in
|
|
16 |
@@ -7,9 +7,10 @@ dnl - faad
|
|
17 |
dnl - xmms input mp4/aac plugin
|
|
18 |
dnl - mpeg4ip plugin (requires mpeg4ip's libmp4v2 to be installed)
|
|
19 |
|
|
20 |
-AC_INIT
|
|
21 |
+AC_INIT([faad2], [2.7.0])
|
|
22 |
AC_CONFIG_AUX_DIR(.)
|
|
23 |
-AM_INIT_AUTOMAKE(faad2, 2.7.0)
|
|
24 |
+AM_INIT_AUTOMAKE([subdir-objects])
|
|
25 |
+AC_CONFIG_MACRO_DIR([m4])
|
|
26 |
|
|
27 |
AC_PROG_LIBTOOL
|
|
28 |
AC_SUBST(LIBTOOL_DEPS)
|
|
29 |
--- a/frontend/Makefile.am
|
|
30 |
+++ b/frontend/Makefile.am
|
|
31 |
@@ -1,7 +1,7 @@
|
|
32 |
bin_PROGRAMS = faad
|
|
33 |
man_MANS = faad.man
|
|
34 |
|
|
35 |
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/faad \
|
|
36 |
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/common/faad \
|
|
37 |
-I$(top_srcdir)/common/mp4ff
|
|
38 |
|
|
39 |
faad_LDADD = $(top_builddir)/libfaad/libfaad.la \
|
|
40 |
--- a/plugins/mpeg4ip/Makefile.am
|
|
41 |
+++ b/plugins/mpeg4ip/Makefile.am
|
|
42 |
@@ -13,7 +13,7 @@ faad2_plugin_la_LIBADD = \
|
|
43 |
-lm
|
|
44 |
|
|
45 |
|
|
46 |
-INCLUDES = -I$(top_srcdir)/include
|
|
47 |
+AM_CPPFLAGS = -I$(top_srcdir)/include
|
|
48 |
|
|
49 |
AM_CFLAGS = -D_REENTRANT -fexceptions
|
|
50 |
|