aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Bragg <robert@linux.intel.com>2010-08-17 01:25:00 +0100
committerRobert Bragg <robert@linux.intel.com>2010-12-09 22:38:45 +0000
commit3293e138d7e14b5fc408a189b9d00ce91ff99a45 (patch)
tree822204b1a644b0d6aa26d21265c5d41485c3928a
parent2d9ec0f5b61e317f4b036a7d39b3439220aede27 (diff)
downloadlibmatchboxwm2-3293e138d7e14b5fc408a189b9d00ce91ff99a45.tar.gz
libmatchboxwm2-3293e138d7e14b5fc408a189b9d00ce91ff99a45.tar.bz2
libmatchboxwm2-3293e138d7e14b5fc408a189b9d00ce91ff99a45.zip
build: Unconditionally build libmatchbox2
Move mbwm2 towards primarily providing a library for building window and composite managers. The library is now built unconditionally and the window managers under the managers/ subdirectory should instead be made to link against this library instead of statically linking to the internal .la files.
-rw-r--r--configure.ac7
-rw-r--r--data/Makefile.am2
-rw-r--r--matchbox2/Makefile.am5
-rw-r--r--matchbox2/client-types/Makefile.am2
-rw-r--r--matchbox2/comp-mgr/Makefile.am3
-rw-r--r--matchbox2/core/Makefile.am3
-rw-r--r--matchbox2/theme-engines/Makefile.am3
7 files changed, 3 insertions, 22 deletions
diff --git a/configure.ac b/configure.ac
index 31dd0a0..410ad71 100644
--- a/configure.ac
+++ b/configure.ac
@@ -86,10 +86,6 @@ AC_ARG_ENABLE(glib-main-loop,
[ --enable-glib-main-loop Enable use of glib main loop],
[gmloop=$enableval], [gmloop=no])
-AC_ARG_ENABLE(libmatchbox2,
- [ --enable-libmatchbox2 Enable building as a library],
- [libmatchbox2=$enableval], [libmatchbox2=no])
-
AC_ARG_ENABLE(matchbox-remote,
[ --enable-matchbox-remote Enable matchbox remote control utility],
[matchbox_remote=$enableval], [matchbox_remote=no])
@@ -245,8 +241,6 @@ AC_SUBST(ENABLE_XRENDER_COMPOSITE_MANAGER)
AM_CONDITIONAL(COMP_MGR_BACKEND, [test "x$COMP_MGR_BACKEND" = "x1"])
AC_SUBST(COMP_MGR_BACKEND)
-AM_CONDITIONAL(ENABLE_LIBMATCHBOX2, [test "x$libmatchbox2" = "xyes"])
-
AM_CONDITIONAL(ENABLE_MATCHBOX_REMOTE, [test "x$matchbox_remote" = "xyes"])
AC_ARG_ENABLE(simple-manager,
@@ -364,7 +358,6 @@ echo "
Miscel:
Glib main loop : ${gmloop}
- Build libmatchbox2 : ${libmatchbox2}
Build matchbox-remote : ${matchbox_remote}
Debugging output : ${want_debug}
"
diff --git a/data/Makefile.am b/data/Makefile.am
index 057667d..9b2138b 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -7,7 +7,5 @@ pcfiles = libmatchbox2-@MBWM2_API_VERSION@.pc \
libmatchbox2-@MBWM2_API_VERSION@.pc: libmatchbox2.pc
@cp $< $@
-if ENABLE_LIBMATCHBOX2
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = $(pcfiles)
-endif
diff --git a/matchbox2/Makefile.am b/matchbox2/Makefile.am
index ecd6d5b..3f90f3c 100644
--- a/matchbox2/Makefile.am
+++ b/matchbox2/Makefile.am
@@ -11,7 +11,6 @@ pkgincludedir = $(includedir)/$(MBWM2_INCDIR)
SUBDIRS = core client-types theme-engines $(comp)
-if ENABLE_LIBMATCHBOX2
lib_LTLIBRARIES = libmatchbox2-@MBWM2_API_VERSION@.la
@@ -30,7 +29,3 @@ libmatchbox2_@MBWM2_API_VERSION@_la_LIBADD = \
libmatchbox2_@MBWM2_API_VERSION@_la_SOURCES =
pkginclude_HEADERS = *.h
-
-else
-endif
-
diff --git a/matchbox2/client-types/Makefile.am b/matchbox2/client-types/Makefile.am
index b90f352..545be9c 100644
--- a/matchbox2/client-types/Makefile.am
+++ b/matchbox2/client-types/Makefile.am
@@ -11,7 +11,6 @@ DEPENDENCIES = $(THEME_LIBS)
pkgincludedir = $(includedir)/$(MBWM2_INCDIR)/client-types
-if ENABLE_LIBMATCHBOX2
pkginclude_HEADERS = mb-wm-client-app.h \
mb-wm-client-dialog.h \
mb-wm-client-menu.h \
@@ -20,7 +19,6 @@ pkginclude_HEADERS = mb-wm-client-app.h \
mb-wm-client-input.h \
mb-wm-client-note.h \
mb-wm-client-panel.h
-endif
noinst_LTLIBRARIES = libmb-wm-client-app.la \
libmb-wm-client-panel.la \
diff --git a/matchbox2/comp-mgr/Makefile.am b/matchbox2/comp-mgr/Makefile.am
index 9ca86d7..89e0019 100644
--- a/matchbox2/comp-mgr/Makefile.am
+++ b/matchbox2/comp-mgr/Makefile.am
@@ -19,9 +19,8 @@ endif
pkgincludedir = $(includedir)/$(MBWM2_INCDIR)/comp-mgr
-if ENABLE_LIBMATCHBOX2
pkginclude_HEADERS = mb-wm-comp-mgr-clutter.h mb-wm-comp-mgr.h mb-wm-comp-mgr-xrender.h
-endif
+
noinst_LTLIBRARIES = libmatchbox-window-manager-2-compmgr.la
libmatchbox_window_manager_2_compmgr_la_SOURCES = $(core_h) $(core_c) \
$(xrender_h) $(xrender_c) \
diff --git a/matchbox2/core/Makefile.am b/matchbox2/core/Makefile.am
index 7fa0817..c356a0b 100644
--- a/matchbox2/core/Makefile.am
+++ b/matchbox2/core/Makefile.am
@@ -39,9 +39,8 @@ core_c = mb-wm-object.c \
pkgincludedir = $(includedir)/$(MBWM2_INCDIR)/core
-if ENABLE_LIBMATCHBOX2
pkginclude_HEADERS = $(core_h)
-endif
+
noinst_LTLIBRARIES = libmatchbox-window-manager-2-core.la
libmatchbox_window_manager_2_core_la_SOURCES = $(core_h) $(core_c)
libmatchbox_window_manager_2_core_la_CFLAGS = $(MBWM_INCS) $(MBWM_CFLAGS)
diff --git a/matchbox2/theme-engines/Makefile.am b/matchbox2/theme-engines/Makefile.am
index 93477d3..1ec6599 100644
--- a/matchbox2/theme-engines/Makefile.am
+++ b/matchbox2/theme-engines/Makefile.am
@@ -7,9 +7,8 @@ COMMON_SRC = mb-wm-theme.h mb-wm-theme.c mb-wm-theme-xml.h mb-wm-theme-xml.c
pkgincludedir = $(includedir)/$(MBWM2_INCDIR)/theme-engines
-if ENABLE_LIBMATCHBOX2
pkginclude_HEADERS = mb-wm-theme.h mb-wm-theme-png.h mb-wm-theme-xml.h
-endif
+
noinst_LTLIBRARIES = libmb-theme.la
libmb_theme_la_SOURCES = $(COMMON_SRC) $(PNG_SRC)
libmb_theme_la_CFLAGS =