From bae3489b9131af192a438fa12695c1a0828143c3 Mon Sep 17 00:00:00 2001
From: nu774 <honeycomb77@gmail.com>
Date: Sat, 5 Jan 2013 14:20:23 +0900
Subject: [PATCH] tweak configure.ac and Makefile.am
---
Makefile.am | 21 +++++++++++++--------
configure.ac | 1 +
2 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 438b7af..980c751 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,18 +1,18 @@
ACLOCAL_AMFLAGS = -I m4
-EXTRA_DIST = COPYING
+AUTOMAKE_OPTIONS = subdir-objects
bin_PROGRAMS = fdkaac
fdkaac_SOURCES = \
- src/aacenc.c \
- src/lpcm.c \
- src/m4af.c \
- src/main.c \
- src/progress.c \
- src/wav_reader.c
+ src/aacenc.c \
+ src/lpcm.c \
+ src/m4af.c \
+ src/main.c \
+ src/progress.c \
+ src/wav_reader.c
fdkaac_LDADD = \
- @LIBICONV@ -lm
+ @LIBICONV@ -lm
if FDK_PLATFORM_POSIX
fdkaac_SOURCES += \
@@ -23,3 +23,8 @@ if FDK_PLATFORM_WIN32
fdkaac_SOURCES += \
src/compat_win32.c
endif
+
+EXTRA_DIST = \
+ src/*.h \
+ missings/*.c \
+ missings/*.h
diff --git a/configure.ac b/configure.ac
index 58bc422..a901b8e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,6 +10,7 @@ AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE
AC_PROG_CC
+AM_PROG_CC_C_O
AC_CHECK_HEADERS([getopt.h sys/time.h])
AC_CHECK_HEADERS([localcharset.h langinfo.h endian.h byteswap.h])
--
2.39.5