aboutsummaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorRobert Bragg <robert@linux.intel.com>2008-08-12 15:40:38 +0000
committerRobert Bragg <robert@linux.intel.com>2008-08-12 15:40:38 +0000
commit0bb974ee83eda3300636e4fe9e69db5ffbdd768d (patch)
tree4d7e90c7caec728aef90dd58a5cf28e00a1f4ee4 /configure.ac
parent0d84e2f54598613cff71678ceb97ccdbd0fff0b7 (diff)
downloadlibmatchboxwm2-0bb974ee83eda3300636e4fe9e69db5ffbdd768d.tar.gz
libmatchboxwm2-0bb974ee83eda3300636e4fe9e69db5ffbdd768d.tar.bz2
libmatchboxwm2-0bb974ee83eda3300636e4fe9e69db5ffbdd768d.zip
2008-08-12 Robert Bragg <bob@o-hand.com>
* configure.ac * matchbox/client-types/Makefile.am * matchbox/comp-mgr/Makefile.am * matchbox/core/Makefile.am * matchbox/theme-engines/Makefile.am * matchbox/Makefile.am * matchbox/managers/simple/Makefile.am: Allows building managers and libmatchbox at the same time. By default managers remain disabled if libmatchbox is enabled, but you can now enable managers explicitly to get both. This also removes lots of Makefile.am ifdef checks where we were toggling between noinst_LIBRARIES ending in .a vs .la. All CLIENT_LIBS are listed as .la now and all noinst libs are build as .la. Libtool then figures out the right thing to do.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 974adba..19f78c1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -274,7 +274,7 @@ if test x$have_xcursor = xyes; then
fi
MBWM_INCS='-I$(top_srcdir) -I$(top_srcdir)/matchbox/core -I$(top_srcdir)/matchbox/client-types -I$(top_srcdir)/matchbox/theme-engines -I$(top_srcdir)/matchbox/comp-mgr -I$(top_builddir)'
-MBWM_CORE_LIB='$(top_builddir)/matchbox/core/libmatchbox-window-manager-2-core.a'
+MBWM_CORE_LIB='$(top_builddir)/matchbox/core/libmatchbox-window-manager-2-core.la'
MBWM_CLIENT_BUILDDIR='$(top_builddir)/matchbox/client-types'
MBWM_THEME_BUILDDIR='$(top_builddir)/matchbox/theme-engines'
MBWM_COMPMGR_BUILDDIR='$(top_builddir)/matchbox/comp-mgr'