New upstream version 1.0.0

[fdkaac.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 980c7512cc0bebd57bbe1a5da276ec6fb5beef26..73291aaf7f2df589ab3eeb32409472dca187bc87 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,15 +4,26 @@ 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/aacenc.c               \
+    src/caf_reader.c           \
+    src/extrapolater.c         \
+    src/limiter.c              \
+    src/lpc.c                  \
+    src/m4af.c                 \
+    src/main.c                 \
+    src/metadata.c             \
+    src/parson.c               \
+    src/pcm_float_converter.c  \
+    src/pcm_native_converter.c \
+    src/pcm_readhelper.c       \
+    src/pcm_sint16_converter.c \
+    src/progress.c             \
     src/wav_reader.c
 
+dist_man_MANS = man/fdkaac.1
+
 fdkaac_LDADD = \
-    @LIBICONV@ -lm
+    @LIBICONV@ @CHARSET_LIB@ -lfdk-aac -lm
 
 if FDK_PLATFORM_POSIX
     fdkaac_SOURCES += \
@@ -24,7 +35,17 @@ if FDK_PLATFORM_WIN32
        src/compat_win32.c
 endif
 
+if FDK_NO_GETOPT_LONG
+    fdkaac_SOURCES += \
+       missings/getopt.c
+    AM_CPPFLAGS = -Imissings
+endif
+
 EXTRA_DIST = \
+    m4/.gitkeep  \
     src/*.h      \
     missings/*.c \
-    missings/*.h
+    missings/*.h \
+    MSVC/*.vcxproj \
+    MSVC/*.vcxproj.filters \
+    MSVC/*.sln