aboutsummaryrefslogtreecommitdiffstats
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
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.
-rw-r--r--ChangeLog17
-rw-r--r--configure.ac2
-rw-r--r--matchbox/Makefile.am5
-rw-r--r--matchbox/client-types/Makefile.am23
-rw-r--r--matchbox/comp-mgr/Makefile.am9
-rw-r--r--matchbox/core/Makefile.am6
-rw-r--r--matchbox/managers/simple/Makefile.am22
-rw-r--r--matchbox/theme-engines/Makefile.am5
8 files changed, 36 insertions, 53 deletions
diff --git a/ChangeLog b/ChangeLog
index c858459..4ba0ae7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+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.
+
2008-07-31 Robert Bragg <bob@o-hand.com>
* matchbox/core/mb-wm-client.c:
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'
diff --git a/matchbox/Makefile.am b/matchbox/Makefile.am
index 5da6195..7310e59 100644
--- a/matchbox/Makefile.am
+++ b/matchbox/Makefile.am
@@ -9,9 +9,9 @@ MAINTAINERCLEANFILES = Makefile.in
pkgincludedir = $(includedir)/@MBWM2_INCDIR@
-if ENABLE_LIBMATCHBOX
-SUBDIRS = core client-types theme-engines $(comp)
+SUBDIRS = core client-types theme-engines $(comp) managers
+if ENABLE_LIBMATCHBOX
lib_LTLIBRARIES = libmatchbox2-@MBWM2_API_VERSION@.la
@@ -32,6 +32,5 @@ libmatchbox2_@MBWM2_API_VERSION@_la_SOURCES =
pkginclude_HEADERS = *.h
else
-SUBDIRS = core client-types theme-engines $(comp) managers
endif
diff --git a/matchbox/client-types/Makefile.am b/matchbox/client-types/Makefile.am
index 7c07b9b..ec7d37c 100644
--- a/matchbox/client-types/Makefile.am
+++ b/matchbox/client-types/Makefile.am
@@ -20,6 +20,8 @@ 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 \
libmb-wm-client-dialog.la \
@@ -46,26 +48,5 @@ libmb_wm_client_input_la_CFLAGS =
libmb_wm_client_desktop_la_CFLAGS =
libmb_wm_client_menu_la_CFLAGS =
libmb_wm_client_override_la_CFLAGS =
-else
-noinst_LIBRARIES = libmb-wm-client-app.a \
- libmb-wm-client-panel.a \
- libmb-wm-client-dialog.a \
- libmb-wm-client-note.a \
- libmb-wm-client-input.a \
- libmb-wm-client-desktop.a \
- libmb-wm-client-menu.a \
- $(compmgr_libs)
-
-libmb_wm_client_app_a_SOURCES = mb-wm-client-app.c mb-wm-client-app.h
-libmb_wm_client_panel_a_SOURCES = mb-wm-client-panel.c mb-wm-client-panel.h
-libmb_wm_client_dialog_a_SOURCES = mb-wm-client-dialog.c mb-wm-client-dialog.h
-libmb_wm_client_note_a_SOURCES = mb-wm-client-note.c mb-wm-client-note.h
-libmb_wm_client_input_a_SOURCES = mb-wm-client-input.c mb-wm-client-input.h
-libmb_wm_client_desktop_a_SOURCES = mb-wm-client-desktop.c mb-wm-client-desktop.h
-libmb_wm_client_menu_a_SOURCES = mb-wm-client-menu.c mb-wm-client-menu.h
-libmb_wm_client_override_a_SOURCES= mb-wm-client-override.c \
- mb-wm-client-override.h
-endif
-
MAINTAINERCLEANFILES = config.h.in Makefile.in
diff --git a/matchbox/comp-mgr/Makefile.am b/matchbox/comp-mgr/Makefile.am
index c71d347..33fd3e8 100644
--- a/matchbox/comp-mgr/Makefile.am
+++ b/matchbox/comp-mgr/Makefile.am
@@ -16,19 +16,12 @@ pkgincludedir = $(includedir)/@MBWM2_INCDIR@/comp-mgr
if ENABLE_LIBMATCHBOX
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) \
$(clutter_h) $(clutter_c)
libmatchbox_window_manager_2_compmgr_la_CFLAGS = @MBWM_INCS@ @MBWM_CFLAGS@
-else
-noinst_LIBRARIES = libmatchbox-window-manager-2-compmgr.a
-
-libmatchbox_window_manager_2_compmgr_a_SOURCES = $(core_h) $(core_c) \
- $(xrender_h) $(xrender_c) \
- $(clutter_h) $(clutter_c)
-libmatchbox_window_manager_2_compmgr_a_CFLAGS = @MBWM_INCS@ @MBWM_CFLAGS@
-endif
MAINTAINERCLEANFILES = Makefile.in
diff --git a/matchbox/core/Makefile.am b/matchbox/core/Makefile.am
index 2ae9b40..2b56eb5 100644
--- a/matchbox/core/Makefile.am
+++ b/matchbox/core/Makefile.am
@@ -41,13 +41,9 @@ pkgincludedir = $(includedir)/@MBWM2_INCDIR@/core
if ENABLE_LIBMATCHBOX
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@
-else
-noinst_LIBRARIES = libmatchbox-window-manager-2-core.a
-libmatchbox_window_manager_2_core_a_SOURCES = $(core_h) $(core_c)
-libmatchbox_window_manager_2_core_a_CFLAGS = @MBWM_INCS@ @MBWM_CFLAGS@
-endif
MAINTAINERCLEANFILES = Makefile.in
diff --git a/matchbox/managers/simple/Makefile.am b/matchbox/managers/simple/Makefile.am
index 0b62395..39d99c9 100644
--- a/matchbox/managers/simple/Makefile.am
+++ b/matchbox/managers/simple/Makefile.am
@@ -2,21 +2,21 @@ INCLUDES = \
@MBWM_INCS@ \
@MBWM_CFLAGS@
-CLIENT_LIBS = \
- @MBWM_CLIENT_BUILDDIR@/libmb-wm-client-panel.a \
- @MBWM_CLIENT_BUILDDIR@/libmb-wm-client-dialog.a \
- @MBWM_CLIENT_BUILDDIR@/libmb-wm-client-note.a \
- @MBWM_CLIENT_BUILDDIR@/libmb-wm-client-app.a \
- @MBWM_CLIENT_BUILDDIR@/libmb-wm-client-input.a \
- @MBWM_CLIENT_BUILDDIR@/libmb-wm-client-desktop.a \
- @MBWM_CLIENT_BUILDDIR@/libmb-wm-client-menu.a
+CLIENT_LIBS = \
+ @MBWM_CLIENT_BUILDDIR@/libmb-wm-client-panel.la \
+ @MBWM_CLIENT_BUILDDIR@/libmb-wm-client-dialog.la \
+ @MBWM_CLIENT_BUILDDIR@/libmb-wm-client-note.la \
+ @MBWM_CLIENT_BUILDDIR@/libmb-wm-client-app.la \
+ @MBWM_CLIENT_BUILDDIR@/libmb-wm-client-input.la \
+ @MBWM_CLIENT_BUILDDIR@/libmb-wm-client-desktop.la \
+ @MBWM_CLIENT_BUILDDIR@/libmb-wm-client-menu.la
if ENABLE_COMPOSITE
-COMPMGR_LIBS=@MBWM_COMPMGR_BUILDDIR@/libmatchbox-window-manager-2-compmgr.a \
- @MBWM_CLIENT_BUILDDIR@/libmb-wm-client-override.a
+COMPMGR_LIBS=@MBWM_COMPMGR_BUILDDIR@/libmatchbox-window-manager-2-compmgr.la \
+ @MBWM_CLIENT_BUILDDIR@/libmb-wm-client-override.la
endif
-THEME_LIBS = @MBWM_THEME_BUILDDIR@/libmb-theme.a
+THEME_LIBS = @MBWM_THEME_BUILDDIR@/libmb-theme.la
bin_PROGRAMS = matchbox-window-manager-2-simple
diff --git a/matchbox/theme-engines/Makefile.am b/matchbox/theme-engines/Makefile.am
index b61740c..0c04579 100644
--- a/matchbox/theme-engines/Makefile.am
+++ b/matchbox/theme-engines/Makefile.am
@@ -9,13 +9,10 @@ pkgincludedir = $(includedir)/@MBWM2_INCDIR@/theme-engines
if ENABLE_LIBMATCHBOX
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 =
-else
-noinst_LIBRARIES = libmb-theme.a
-libmb_theme_a_SOURCES = $(COMMON_SRC) $(PNG_SRC)
-endif
INCLUDES = @MBWM_INCS@ @MBWM_CFLAGS@ -DDATADIR=\"$(datadir)\"