summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasmine Hassan <[email protected]>2012-11-11 06:38:09 +0200
committerJasmine Hassan <[email protected]>2012-11-11 08:01:15 +0200
commitbfc5cbef4b0d3a95246d38af041f668068afda57 (patch)
treef27144e1a667e0440499b0a7522f2a5ceed08ac5
parentc0080bd8df9c7e0edb7d3a406a40336e4229ac82 (diff)
downloadmate-desktop-bfc5cbef4b0d3a95246d38af041f668068afda57.tar.bz2
mate-desktop-bfc5cbef4b0d3a95246d38af041f668068afda57.tar.xz
[build] Update all Makefile.am to more recent standards
http://git.gnome.org/browse/gnome-desktop/commit/?id=4c3d78c930ecb833a677f534ef6cd697d3d92169
-rw-r--r--Makefile.am16
-rw-r--r--libmate-desktop/Makefile.am18
-rw-r--r--libmate-desktop/libmateui/Makefile.am12
3 files changed, 22 insertions, 24 deletions
diff --git a/Makefile.am b/Makefile.am
index 217eb8a..c0d5b64 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,4 @@
-SUBDIRS = \
- po \
- libmate-desktop \
- docs \
- man \
- schemas
+SUBDIRS = libmate-desktop man docs po schemas
if MATE_ABOUT_ENABLED
SUBDIRS += mate-about
@@ -14,10 +9,13 @@ endif
ACLOCAL_AMFLAGS = -I m4
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-scrollkeeper
+
if MATE_ABOUT_ENABLED
-versiondir=$(datadir)/mate-about
-version_DATA=mate-version.xml
+versiondir = $(datadir)/mate-about
+version_DATA = mate-version.xml
endif
+
@INTLTOOL_XML_RULE@
EXTRA_DIST = \
@@ -27,8 +25,6 @@ EXTRA_DIST = \
mate-version.xml.in.in \
mate-doc-utils.make
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-scrollkeeper
-
CLEANFILES = \
$(version_DATA)
diff --git a/libmate-desktop/Makefile.am b/libmate-desktop/Makefile.am
index 322963e..4007291 100644
--- a/libmate-desktop/Makefile.am
+++ b/libmate-desktop/Makefile.am
@@ -1,14 +1,16 @@
SUBDIRS = libmate libmateui
-INCLUDES = \
- -DMATELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale\"" \
- -DPNP_IDS=\""$(PNP_IDS)"\" \
- $(WARN_CFLAGS) \
- $(DISABLE_DEPRECATED) \
+lib_LTLIBRARIES = libmate-desktop-2.la
+
+AM_CPPFLAGS = \
+ $(MATE_DESKTOP_CFLAGS) \
$(XLIB_CFLAGS) \
- $(MATE_DESKTOP_CFLAGS)
+ -DG_LOG_DOMAIN=\"MateDesktop\" \
+ -DMATELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale\"" \
+ -DPNP_IDS=\""$(PNP_IDS)"\" \
+ $(DISABLE_DEPRECATED)
-lib_LTLIBRARIES = libmate-desktop-2.la
+AM_CFLAGS = $(WARN_CFLAGS)
noinst_PROGRAMS = test-ditem
@@ -47,11 +49,11 @@ test_ditem_LDADD = \
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = mate-desktop-2.0.pc
-pnpdata_DATA_dist = pnp.ids
if USE_INTERNAL_PNP_IDS
pnpdatadir = $(datadir)/libmate-desktop
pnpdata_DATA = pnp.ids
endif
+pnpdata_DATA_dist = pnp.ids
check:
test -s $(top_srcdir)/libmate-desktop/pnp.ids
diff --git a/libmate-desktop/libmateui/Makefile.am b/libmate-desktop/libmateui/Makefile.am
index ca42525..413fee0 100644
--- a/libmate-desktop/libmateui/Makefile.am
+++ b/libmate-desktop/libmateui/Makefile.am
@@ -1,10 +1,10 @@
libmateui_desktopdir = $(includedir)/mate-desktop-2.0/libmateui
-libmateui_desktop_HEADERS = \
- mate-bg.h \
- mate-bg-crossfade.h \
- mate-desktop-thumbnail.h \
- mate-rr.h \
- mate-rr-config.h \
+libmateui_desktop_HEADERS = \
+ mate-bg.h \
+ mate-bg-crossfade.h \
+ mate-desktop-thumbnail.h \
+ mate-rr.h \
+ mate-rr-config.h \
mate-rr-labeler.h
-include $(top_srcdir)/git.mk