Do not use old variable INCLUDES and use modern AM_INIT_AUTOMAKE invocation.

Signed-off-by: Erik de Castro Lopo <erikd@mega-nerd.com>
This commit is contained in:
Karl Lindén 2013-04-05 13:25:46 +02:00 committed by Erik de Castro Lopo
parent 0d6a1b0725
commit 958263fbd7
7 changed files with 7 additions and 7 deletions

View File

@ -21,7 +21,7 @@ OCT_LIB_DIR = @OCT_LIB_DIR@
OCT_LIBS = @OCT_LIBS@ OCT_LIBS = @OCT_LIBS@
SNDFILEDIR = $(top_builddir)/src SNDFILEDIR = $(top_builddir)/src
INCLUDES = -I$(SNDFILEDIR) AM_CPPFLAGS = -I$(SNDFILEDIR)
oct_module_srcs = sndfile.cc oct_module_srcs = sndfile.cc
oct_module_files = sndfile.oct PKG_ADD oct_module_files = sndfile.oct PKG_ADD

View File

@ -15,7 +15,7 @@ AC_CANONICAL_TARGET([])
AC_CONFIG_MACRO_DIR([M4]) AC_CONFIG_MACRO_DIR([M4])
AC_CONFIG_HEADERS([src/config.h]) AC_CONFIG_HEADERS([src/config.h])
AM_INIT_AUTOMAKE($PACKAGE_NAME,$PACKAGE_VERSION) AM_INIT_AUTOMAKE
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AC_LANG([C]) AC_LANG([C])

View File

@ -2,7 +2,7 @@
noinst_PROGRAMS = make_sine sfprocess list_formats generate sndfilehandle sndfile-to-text noinst_PROGRAMS = make_sine sfprocess list_formats generate sndfilehandle sndfile-to-text
INCLUDES = -I$(top_srcdir)/src AM_CPPFLAGS = -I$(top_srcdir)/src
sndfile_to_text_SOURCES = sndfile-to-text.c sndfile_to_text_SOURCES = sndfile-to-text.c
sndfile_to_text_LDADD = $(top_builddir)/src/libsndfile.la sndfile_to_text_LDADD = $(top_builddir)/src/libsndfile.la

View File

@ -7,7 +7,7 @@ bin_PROGRAMS = sndfile-info sndfile-play sndfile-convert sndfile-cmp \
OS_SPECIFIC_CFLAGS = @OS_SPECIFIC_CFLAGS@ OS_SPECIFIC_CFLAGS = @OS_SPECIFIC_CFLAGS@
OS_SPECIFIC_LINKS = @OS_SPECIFIC_LINKS@ OS_SPECIFIC_LINKS = @OS_SPECIFIC_LINKS@
INCLUDES = -I$(top_srcdir)/src $(OS_SPECIFIC_CFLAGS) AM_CPPFLAGS = -I$(top_srcdir)/src $(OS_SPECIFIC_CFLAGS)
CLEANFILES = *~ CLEANFILES = *~

View File

@ -4,7 +4,7 @@ bin_PROGRAMS = sndfile-regtest
noinst_HEADERS = regtest.h noinst_HEADERS = regtest.h
INCLUDES = -I$(top_srcdir)/src $(SQLITE3_CFLAGS) $(OS_SPECIFIC_CFLAGS) AM_CPPFLAGS = -I$(top_srcdir)/src $(SQLITE3_CFLAGS) $(OS_SPECIFIC_CFLAGS)
sndfile_regtest_SOURCES = sndfile-regtest.c database.c checksum.c sndfile_regtest_SOURCES = sndfile-regtest.c database.c checksum.c
sndfile_regtest_LDADD = $(top_builddir)/src/libsndfile.la $(SQLITE3_LIBS) sndfile_regtest_LDADD = $(top_builddir)/src/libsndfile.la $(SQLITE3_LIBS)

View File

@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = subdir-objects AUTOMAKE_OPTIONS = subdir-objects
INCLUDES = @EXTERNAL_CFLAGS@ AM_CPPFLAGS = @EXTERNAL_CFLAGS@
lib_LTLIBRARIES = libsndfile.la lib_LTLIBRARIES = libsndfile.la
include_HEADERS = sndfile.hh include_HEADERS = sndfile.hh

View File

@ -6,7 +6,7 @@ else
CPP_TEST = cpp_test CPP_TEST = cpp_test
endif endif
INCLUDES = -I$(top_srcdir)/src AM_CPPFLAGS = -I$(top_srcdir)/src
check_PROGRAMS = sfversion floating_point_test write_read_test \ check_PROGRAMS = sfversion floating_point_test write_read_test \
lossy_comp_test error_test ulaw_test alaw_test dwvw_test \ lossy_comp_test error_test ulaw_test alaw_test dwvw_test \