summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFilippo Giunchedi <filippo@esaurito.net>2009-11-08 11:44:44 (GMT)
committer Filippo Giunchedi <filippo@esaurito.net>2009-11-08 13:04:46 (GMT)
commit0290ac7d48cae1fc4ba2a07612088dcd78d34a02 (patch)
tree2fccf3724e2361e350bc47c3bbd8851049295b78
parent59152cb3e360610aba4540e6b973d535315175f6 (diff)
split GUI static libraries for gtk2/ncurses
this allows correct dependency handling if gtk2/ncurses sources are modified: muse gets relinked against the new libraries
-rw-r--r--Makefile.am5
-rw-r--r--configure.ac21
2 files changed, 15 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am
index 617776a..af32af0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -66,6 +66,7 @@ src_muse_LDADD = \
$(DARWIN_LIBS) \
$(GLIB2_LIBS) \
$(GUI_LIBS) \
+ $(GUI_OBJECTS) \
$(JACK_LIBS) \
$(M_LIBS) \
$(OGG_LIBS) \
@@ -75,6 +76,10 @@ src_muse_LDADD = \
$(SNDFILE_LIBS) \
$(VORBIS_LIBS)
+src_muse_DEPENDENCIES = \
+ $(top_builddir)/lib/libmpeg/libmpeg.a \
+ $(GUI_OBJECTS)
+
noinst_HEADERS += \
src/audioproc.h \
src/dec_jack.h \
diff --git a/configure.ac b/configure.ac
index d1a9efd..f1663a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -264,27 +264,31 @@ dnl assign some defines
dnl ===================
GUI_LIBS=""
-GUI_DIRS=""
GUI_FLAGS=""
+GUI_OBJECTS=""
if test "$want_ncurses_gui" = "yes"; then
- GUI_LIBS="$GUI_LIBS \$(top_builddir)/src/ncursesgui/librubik.a \$(top_builddir)/src/ncursesgui/libcdk/libcdk.a"
- GUI_DIRS="$GUI_DIRS ncursesgui"
+ GUI_OBJECTS="$GUI_OBJECTS \$(top_builddir)/src/ncursesgui/librubik.a \
+ \$(top_builddir)/src/ncursesgui/libcdk/libcdk.a"
GUI_FLAGS="$GUI_FLAGS -I\$(top_srcdir)/src/ncursesgui"
fi
if test "${want_gtk2_gui}" = "yes"; then
- GUI_LIBS="$GUI_LIBS $GTK2_LIBS \$(top_builddir)/src/gtkgui2/libnightolo2.a"
- GUI_DIRS="$GUI_DIRS gtkgui2"
+ GUI_OBJECTS="$GUI_OBJECTS \$(top_builddir)/src/gtkgui2/libnightolo2.a"
+ GUI_LIBS="$GUI_LIBS $GTK2_LIBS"
GUI_FLAGS="$GUI_FLAGS $GTK2_CFLAGS"
dnl =========
- dnl Scheduler
+ dnl Scheduler
dnl =========
dnl scheduler is deactivated for now
dnl AC_DEFINE(HAVE_SCHEDULER)
fi
+AC_SUBST(GUI_OBJECTS)
+AC_SUBST(GUI_LIBS)
+AC_SUBST(GUI_FLAGS)
+
dnl ==============================================================
dnl Choose external portaudio library
@@ -397,11 +401,6 @@ AC_SUBST(DARWIN_CFLAGS)
AC_SUBST(M_LIBS)
AC_SUBST(LAME_LIBS)
-AC_SUBST(GUI_LIBS)
-AC_SUBST(GUI_DIRS)
-AC_SUBST(GUI_FLAGS)
-AC_SUBST(GUI_DEPS)
-
CFLAGS="$GLOBAL_CFLAGS $CFLAGS"
CXXFLAGS="$GLOBAL_CFLAGS $CXXFLAGS"
LIBS="$LIBS"