diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.in | 9 | ||||
| -rw-r--r-- | src/Makefile.am | 6 | ||||
| -rw-r--r-- | src/flac/Makefile.am | 7 | ||||
| -rw-r--r-- | src/libFLAC/Makefile.am | 6 | ||||
| -rw-r--r-- | test/Makefile.am | 4 |
6 files changed, 24 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index 88fe95b2..552ae0b9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -34,7 +34,7 @@ # -SUBDIRS = src test +SUBDIRS = doc include man src test DISTCLEANFILES = libtool-disable-static diff --git a/configure.in b/configure.in index 63199fa7..6383e5d1 100644 --- a/configure.in +++ b/configure.in @@ -136,7 +136,7 @@ AC_SUBST(FLaC__SIZE64) AC_SUBST(FLaC__USIZE64) SAVE_CFLAGS="$CFLAGS" -CFLAGS='-I./include -I $(top_srcdir)/include -Wall -W' +CFLAGS='-I$(srcdir)/include -I $(top_srcdir)/include -Wall -W' if test x$debug = xtrue; then CFLAGS="$CFLAGS -g -O0 -DDEBUG" else @@ -151,6 +151,9 @@ AC_OUTPUT( Makefile \ src/Makefile \ src/libFLAC/Makefile \ src/libFLAC/ia32/Makefile \ + src/libFLAC/include/Makefile \ + src/libFLAC/include/private/Makefile \ + src/libFLAC/include/protected/Makefile \ src/flac/Makefile \ src/metaflac/Makefile \ src/plugin_xmms/Makefile \ @@ -159,5 +162,9 @@ AC_OUTPUT( Makefile \ include/Makefile \ include/FLAC/Makefile \ include/FLAC/ordinals.h \ + doc/Makefile \ + doc/images/Makefile \ + doc/ru/Makefile \ + man/Makefile \ test/Makefile \ ) diff --git a/src/Makefile.am b/src/Makefile.am index 6d2cd9dd..3970d61a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,8 +19,4 @@ if FLaC__HAS_XMMS XMMS_DIRS = plugin_xmms endif -if DEBUG -DEBUG_DIRS = test_streams test_unit -endif - -SUBDIRS = libFLAC flac metaflac $(XMMS_DIRS) $(DEBUG_DIRS) +SUBDIRS = libFLAC flac metaflac $(XMMS_DIRS) test_streams test_unit diff --git a/src/flac/Makefile.am b/src/flac/Makefile.am index 5d762d03..cefea827 100644 --- a/src/flac/Makefile.am +++ b/src/flac/Makefile.am @@ -23,6 +23,11 @@ flac_SOURCES = \ decode.c \ encode.c \ file.c \ - main.c + main.c \ + analyze.h \ + decode.h \ + encode.h \ + file.h + flac_LDFLAGS = -lm flac_LDADD = $(top_builddir)/src/libFLAC/libFLAC.la diff --git a/src/libFLAC/Makefile.am b/src/libFLAC/Makefile.am index 2e976178..1381e3ad 100644 --- a/src/libFLAC/Makefile.am +++ b/src/libFLAC/Makefile.am @@ -31,12 +31,14 @@ if FLaC__NO_ASM else if FLaC__CPU_IA32 if FLaC__HAS_NASM -SUBDIRS = ia32 . -libFLAC_la_LIBADD = ia32/libFLAC-asm.a +ARCH_SUBDIRS = ia32 +libFLAC_la_LIBADD = ia32/libFLAC-asm.la endif endif endif +SUBDIRS = $(ARCH_SUBDIRS) include . + libFLAC_la_LDFLAGS = -version-info 1:0:0 libFLAC_la_SOURCES = \ diff --git a/test/Makefile.am b/test/Makefile.am index da56807f..a8027bd0 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -17,6 +17,10 @@ TESTS = ./test_unit.sh ./test_streams.sh ./test_bins.sh +EXTRA_DIST = test_unit.sh \ + test_streams.sh \ + test_bins.sh + CLEANFILES = \ $(wildcard *.raw) $(wildcard *.flac) $(wildcard *.cmp) $(wildcard *.wav) \ $(wildcard ../../test_files/bins/*.raw) \ |