--- libgig/trunk/src/Makefile.am	2004/08/18 12:11:26	220
+++ libgig/trunk/src/Makefile.am	2009/10/27 18:34:06	2016
@@ -1,14 +1,29 @@
+SUBDIRS = testcases
+
 # to prevent compile errors on some systems
-AM_CXXFLAGS = -pedantic
+AM_CXXFLAGS = -pedantic -Wreturn-type
+
+# link gigextract either against libaudiofile or libsndfile
+# (if both exist on the system, prefer libsndfile)
+if HAVE_SNDFILE
+gigextract_libs = $(SNDFILE_LIBS)
+gigextract_flags = $(SNDFILE_CFLAGS)
+else
+gigextract_libs = $(AUDIOFILE_LIBS) -ldl
+gigextract_flags = $(AUDIOFILE_CFLAGS)
+endif
 
 libgigincludedir = $(includedir)
-libgiginclude_HEADERS = RIFF.h DLS.h gig.h
+libgiginclude_HEADERS = RIFF.h DLS.h SF.h gig.h
 
 lib_LTLIBRARIES = libgig.la
-libgig_la_SOURCES = RIFF.cpp DLS.cpp gig.cpp
-libgig_la_LDFLAGS = -module -version-info @SHARED_VERSION_INFO@ @SHLIB_VERSION_ARG@
+libgig_la_SOURCES = RIFF.cpp DLS.cpp SF.cpp gig.cpp
+libgig_la_LDFLAGS = -no-undefined -version-info @SHARED_VERSION_INFO@ @SHLIB_VERSION_ARG@
+if WIN32
+libgig_la_LIBADD = -lrpcrt4
+endif
 
-bin_PROGRAMS = rifftree dlsdump gigdump gigextract
+bin_PROGRAMS = rifftree dlsdump gigdump gigextract sf2dump
 rifftree_SOURCES = rifftree.cpp
 rifftree_LDADD = $(top_builddir)/src/libgig.la
 dlsdump_SOURCES = dlsdump.cpp
@@ -16,5 +31,10 @@
 gigdump_SOURCES = gigdump.cpp
 gigdump_LDADD = $(top_builddir)/src/libgig.la
 gigextract_SOURCES = gigextract.cpp
-gigextract_LDADD = $(top_builddir)/src/libgig.la $(SNDFILE_LIBS) -ldl
-gigextract_CFLAGS = $(SNDFILE_CFLAGS)
+gigextract_LDADD = $(top_builddir)/src/libgig.la $(gigextract_libs)
+gigextract_CFLAGS = $(gigextract_flags)
+gigextract_CXXFLAGS = $(gigextract_flags)
+sf2dump_SOURCES = sf2dump.cpp
+sf2dump_LDADD = $(top_builddir)/src/libgig.la
+
+EXTRA_DIST = helper.h