Make file clean up

This commit is contained in:
Tomas Frydrych
2010-04-12 09:36:30 +00:00
parent 6b9824d241
commit 3ea749ba3a
8 changed files with 43 additions and 43 deletions

View File

@@ -1,10 +1,10 @@
SUBDIRS=themes SUBDIRS=themes
pcfiles = libmatchbox2-$(MBWM2_API_VERSION).pc \ pcfiles = libmatchbox2-@MBWM2_API_VERSION@.pc \
libmatchbox2.pc libmatchbox2.pc
# clutter-<major>.<minor>.pc - for generic dependencies # clutter-<major>.<minor>.pc - for generic dependencies
libmatchbox2-$(MBWM2_API_VERSION).pc: libmatchbox2.pc libmatchbox2-@MBWM2_API_VERSION@.pc: libmatchbox2.pc
@cp $< $@ @cp $< $@
if ENABLE_LIBMATCHBOX if ENABLE_LIBMATCHBOX

View File

@@ -7,7 +7,7 @@ endif
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in
pkgincludedir = $(includedir)/@MBWM2_INCDIR@ pkgincludedir = $(includedir)/$(MBWM2_INCDIR)
SUBDIRS = core client-types theme-engines $(comp) managers SUBDIRS = core client-types theme-engines $(comp) managers

View File

@@ -1,15 +1,15 @@
if ENABLE_COMPOSITE if ENABLE_COMPOSITE
compmgr_libs = libmb-wm-client-override.a compmgr_libs = libmb-wm-client-override.la
compmgr_ltlibs = libmb-wm-client-override.la compmgr_ltlibs = libmb-wm-client-override.la
endif endif
THEME_LIBS = @MBWM_THEME_LIBS@/libmb-theme.a THEME_LIBS = $(MBWM_THEME_LIBS)/libmb-theme.la
INCLUDES = @MBWM_INCS@ @MBWM_CFLAGS@ INCLUDES = $(MBWM_INCS) $(MBWM_CFLAGS)
LDADD =$(THEME_LIBS) LDADD =$(THEME_LIBS)
DEPENDENCIES = $(THEME_LIBS) DEPENDENCIES = $(THEME_LIBS)
pkgincludedir = $(includedir)/@MBWM2_INCDIR@/client-types pkgincludedir = $(includedir)/$(MBWM2_INCDIR)/client-types
if ENABLE_LIBMATCHBOX if ENABLE_LIBMATCHBOX
pkginclude_HEADERS = mb-wm-client-app.h \ pkginclude_HEADERS = mb-wm-client-app.h \

View File

@@ -12,7 +12,7 @@ xrender_c = mb-wm-comp-mgr-xrender.c
endif endif
endif endif
pkgincludedir = $(includedir)/@MBWM2_INCDIR@/comp-mgr pkgincludedir = $(includedir)/$(MBWM2_INCDIR)/comp-mgr
if ENABLE_LIBMATCHBOX if ENABLE_LIBMATCHBOX
pkginclude_HEADERS = mb-wm-comp-mgr-clutter.h mb-wm-comp-mgr.h mb-wm-comp-mgr-xrender.h pkginclude_HEADERS = mb-wm-comp-mgr-clutter.h mb-wm-comp-mgr.h mb-wm-comp-mgr-xrender.h
@@ -21,7 +21,7 @@ noinst_LTLIBRARIES = libmatchbox-window-manager-2-compmgr.la
libmatchbox_window_manager_2_compmgr_la_SOURCES = $(core_h) $(core_c) \ libmatchbox_window_manager_2_compmgr_la_SOURCES = $(core_h) $(core_c) \
$(xrender_h) $(xrender_c) \ $(xrender_h) $(xrender_c) \
$(clutter_h) $(clutter_c) $(clutter_h) $(clutter_c)
libmatchbox_window_manager_2_compmgr_la_CFLAGS = @MBWM_INCS@ @MBWM_CFLAGS@ libmatchbox_window_manager_2_compmgr_la_CFLAGS = $(MBWM_INCS) $(MBWM_CFLAGS)
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in

View File

