mpg123-1.32.4

Makefile.am

@@ -31,29 +31,26 @@ XFAIL_TESTS =
 check_PROGRAMS =
 
 AM_CPPFLAGS = -DPKGLIBDIR="\"$(pkglibdir)\""
-# That can be trimmed down later when adapting the sources to
-# use relative paths for includes.
-# Watch out for generated headers (that's why top_builddir is also present).
-AM_CPPFLAGS += \
-  $(LTDLINCL) \
-  -I$(top_srcdir)/src \
-  -I$(top_srcdir)/src/compat \
-  -I$(top_srcdir)/src/libmpg123 \
-  -I$(top_srcdir)/src/libsyn123 \
-  -I$(top_srcdir)/src/libout123 \
-  -I$(top_builddir)/src/libmpg123 \
-  -I$(top_builddir)/src/libsyn123 \
-  -I$(top_builddir)/src/libout123
+AM_CPPFLAGS += $(LTDLINCL)
+
+# Central place defining the mpg123 libraries to be used. You could
+# put -lmpg123 in here to use an external one (for whatever reason).
+LIBMPG123 = src/libmpg123/libmpg123.la
+LIBOUT123 = src/libout123/libout123.la
+LIBSYN123 = src/libsyn123/libsyn123.la
 
 # Include Make modules from subdirectories.
 include src/Makemodule.am
 include doc/Makemodule.am
 
+# Always use our set of API headers.
+AM_CPPFLAGS+= -I$(top_srcdir)/src/include
+
 if NEED_MAINLIB
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = 
 
-# Stuff from this directory.
+# Pkg-config files and library includes.
 if BUILD_LIBMPG123
 pkgconfig_DATA += libmpg123.pc
 endif
@@ -71,6 +68,7 @@ endif
 
 # mpg123.spec is autogenerated but needs to be present in tarball!
 EXTRA_DIST += \
+  test_c99.c \
   mpg123.spec \
   makedll.sh \
   windows-builds.sh \