summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFilippo Giunchedi <filippo@esaurito.net>2009-11-08 11:23:52 (GMT)
committer Filippo Giunchedi <filippo@esaurito.net>2009-11-08 13:04:46 (GMT)
commit59152cb3e360610aba4540e6b973d535315175f6 (patch)
tree083a2a9585f588dc4988b505de21169e8d5b290a
parent9cf4ca63aa65f572e25924332c394973c6c7fb22 (diff)
explicit static libmpeg libs/cflags in Makefile.am
rationale: we are statically linking to libmpeg anyway, the contents of LDADD are automatic dependencies after configure substitutions. in other words: if lib/libmpeg/ is recompiled then also muse is relinked against libmpeg, which is the expected behaviour for shipped libraries
-rw-r--r--Makefile.am4
-rw-r--r--configure.ac8
2 files changed, 2 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am
index 7a52c85..617776a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,11 +48,11 @@ src_muse_SOURCES = \
src_muse_CXXFLAGS = \
-I$(top_srcdir)/src \
+ -I$(top_srcdir)/lib/libmpeg \
$(DARWIN_CFLAGS) \
$(GLIB2_CFLAGS) \
$(GUI_FLAGS) \
$(JACK_CFLAGS) \
- $(LIBMPEG_CFLAGS) \
$(OGG_CFLAGS) \
$(PORTAUDIO_CFLAGS) \
$(SAMPLERATE_CFLAGS) \
@@ -60,13 +60,13 @@ src_muse_CXXFLAGS = \
$(VORBIS_CFLAGS)
src_muse_LDADD = \
+ $(top_builddir)/lib/libmpeg/libmpeg.a \
-lpthread \
-ldl \
$(DARWIN_LIBS) \
$(GLIB2_LIBS) \
$(GUI_LIBS) \
$(JACK_LIBS) \
- $(LIBMPEG_LIBS) \
$(M_LIBS) \
$(OGG_LIBS) \
$(PORTAUDIO_LIBS) \
diff --git a/configure.ac b/configure.ac
index 823f652..d1a9efd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -311,14 +311,6 @@ AC_SUBST(PORTAUDIO_CFLAGS)
AC_SUBST(PORTAUDIO_DIRS)
-dnl ==============================================================
-dnl mpeg lib
-dnl ==============================================================
-LIBMPEG_LIBS="\$(top_builddir)/lib/libmpeg/libmpeg.a"
-LIBMPEG_CFLAGS="-I\$(top_srcdir)/lib/libmpeg"
-AC_SUBST(LIBMPEG_LIBS)
-AC_SUBST(LIBMPEG_CFLAGS)
-
dnl ==============================================================
dnl shout lib