@@ -37,13 +37,13 @@ core_c = mb-wm-object.c \
mb-wm-main-context.c \ mb-wm-main-context.c \
xas.c xas.c
pkgincludedir = $(includedir)/@MBWM2_INCDIR@/core pkgincludedir = $(includedir)/$(MBWM2_INCDIR)/core
if ENABLE_LIBMATCHBOX if ENABLE_LIBMATCHBOX
pkginclude_HEADERS = $(core_h) pkginclude_HEADERS = $(core_h)
endif endif
noinst_LTLIBRARIES = libmatchbox-window-manager-2-core.la 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_SOURCES = $(core_h) $(core_c)
libmatchbox_window_manager_2_core_la_CFLAGS = @MBWM_INCS@ @MBWM_CFLAGS@ libmatchbox_window_manager_2_core_la_CFLAGS = $(MBWM_INCS) $(MBWM_CFLAGS)
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in

View File

@@ -1,23 +1,23 @@
SUBDIRS = theme SUBDIRS = theme
INCLUDES = \ INCLUDES = \
@MBWM_INCS@ \ $(MBWM_INCS) \
@MBWM_CFLAGS@ $(MBWM_CFLAGS)
CLIENT_LIBS = \ CLIENT_LIBS = \
@MBWM_CLIENT_BUILDDIR@/libmb-wm-client-panel.a \ $(MBWM_CLIENT_BUILDDIR)/libmb-wm-client-panel.la \
@MBWM_CLIENT_BUILDDIR@/libmb-wm-client-dialog.a \ $(MBWM_CLIENT_BUILDDIR)/libmb-wm-client-dialog.la \
@MBWM_CLIENT_BUILDDIR@/libmb-wm-client-note.a \ $(MBWM_CLIENT_BUILDDIR)/libmb-wm-client-note.la \
@MBWM_CLIENT_BUILDDIR@/libmb-wm-client-app.a \ $(MBWM_CLIENT_BUILDDIR)/libmb-wm-client-app.la \
@MBWM_CLIENT_BUILDDIR@/libmb-wm-client-input.a \ $(MBWM_CLIENT_BUILDDIR)/libmb-wm-client-input.la \
@MBWM_CLIENT_BUILDDIR@/libmb-wm-client-desktop.a \ $(MBWM_CLIENT_BUILDDIR)/libmb-wm-client-desktop.la \
@MBWM_CLIENT_BUILDDIR@/libmb-wm-client-menu.a $(MBWM_CLIENT_BUILDDIR)/libmb-wm-client-menu.la
THEME_LIBS = @MBWM_THEME_BUILDDIR@/libmb-theme.a THEME_LIBS = $(MBWM_THEME_BUILDDIR)/libmb-theme.la
if ENABLE_COMPOSITE if ENABLE_COMPOSITE
COMPMGR_LIBS=@MBWM_COMPMGR_BUILDDIR@/libmatchbox-window-manager-2-compmgr.a \ COMPMGR_LIBS=$(MBWM_COMPMGR_BUILDDIR)/libmatchbox-window-manager-2-compmgr.la \
@MBWM_CLIENT_BUILDDIR@/libmb-wm-client-override.a $(MBWM_CLIENT_BUILDDIR)/libmb-wm-client-override.la
endif endif
bin_PROGRAMS = matchbox-window-manager-2-maemo bin_PROGRAMS = matchbox-window-manager-2-maemo
@@ -33,14 +33,14 @@ matchbox_window_manager_2_maemo_LDFLAGS = \
$(LDFLAGS) $(LDFLAGS)
matchbox_window_manager_2_maemo_LDADD = \ matchbox_window_manager_2_maemo_LDADD = \
@MBWM_CORE_LIB@ \ $(MBWM_CORE_LIB) \
$(THEME_LIBS) \ $(THEME_LIBS) \
$(CLIENT_LIBS) \ $(CLIENT_LIBS) \
$(COMPMGR_LIBS) \ $(COMPMGR_LIBS) \
@MBWM_LIBS@ $(MBWM_LIBS)
matchbox_window_manager_2_maemo_DEPENDENCIES = \ matchbox_window_manager_2_maemo_DEPENDENCIES = \
@MBWM_CORE_LIB@ \ $(MBWM_CORE_LIB) \
$(THEME_LIBS) \ $(THEME_LIBS) \
$(CLIENT_LIBS) \ $(CLIENT_LIBS) \
$(COMPMGR_LIBS) $(COMPMGR_LIBS)

View File

