[Xfce4-commits] [panel-plugins/xfce4-stopwatch-plugin] 02/03: Fix various autotools warnings

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

n   c   o   p   a       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository panel-plugins/xfce4-stopwatch-plugin.

commit 2057e4e6e5ee65b823b1dbc81dd06332cc4c4256
Author: Natanael Copa <ncopa at alpinelinux.org>
Date:   Fri Mar 15 18:35:36 2019 +0100

    Fix various autotools warnings
---
 Makefile.am              | 2 ++
 configure.ac.in          | 8 ++++++--
 panel-plugin/Makefile.am | 4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 9dd8263..1adf064 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,7 @@
 @SET_MAKE@
 
+ACLOCAL_AMFLAGS = -I m4
+
 SUBDIRS =								\
 	icons								\
 	panel-plugin							\
diff --git a/configure.ac.in b/configure.ac.in
index 223c752..d526e2b 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -20,6 +20,7 @@ AC_COPYRIGHT([Copyright (c) 2009 Diego Ongaro <ongardie at gmail.com>])
 AC_COPYRIGHT([Copyright (c) 2019 Natanael Copa <ncopa at alpinelinux.org])
 AC_INIT([xfce4-stopwatch-plugin], [stopwatch_version], [ncopa at alpinelinux.org])
 AC_PREREQ([2.50])
+AC_CONFIG_MACRO_DIRS([m4])
 
 dnl AC_CANONICAL_TARGET()
 
@@ -32,8 +33,11 @@ dnl check for basic programs
 AC_PROG_CC_C_O()
 AC_PROG_LD()
 AC_PROG_INSTALL()
-AC_PROG_LIBTOOL()
-AC_PROG_INTLTOOL()
+IT_PROG_INTLTOOL([0.35.0])
+
+dnl libtool
+LT_PREREQ([2.4]) and
+LT_INIT([disable-static])
 
 dnl check for required packages
 XDT_CHECK_PACKAGE([GTK], [gtk+-3.0])
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index ae9a0c0..5975d76 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -1,6 +1,6 @@
 # This file was based on that of xfce4-notes-plugin.
 
-INCLUDES =								\
+AM_CPPFLAGS =								\
 	-I$(top_srcdir)							\
 	-DGETTEXT_PACKAGE=\""$(GETTEXT_PACKAGE)"\"			\
 	-DPACKAGE_LOCALE_DIR=\""$(localedir)"\"
@@ -56,7 +56,7 @@ desktopdir = $(datadir)/xfce4/panel/plugins
 desktop_DATA = xfce4-stopwatch-plugin.desktop
 @INTLTOOL_DESKTOP_RULE@
 
-%.desktop.in: %.desktop.in.in
+xfce4-stopwatch-plugin.desktop.in: xfce4-stopwatch-plugin.desktop.in.in
 	sed -e "s^@EXTERNAL_PLUGIN_PATH@^$(plugindir)^" \
 		$< > $@
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.