Permalink
Browse files

fix automake-1.13 deprecations

  • Loading branch information...
1 parent 18b49ed commit 20fbb0108e9004991aa0113279eea61ac04526fe @raveit65 raveit65 committed Jun 26, 2013
View
@@ -6,7 +6,7 @@ pixmapsdir = $(pkgdatadir)/pixmaps
interfacesdir = $(pkgdatadir)/ui
confdir = $(sysconfdir)/mate-system-tools
-INCLUDES = -DPIXMAPS_DIR=\""$(pixmapsdir)"\" \
+AM_CPPFLAGS = -DPIXMAPS_DIR=\""$(pixmapsdir)"\" \
-DINTERFACES_DIR=\""$(interfacesdir)"\" \
-DFRONTEND_DIR=\""$(frontenddir)"\" \
-DDESKTOP_DATA_DIR=\""$(desktopdatadir)"\" \
View
@@ -6,7 +6,7 @@ test -z "$srcdir" && srcdir=.
PKG_NAME="mate-system-tools"
-(test -f $srcdir/configure.in) || {
+(test -f $srcdir/configure.ac) || {
echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
echo " top-level $PKG_NAME directory"
exit 1
@@ -2,7 +2,7 @@ AC_PREREQ(2.60)
AC_INIT(mate-system-tools, 1.6.0, http://wwww.mate-desktop.org/)
AC_CONFIG_SRCDIR(src/common/gst-tool.c)
AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
+AM_INIT_AUTOMAKE
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
IT_PROG_INTLTOOL([0.35.0])
@@ -2,7 +2,7 @@ include $(top_srcdir)/DirsMakefile
noinst_LIBRARIES = libsetuptool.a
-INCLUDES += \
+AM_CPPFLAGS += \
$(GST_CFLAGS) \
-DDATADIR=\""$(datadir)"\" \
-DLIBDIR=\""$(libdir)"\" \
@@ -11,7 +11,7 @@ toolname = mate-network
bin_PROGRAMS = mate-network-admin
## SUBDIRS =
-INCLUDES += $(GST_TOOL_CFLAGS) $(DBUS_CFLAGS) $(GIO_CFLAGS)
+AM_CPPFLAGS += $(GST_TOOL_CFLAGS) $(DBUS_CFLAGS) $(GIO_CFLAGS)
CLEANFILES = $(GST_TOOL_CLEANFILES)
EXTRA_DIST = $(GST_TOOL_EXTRA_DIST)
@@ -11,7 +11,7 @@ toolname = mate-services
bin_PROGRAMS = mate-services-admin
## SUBDIRS =
-INCLUDES += $(GST_TOOL_CFLAGS)
+AM_CPPFLAGS += $(GST_TOOL_CFLAGS)
CLEANFILES = $(GST_TOOL_CLEANFILES)
EXTRA_DIST = $(GST_TOOL_EXTRA_DIST)
@@ -14,7 +14,7 @@ if BUILD_CAJA
SUBDIRS = caja
endif
-INCLUDES += $(GST_TOOL_CFLAGS)
+AM_CPPFLAGS += $(GST_TOOL_CFLAGS)
CLEANFILES = $(GST_TOOL_CLEANFILES)
EXTRA_DIST = $(GST_TOOL_EXTRA_DIST)
@@ -1,4 +1,4 @@
-INCLUDES = $(GST_TOOL_CFLAGS) \
+AM_CPPFLAGS = $(GST_TOOL_CFLAGS) \
$(CAJA_CFLAGS) \
-DDATADIR=\"$(datadir)\" \
-DMATELOCALEDIR=\""$(datadir)/locale"\" \
@@ -11,7 +11,7 @@ toolname = mate-time
bin_PROGRAMS = mate-time-admin
SUBDIRS = e-map
-INCLUDES += $(GST_TOOL_CFLAGS) $(DBUS_CFLAGS)
+AM_CPPFLAGS += $(GST_TOOL_CFLAGS) $(DBUS_CFLAGS)
CLEANFILES = $(GST_TOOL_CLEANFILES)
EXTRA_DIST = $(GST_TOOL_EXTRA_DIST)
@@ -1,6 +1,6 @@
include ../../../DirsMakefile
-INCLUDES += \
+AM_CPPFLAGS += \
$(GST_TOOL_CFLAGS)
LDADD = -lm $(GST_TOOL_LIBS)
@@ -11,7 +11,7 @@ toolname = mate-users
bin_PROGRAMS = mate-users-admin
SUBDIRS =
-INCLUDES += $(GST_TOOL_CFLAGS)
+AM_CPPFLAGS += $(GST_TOOL_CFLAGS)
mate_users_admin_LDADD = $(GST_TOOL_LIBS)
mate_users_admin_DEPENDENCIES = $(GST_TOOL_DEPENDENCIES)

0 comments on commit 20fbb01

Please sign in to comment.