@@ -1,22 +1,22 @@
INCLUDES = \ INCLUDES = \
@MBWM_INCS@ \ $(MBWM_INCS) \
@MBWM_CFLAGS@ $(MBWM_CFLAGS)
CLIENT_LIBS = \ CLIENT_LIBS = \
@MBWM_CLIENT_BUILDDIR@/libmb-wm-client-panel.la \ $(MBWM_CLIENT_BUILDDIR)/libmb-wm-client-panel.la \
@MBWM_CLIENT_BUILDDIR@/libmb-wm-client-dialog.la \ $(MBWM_CLIENT_BUILDDIR)/libmb-wm-client-dialog.la \
@MBWM_CLIENT_BUILDDIR@/libmb-wm-client-note.la \ $(MBWM_CLIENT_BUILDDIR)/libmb-wm-client-note.la \
@MBWM_CLIENT_BUILDDIR@/libmb-wm-client-app.la \ $(MBWM_CLIENT_BUILDDIR)/libmb-wm-client-app.la \
@MBWM_CLIENT_BUILDDIR@/libmb-wm-client-input.la \ $(MBWM_CLIENT_BUILDDIR)/libmb-wm-client-input.la \
@MBWM_CLIENT_BUILDDIR@/libmb-wm-client-desktop.la \ $(MBWM_CLIENT_BUILDDIR)/libmb-wm-client-desktop.la \
@MBWM_CLIENT_BUILDDIR@/libmb-wm-client-menu.la $(MBWM_CLIENT_BUILDDIR)/libmb-wm-client-menu.la
if ENABLE_COMPOSITE if ENABLE_COMPOSITE
COMPMGR_LIBS=@MBWM_COMPMGR_BUILDDIR@/libmatchbox-window-manager-2-compmgr.la \ COMPMGR_LIBS=$(MBWM_COMPMGR_BUILDDIR)/libmatchbox-window-manager-2-compmgr.la \
@MBWM_CLIENT_BUILDDIR@/libmb-wm-client-override.la $(MBWM_CLIENT_BUILDDIR)/libmb-wm-client-override.la
endif endif
THEME_LIBS = @MBWM_THEME_BUILDDIR@/libmb-theme.la THEME_LIBS = $(MBWM_THEME_BUILDDIR)/libmb-theme.la
bin_PROGRAMS = matchbox-window-manager-2-simple bin_PROGRAMS = matchbox-window-manager-2-simple
@@ -28,15 +28,15 @@ matchbox_window_manager_2_simple_LDFLAGS = \
$(LDFLAGS) $(LDFLAGS)
matchbox_window_manager_2_simple_LDADD = \ matchbox_window_manager_2_simple_LDADD = \
@MBWM_CORE_LIB@ \ $(MBWM_CORE_LIB) \
$(THEME_LIBS) \ $(THEME_LIBS) \
$(CLIENT_LIBS) \ $(CLIENT_LIBS) \
$(COMPMGR_LIBS) \ $(COMPMGR_LIBS) \
@MBWM_LIBS@ $(MBWM_LIBS)
matchbox_window_manager_2_simple_DEPENDENCIES = \ matchbox_window_manager_2_simple_DEPENDENCIES = \
@MBWM_CORE_LIB@ \ $(MBWM_CORE_LIB) \
$(THEME_LIBS) \ $(THEME_LIBS) \
$(CLIENT_LIBS) \ $(CLIENT_LIBS) \
$(COMPMGR_LIBS) $(COMPMGR_LIBS)

View File

@@ -5,7 +5,7 @@ endif
COMMON_SRC = mb-wm-theme.h mb-wm-theme.c mb-wm-theme-xml.h mb-wm-theme-xml.c 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 pkgincludedir = $(includedir)/$(MBWM2_INCDIR)/theme-engines
if ENABLE_LIBMATCHBOX if ENABLE_LIBMATCHBOX
pkginclude_HEADERS = mb-wm-theme.h mb-wm-theme-png.h mb-wm-theme-xml.h pkginclude_HEADERS = mb-wm-theme.h mb-wm-theme-png.h mb-wm-theme-xml.h
@@ -14,6 +14,6 @@ noinst_LTLIBRARIES = libmb-theme.la
libmb_theme_la_SOURCES = $(COMMON_SRC) $(PNG_SRC) libmb_theme_la_SOURCES = $(COMMON_SRC) $(PNG_SRC)
libmb_theme_la_CFLAGS = libmb_theme_la_CFLAGS =
INCLUDES = @MBWM_INCS@ @MBWM_CFLAGS@ -DDATADIR=\"$(datadir)\" INCLUDES = $(MBWM_INCS) $(MBWM_CFLAGS) -DDATADIR=\"$(datadir)\"
MAINTAINERCLEANFILES = config.h.in Makefile.in MAINTAINERCLEANFILES = config.h.in Makefile.in