Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix automake-1.13 deprecations
  • Loading branch information
raveit committed Jun 26, 2013
1 parent 18b49ed commit 20fbb01
Show file tree
Hide file tree
Showing 11 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion DirsMakefile
Expand Up @@ -6,7 +6,7 @@ pixmapsdir = $(pkgdatadir)/pixmaps
interfacesdir = $(pkgdatadir)/ui interfacesdir = $(pkgdatadir)/ui
confdir = $(sysconfdir)/mate-system-tools confdir = $(sysconfdir)/mate-system-tools


INCLUDES = -DPIXMAPS_DIR=\""$(pixmapsdir)"\" \ AM_CPPFLAGS = -DPIXMAPS_DIR=\""$(pixmapsdir)"\" \
-DINTERFACES_DIR=\""$(interfacesdir)"\" \ -DINTERFACES_DIR=\""$(interfacesdir)"\" \
-DFRONTEND_DIR=\""$(frontenddir)"\" \ -DFRONTEND_DIR=\""$(frontenddir)"\" \
-DDESKTOP_DATA_DIR=\""$(desktopdatadir)"\" \ -DDESKTOP_DATA_DIR=\""$(desktopdatadir)"\" \
Expand Down
2 changes: 1 addition & 1 deletion autogen.sh
Expand Up @@ -6,7 +6,7 @@ test -z "$srcdir" && srcdir=.


PKG_NAME="mate-system-tools" 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 -n "**Error**: Directory "\`$srcdir\'" does not look like the"
echo " top-level $PKG_NAME directory" echo " top-level $PKG_NAME directory"
exit 1 exit 1
Expand Down
2 changes: 1 addition & 1 deletion configure.in → configure.ac
Expand Up @@ -2,7 +2,7 @@ AC_PREREQ(2.60)
AC_INIT(mate-system-tools, 1.6.0, http://wwww.mate-desktop.org/) AC_INIT(mate-system-tools, 1.6.0, http://wwww.mate-desktop.org/)
AC_CONFIG_SRCDIR(src/common/gst-tool.c) AC_CONFIG_SRCDIR(src/common/gst-tool.c)
AC_CONFIG_MACRO_DIR([m4]) 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])]) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])


IT_PROG_INTLTOOL([0.35.0]) IT_PROG_INTLTOOL([0.35.0])
Expand Down
2 changes: 1 addition & 1 deletion src/common/Makefile.am
Expand Up @@ -2,7 +2,7 @@ include $(top_srcdir)/DirsMakefile


noinst_LIBRARIES = libsetuptool.a noinst_LIBRARIES = libsetuptool.a


INCLUDES += \ AM_CPPFLAGS += \
$(GST_CFLAGS) \ $(GST_CFLAGS) \
-DDATADIR=\""$(datadir)"\" \ -DDATADIR=\""$(datadir)"\" \
-DLIBDIR=\""$(libdir)"\" \ -DLIBDIR=\""$(libdir)"\" \
Expand Down
2 changes: 1 addition & 1 deletion src/network/Makefile.am
Expand Up @@ -11,7 +11,7 @@ toolname = mate-network
bin_PROGRAMS = mate-network-admin bin_PROGRAMS = mate-network-admin


## SUBDIRS = ## SUBDIRS =
INCLUDES += $(GST_TOOL_CFLAGS) $(DBUS_CFLAGS) $(GIO_CFLAGS) AM_CPPFLAGS += $(GST_TOOL_CFLAGS) $(DBUS_CFLAGS) $(GIO_CFLAGS)
CLEANFILES = $(GST_TOOL_CLEANFILES) CLEANFILES = $(GST_TOOL_CLEANFILES)
EXTRA_DIST = $(GST_TOOL_EXTRA_DIST) EXTRA_DIST = $(GST_TOOL_EXTRA_DIST)


Expand Down
2 changes: 1 addition & 1 deletion src/services/Makefile.am
Expand Up @@ -11,7 +11,7 @@ toolname = mate-services
bin_PROGRAMS = mate-services-admin bin_PROGRAMS = mate-services-admin


## SUBDIRS = ## SUBDIRS =
INCLUDES += $(GST_TOOL_CFLAGS) AM_CPPFLAGS += $(GST_TOOL_CFLAGS)
CLEANFILES = $(GST_TOOL_CLEANFILES) CLEANFILES = $(GST_TOOL_CLEANFILES)
EXTRA_DIST = $(GST_TOOL_EXTRA_DIST) EXTRA_DIST = $(GST_TOOL_EXTRA_DIST)


Expand Down
2 changes: 1 addition & 1 deletion src/shares/Makefile.am
Expand Up @@ -14,7 +14,7 @@ if BUILD_CAJA
SUBDIRS = caja SUBDIRS = caja
endif endif


INCLUDES += $(GST_TOOL_CFLAGS) AM_CPPFLAGS += $(GST_TOOL_CFLAGS)
CLEANFILES = $(GST_TOOL_CLEANFILES) CLEANFILES = $(GST_TOOL_CLEANFILES)
EXTRA_DIST = $(GST_TOOL_EXTRA_DIST) EXTRA_DIST = $(GST_TOOL_EXTRA_DIST)


Expand Down
2 changes: 1 addition & 1 deletion src/shares/caja/Makefile.am
@@ -1,4 +1,4 @@
INCLUDES = $(GST_TOOL_CFLAGS) \ AM_CPPFLAGS = $(GST_TOOL_CFLAGS) \
$(CAJA_CFLAGS) \ $(CAJA_CFLAGS) \
-DDATADIR=\"$(datadir)\" \ -DDATADIR=\"$(datadir)\" \
-DMATELOCALEDIR=\""$(datadir)/locale"\" \ -DMATELOCALEDIR=\""$(datadir)/locale"\" \
Expand Down
2 changes: 1 addition & 1 deletion src/time/Makefile.am
Expand Up @@ -11,7 +11,7 @@ toolname = mate-time
bin_PROGRAMS = mate-time-admin bin_PROGRAMS = mate-time-admin


SUBDIRS = e-map SUBDIRS = e-map
INCLUDES += $(GST_TOOL_CFLAGS) $(DBUS_CFLAGS) AM_CPPFLAGS += $(GST_TOOL_CFLAGS) $(DBUS_CFLAGS)
CLEANFILES = $(GST_TOOL_CLEANFILES) CLEANFILES = $(GST_TOOL_CLEANFILES)
EXTRA_DIST = $(GST_TOOL_EXTRA_DIST) EXTRA_DIST = $(GST_TOOL_EXTRA_DIST)


Expand Down
2 changes: 1 addition & 1 deletion src/time/e-map/Makefile.am
@@ -1,6 +1,6 @@
include ../../../DirsMakefile include ../../../DirsMakefile


INCLUDES += \ AM_CPPFLAGS += \
$(GST_TOOL_CFLAGS) $(GST_TOOL_CFLAGS)


LDADD = -lm $(GST_TOOL_LIBS) LDADD = -lm $(GST_TOOL_LIBS)
Expand Down
2 changes: 1 addition & 1 deletion src/users/Makefile.am
Expand Up @@ -11,7 +11,7 @@ toolname = mate-users
bin_PROGRAMS = mate-users-admin bin_PROGRAMS = mate-users-admin


SUBDIRS = SUBDIRS =
INCLUDES += $(GST_TOOL_CFLAGS) AM_CPPFLAGS += $(GST_TOOL_CFLAGS)


mate_users_admin_LDADD = $(GST_TOOL_LIBS) mate_users_admin_LDADD = $(GST_TOOL_LIBS)
mate_users_admin_DEPENDENCIES = $(GST_TOOL_DEPENDENCIES) mate_users_admin_DEPENDENCIES = $(GST_TOOL_DEPENDENCIES)
Expand Down

0 comments on commit 20fbb01

Please sign in to comment.