Commit 375ba1c4 authored by Ralph Giles's avatar Ralph Giles

Fix automake warning.

Newer versions prefer AM_CPPFLAGS to INCLUDES.
Tell libtool about our m4 directory.
parent 4729a15d
......@@ -16,6 +16,7 @@ AM_MAINTAINER_MODE
dnl Add parameters for aclocal
AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")
AC_CONFIG_MACRO_DIRS([m4])
dnl Library versioning
dnl - library source changed -> increment REVISION
......
......@@ -2,13 +2,13 @@
AUTOMAKE_OPTIONS = foreign
INCLUDES = -I$(top_srcdir)/include @OGG_CFLAGS@
noinst_PROGRAMS = decoder_example encoder_example chaining_example\
vorbisfile_example seeking_example
EXTRA_DIST = frameview.pl
AM_CPPFLAGS = -I$(top_srcdir)/include @OGG_CFLAGS@
# uncomment to build static executables from the example code
#LDFLAGS = -all-static
......
......@@ -2,7 +2,7 @@
SUBDIRS = modes books
INCLUDES = -I$(top_srcdir)/include @OGG_CFLAGS@
AM_CPPFLAGS = -I$(top_srcdir)/include @OGG_CFLAGS@
lib_LTLIBRARIES = libvorbis.la libvorbisfile.la libvorbisenc.la
......
......@@ -2,13 +2,13 @@
AUTOMAKE_OPTIONS = foreign
INCLUDES = -I$(top_srcdir)/include @OGG_CFLAGS@
check_PROGRAMS = test
check: $(check_PROGRAMS)
./test$(EXEEXT)
AM_CPPFLAGS = -I$(top_srcdir)/include @OGG_CFLAGS@
test_SOURCES = util.c util.h write_read.c write_read.h test.c
test_LDADD = ../lib/libvorbisenc.la ../lib/libvorbis.la @OGG_LIBS@ @VORBIS_LIBS@
......
## Process this file with automake to produce Makefile.in
INCLUDES = -I../lib -I$(top_srcdir)/include @OGG_CFLAGS@
EXTRA_PROGRAMS = latticebuild latticetune huffbuild distribution
CLEANFILES = $(EXTRA_PROGRAMS)
AM_CPPFLAGS = -I../lib -I$(top_srcdir)/include @OGG_CFLAGS@
AM_LDFLAGS = -static
LDADD = ../lib/libvorbis.la
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment