diff options
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | doc/html/Makefile.am | 20 | ||||
-rw-r--r-- | examples/c/decode/file/Makefile.am | 1 | ||||
-rw-r--r-- | examples/c/encode/file/Makefile.am | 1 | ||||
-rw-r--r-- | examples/cpp/decode/file/Makefile.am | 4 | ||||
-rw-r--r-- | examples/cpp/encode/file/Makefile.am | 4 |
6 files changed, 29 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index fe9ca844..5627bb54 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,7 +30,7 @@ AUTOMAKE_OPTIONS = foreign 1.7 -SUBDIRS = doc include m4 man src test build obj +SUBDIRS = doc include m4 man src examples test build obj DISTCLEANFILES = libtool-disable-static diff --git a/doc/html/Makefile.am b/doc/html/Makefile.am index 58e4ecce..2879c313 100644 --- a/doc/html/Makefile.am +++ b/doc/html/Makefile.am @@ -24,9 +24,29 @@ docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/html doc_DATA = \ changelog.html \ comparison.html \ + comparison__chopin_prelude_24.html \ + comparison__dream_theater_600.html \ + comparison__eddie_warner_titus.html \ + comparison__fanfare_de_l_eventail_de_jeanne.html \ + comparison__gloria_estefan_conga.html \ + comparison__hand_in_my_pocket.html \ + comparison__l_sub_raga_sivapriya.html \ + comparison__laetatus_sum.html \ + comparison__mummified_in_barbed_wire.html \ + comparison__prokofiev_pcon3_3.html \ + comparison__ravel_sq4_4.html \ + comparison__scarlatti_k42.html \ + comparison__tool_forty_six_and_2.html \ + comparison__white_room.html \ + comparison_all_cpudectime.html \ + comparison_all_cpuenctime.html \ + comparison_all_procdectime.html \ + comparison_all_procenctime.html \ + comparison_all_ratio.html \ developers.html \ documentation.html \ documentation_bugs.html \ + documentation_example_code.html \ documentation_format_overview.html \ documentation_tasks.html \ documentation_tools.html \ diff --git a/examples/c/decode/file/Makefile.am b/examples/c/decode/file/Makefile.am index 908900df..eb18ceb5 100644 --- a/examples/c/decode/file/Makefile.am +++ b/examples/c/decode/file/Makefile.am @@ -22,6 +22,7 @@ EXTRA_DIST = \ noinst_PROGRAMS = example_c_decode_file example_c_decode_file_LDADD = \ + $(top_builddir)/src/libFLAC/libFLAC.la \ @OGG_LIBS@ \ @MINGW_WINSOCK_LIBS@ \ -lm diff --git a/examples/c/encode/file/Makefile.am b/examples/c/encode/file/Makefile.am index 021d6283..be98e855 100644 --- a/examples/c/encode/file/Makefile.am +++ b/examples/c/encode/file/Makefile.am @@ -22,6 +22,7 @@ EXTRA_DIST = \ noinst_PROGRAMS = example_c_encode_file example_c_encode_file_LDADD = \ + $(top_builddir)/src/libFLAC/libFLAC.la \ @OGG_LIBS@ \ @MINGW_WINSOCK_LIBS@ \ -lm diff --git a/examples/cpp/decode/file/Makefile.am b/examples/cpp/decode/file/Makefile.am index 282b4463..a0d3dbf9 100644 --- a/examples/cpp/decode/file/Makefile.am +++ b/examples/cpp/decode/file/Makefile.am @@ -22,7 +22,9 @@ EXTRA_DIST = \ noinst_PROGRAMS = example_cpp_decode_file example_cpp_decode_file_LDADD = \ + $(top_builddir)/src/libFLAC++/libFLAC++.la \ + $(top_builddir)/src/libFLAC/libFLAC.la \ @OGG_LIBS@ \ @MINGW_WINSOCK_LIBS@ \ -lm -example_cpp_decode_file_SOURCES = main.c +example_cpp_decode_file_SOURCES = main.cpp diff --git a/examples/cpp/encode/file/Makefile.am b/examples/cpp/encode/file/Makefile.am index ea4f7883..4a0a8af6 100644 --- a/examples/cpp/encode/file/Makefile.am +++ b/examples/cpp/encode/file/Makefile.am @@ -22,7 +22,9 @@ EXTRA_DIST = \ noinst_PROGRAMS = example_cpp_encode_file example_cpp_encode_file_LDADD = \ + $(top_builddir)/src/libFLAC++/libFLAC++.la \ + $(top_builddir)/src/libFLAC/libFLAC.la \ @OGG_LIBS@ \ @MINGW_WINSOCK_LIBS@ \ -lm -example_cpp_encode_file_SOURCES = main.c +example_cpp_encode_file_SOURCES = main.cpp |