Updating branch refs/heads/master to dccab28ced61f3d410f0d244ae6236d590641457 (commit) from 959dcbf7ab3948cd5753c2fa4c426c1caf7000f8 (commit)
commit dccab28ced61f3d410f0d244ae6236d590641457 Author: Jérôme Guelfucci <jero...@xfce.org> Date: Fri Jul 31 09:08:15 2009 +0200 Fix all warnings when running the autogen script. Remove the AC_AIX, AC_ISC_POSIX and AC_MINIX macros which seem useless and trigger a lot of warnings. Add the AC_USE_SYSTEM_EXTENSIONS macro to configure.ac.in. Do not use GNU make specific rules in {panel-plugin,src}/Makefile.am and remove some trailing spaces in lib/Makefile.am. ChangeLog | 11 +++++++++++ configure.ac.in | 9 ++------- lib/Makefile.am | 2 +- panel-plugin/Makefile.am | 2 +- src/Makefile.am | 2 +- 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index b17af08..89b8320 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,17 @@ Fixed the Indonesian documentation sub-directory, the autotools scripts were incomplete. Updated Italian and Galician documentation translation. +2009-07-30 jeromeg + +Fix all warnings when running the autogen script. + +Remove the AC_AIX, AC_ISC_POSIX and AC_MINIX macros which seem useless +and trigger a lot of warnings. Add the AC_USE_SYSTEM_EXTENSIONS macro +to configure.ac.in. + +Do not use GNU make specific rules in {panel-plugin,src}/Makefile.am +and remove some trailing spaces in lib/Makefile.am. + 2009-07-29 jeromeg Use my Xfce adress everywhere. diff --git a/configure.ac.in b/configure.ac.in index 146f1a6..83e4366 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -12,6 +12,7 @@ m4_define([xfce4_screenshooter_version_tag], [svn]) m4_define([xfce4_screenshooter_version], [xfce4_screenshooter_version_major().xfce4_screenshooter_version_minor().xfce4_screenshooter_version_micro()ifelse(xfce4_screenshooter_version_nano(), [], [], [.xfce4_screenshooter_version_nano()])ifelse(xfce4_screenshooter_version_tag(), [svn], [xfce4_screenshooter_version_tag()-xfce4_screenshooter_version_build()], [xfce4_screenshooter_version_tag()])]) AC_INIT([xfce4-screenshooter], [xfce4_screenshooter_version], [http://bugzilla.xfce.org/], [xfce4-screenshooter]) +AC_USE_SYSTEM_EXTENSIONS() dnl *************************** dnl *** Initialize automake *** @@ -20,13 +21,6 @@ AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar]) AM_CONFIG_HEADER([config.h]) AM_MAINTAINER_MODE() -dnl ******************************* -dnl *** Check for UNIX variants *** -dnl ******************************* -AC_AIX() -AC_ISC_POSIX() -AC_MINIX() - dnl ******************************** dnl *** Check for basic programs *** dnl ******************************** @@ -35,6 +29,7 @@ AC_PROG_CC_C_O() AC_PROG_LD() AC_PROG_INSTALL() AC_PROG_INTLTOOL() +AM_PROG_CC_C_O() dnl ************************** dnl *** Initialize libtool *** diff --git a/lib/Makefile.am b/lib/Makefile.am index a058df1..c559eea 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -14,7 +14,7 @@ libscreenshooter_la_SOURCES = \ screenshooter-global.h \ screenshooter-job.c screenshooter-job.h \ screenshooter-simple-job.c screenshooter-simple-job.h \ - screenshooter-utils.c screenshooter-utils.h \ + screenshooter-utils.c screenshooter-utils.h \ screenshooter-zimagez.c screenshooter-zimagez.h libscreenshooter_la_CFLAGS = \ diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am index 0d1f3f8..6c15555 100644 --- a/panel-plugin/Makefile.am +++ b/panel-plugin/Makefile.am @@ -33,7 +33,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) @INTLTOOL_DESKTOP_RULE@ # get full path into .desktop file -%.desktop.in: %.desktop.in.in +screenshooter.desktop.in: screenshooter.desktop.in.in sed -e "s...@plugin_path@^$(libexecdir)/xfce4/panel-plugins^" \ $< > $@ diff --git a/src/Makefile.am b/src/Makefile.am index 48272b7..c9a26d8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -30,7 +30,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) @INTLTOOL_DESKTOP_RULE@ # get full path into .desktop file -%.desktop.in: %.desktop.in.in +xfce4-screenshooter.desktop.in: xfce4-screenshooter.desktop.in.in sed -e "s...@plugin_path@^$(libexecdir)/applications^" \ $< > $@
_______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits