tweak configure.ac and Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 438b7af231edae6b7c590ba4cf0f1a256ab6c3ac..980c7512cc0bebd57bbe1a5da276ec6fb5beef26 100644 (file)
--- 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 58bc4225ea75d1dd40b228dcc1ebe4615fd93e7a..a901b8e79cb48ce56a31382720675421d77b37a4 100644 (file)
--- 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])