--- libgig/trunk/src/Makefile.am	2003/11/16 17:47:00	11
+++ libgig/trunk/src/Makefile.am	2007/09/09 10:36:23	1330
@@ -1,24 +1,38 @@
-bin_PROGRAMS = rifftree gigdump dlsdump gigextract
-
-# set the include path found by configure
-INCLUDES= $(all_includes)
+SUBDIRS = testcases
 
 # to prevent compile errors on some systems
-AM_CXXFLAGS = -pedantic
-
-# the library search path.
-rifftree_SOURCES =  rifftree.cpp
-lib_LIBRARIES =  libgig.a
-libgig_a_SOURCES = RIFF.cpp RIFF.h DLS.cpp DLS.h gig.cpp gig.h
-rifftree_LDADD = $(top_builddir)/src/libgig.a
-gigdump_SOURCES =  gigdump.cpp
-gigdump_LDADD = $(top_builddir)/src/libgig.a
-
-
-dlsdump_SOURCES =  dlsdump.cpp
-dlsdump_LDADD = $(top_builddir)/src/libgig.a
+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
+
+lib_LTLIBRARIES = libgig.la
+libgig_la_SOURCES = RIFF.cpp DLS.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
+rifftree_SOURCES = rifftree.cpp
+rifftree_LDADD = $(top_builddir)/src/libgig.la
+dlsdump_SOURCES = dlsdump.cpp
+dlsdump_LDADD = $(top_builddir)/src/libgig.la
+gigdump_SOURCES = gigdump.cpp
+gigdump_LDADD = $(top_builddir)/src/libgig.la
+gigextract_SOURCES = gigextract.cpp
+gigextract_LDADD = $(top_builddir)/src/libgig.la $(gigextract_libs)
+gigextract_CFLAGS = $(gigextract_flags)
+gigextract_CXXFLAGS = $(gigextract_flags)
 
-applnkApplicationdir = $(kde_appsdir)/Application
-gigextract_SOURCES =  gigextract.cpp
-gigextract_LDADD = $(top_builddir)/src/libgig.a -ldl
+EXTRA_DIST = helper.h