From bfc5cbef4b0d3a95246d38af041f668068afda57 Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Sun, 11 Nov 2012 06:38:09 +0200 Subject: [build] Update all Makefile.am to more recent standards http://git.gnome.org/browse/gnome-desktop/commit/?id=4c3d78c930ecb833a677f534ef6cd697d3d92169 --- libmate-desktop/Makefile.am | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'libmate-desktop/Makefile.am') 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 -- cgit v1.2.1 From 6e90196244e02b7203c77de3568f8c4dcc8dc65a Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Sun, 11 Nov 2012 06:43:05 +0200 Subject: [misc] rename --enable-deprecations to --enable-deprecation-flags This is a better name for this configure option, since it's really about enabling the use of the deprecation flags, not allowing the use of deprecated API. http://git.gnome.org/browse/gnome-desktop/commit/?id=7fcbb6d90d2c6251434dfac19364b39af21dceed --- libmate-desktop/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libmate-desktop/Makefile.am') diff --git a/libmate-desktop/Makefile.am b/libmate-desktop/Makefile.am index 4007291..878303d 100644 --- a/libmate-desktop/Makefile.am +++ b/libmate-desktop/Makefile.am @@ -8,7 +8,7 @@ AM_CPPFLAGS = \ -DG_LOG_DOMAIN=\"MateDesktop\" \ -DMATELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale\"" \ -DPNP_IDS=\""$(PNP_IDS)"\" \ - $(DISABLE_DEPRECATED) + $(DISABLE_DEPRECATED_CFLAGS) AM_CFLAGS = $(WARN_CFLAGS) -- cgit v1.2.1