aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--managers/maemo/Makefile.am47
-rw-r--r--managers/simple/Makefile.am41
2 files changed, 17 insertions, 71 deletions
diff --git a/managers/maemo/Makefile.am b/managers/maemo/Makefile.am
index 46d32b5..45967b5 100644
--- a/managers/maemo/Makefile.am
+++ b/managers/maemo/Makefile.am
@@ -1,48 +1,21 @@
SUBDIRS = theme
-INCLUDES = \
- $(MBWM_INCS) \
+INCLUDES = \
+ $(MBWM_INCS) \
$(MBWM_CFLAGS)
-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
-
-THEME_LIBS = $(MBWM_THEME_BUILDDIR)/libmb-theme.la
-
-if ENABLE_COMPOSITE
-COMPMGR_LIBS=$(MBWM_COMPMGR_BUILDDIR)/libmatchbox-window-manager-2-compmgr.la \
- $(MBWM_CLIENT_BUILDDIR)/libmb-wm-client-override.la
-endif
-
bin_PROGRAMS = matchbox-window-manager-2-maemo
-matchbox_window_manager_2_maemo_SOURCES = \
- maemo-toolbar.c \
- maemo-input.c \
- maemo-window-manager.c \
+matchbox_window_manager_2_maemo_SOURCES = \
+ maemo-toolbar.c \
+ maemo-input.c \
+ maemo-window-manager.c \
matchbox-window-manager-2-maemo.c
-matchbox_window_manager_2_maemo_LDFLAGS = \
- $(MBWM_DEBUG_LDFLAGS) \
+matchbox_window_manager_2_maemo_LDFLAGS = \
+ $(MBWM_DEBUG_LDFLAGS) \
$(LDFLAGS)
-matchbox_window_manager_2_maemo_LDADD = \
- $(MBWM_CORE_LIB) \
- $(THEME_LIBS) \
- $(CLIENT_LIBS) \
- $(COMPMGR_LIBS) \
+matchbox_window_manager_2_maemo_LDADD = \
+ $(top_builddir)/matchbox2/libmatchbox2-@MBWM2_API_VERSION@.la \
$(MBWM_LIBS)
-
-matchbox_window_manager_2_maemo_DEPENDENCIES = \
- $(MBWM_CORE_LIB) \
- $(THEME_LIBS) \
- $(CLIENT_LIBS) \
- $(COMPMGR_LIBS)
-
-MAINTAINERCLEANFILES = config.h.in Makefile.in \ No newline at end of file
diff --git a/managers/simple/Makefile.am b/managers/simple/Makefile.am
index d232593..745ba8c 100644
--- a/managers/simple/Makefile.am
+++ b/managers/simple/Makefile.am
@@ -1,44 +1,17 @@
-INCLUDES = \
- $(MBWM_INCS) \
+INCLUDES = \
+ $(MBWM_INCS) \
$(MBWM_CFLAGS)
-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.la \
- $(MBWM_CLIENT_BUILDDIR)/libmb-wm-client-override.la
-endif
-
-THEME_LIBS = $(MBWM_THEME_BUILDDIR)/libmb-theme.la
-
bin_PROGRAMS = matchbox-window-manager-2-simple
-matchbox_window_manager_2_simple_SOURCES = \
+matchbox_window_manager_2_simple_SOURCES = \
matchbox-window-manager-2-simple.c
-matchbox_window_manager_2_simple_LDFLAGS = \
- $(MBWM_DEBUG_LDFLAGS) \
+matchbox_window_manager_2_simple_LDFLAGS = \
+ $(MBWM_DEBUG_LDFLAGS) \
$(LDFLAGS)
-matchbox_window_manager_2_simple_LDADD = \
- $(MBWM_CORE_LIB) \
- $(THEME_LIBS) \
- $(CLIENT_LIBS) \
- $(COMPMGR_LIBS) \
+matchbox_window_manager_2_simple_LDADD = \
+ $(top_builddir)/matchbox2/libmatchbox2-@MBWM2_API_VERSION@.la \
$(MBWM_LIBS)
-
-matchbox_window_manager_2_simple_DEPENDENCIES = \
- $(MBWM_CORE_LIB) \
- $(THEME_LIBS) \
- $(CLIENT_LIBS) \
- $(COMPMGR_LIBS)
-
-MAINTAINERCLEANFILES = config.h.in Makefile.in