Update autoconf files

diff --git a/configure.ac b/configure.ac
index 0ee718f..592d971 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,12 +2,13 @@
 
 dnl Initialization stuff.
 AC_INIT(dockbatmon, 0.1.0)
-AC_CONFIG_AUX_DIR(build-aux)
+AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_SRCDIR(src/batmon.c)
-AM_CONFIG_HEADER(config.h:config-h.in)
-dnl Checking if the NEWS file has been updated to reflect the current version.
-AM_INIT_AUTOMAKE(check-news)
+
+AM_INIT_AUTOMAKE([no-define gnits dist-bzip2
+                 -Wall -Wno-extra-portability])
 AM_SILENT_RULES([yes])
+AM_CONFIG_HEADER(config.h:config-h.in)
 
 dnl Testing the C compiler.
 AC_PROG_CC

diff --git a/src/Makefile.am b/src/Makefile.am
index d2cf47f..3992046 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,6 @@
 # This file is processed by GNU automake to generate Makefile.in
 
 AM_CPPFLAGS = \
-    -I$(top_srcdir) \
     -I$(top_srcdir)/pixmaps \
     $(WARNINGCFLAGS) \
     $(GTK_CFLAGS)
@@ -15,17 +14,8 @@ dockbatmon_SOURCES = \
     dockapp.c dockapp.h \
     common.h
 
-dockbatmon_LDADD = $(GTK_LIBS)
-
-# These headers will be included in the distribution tarball, but will not be
-# installed by 'make install'
-noinst_HEADERS =
-
-# we want these in the dist tarball
-EXTRA_DIST =
+LDADD = $(GTK_LIBS)
 
 CLEANFILES = *~
 
-DISTCLEANFILES = .deps/*.P
-
 MAINTAINERCLEANFILES = Makefile.in

diff --git a/src/batmon.c b/src/batmon.c
index 4775007..e8b3d73 100644 (file)
--- a/src/batmon.c
+++ b/src/batmon.c
@@ -322,7 +322,7 @@ static gboolean
 batmon_button_release(GtkWidget *clock, GdkEventButton *event)
 {
        if (batmon_infos.debug)
-               printf("%s: button released\n", PACKAGE);
+               printf("%s: button released\n", PACKAGE_NAME);
 
        return FALSE;
 }

diff --git a/src/options.c b/src/options.c
index 4c396d9..b3c6543 100644 (file)
--- a/src/options.c
+++ b/src/options.c
@@ -29,7 +29,7 @@
  ******************************************************************************/
 static void DisplayUsage(void)
 {
-       printf("Usage: %s [OPTIONS]...\n", PACKAGE);
+       printf("Usage: %s [OPTIONS]...\n", PACKAGE_NAME);
        printf("Dockable analog clock and calendar.\n\n");
        printf
            ("  -d                        Display debugging messages.\n");
@@ -45,18 +45,18 @@ static void DisplayUsage(void)
 static void DisplayVersion(void)
 {
        printf("\n");
-       printf("  %s, version %s\n", PACKAGE, VERSION);
+       printf("  %s, version %s\n", PACKAGE_NAME, PACKAGE_VERSION);
        printf("  Written by Hugo Villeneuve\n\n");
 }
 
 static void InvalidOption(char *message, /*@null@ */ char *string)
 {
        if (string == NULL)
-               fprintf(stderr, "%s: %s\n", PACKAGE, message);
+               fprintf(stderr, "%s: %s\n", PACKAGE_NAME, message);
        else
-               fprintf(stderr, "%s: %s %s\n", PACKAGE, message, string);
+               fprintf(stderr, "%s: %s %s\n", PACKAGE_NAME, message, string);
 
-       fprintf(stderr, "Try `%s -h' for more information.\n", PACKAGE);
+       fprintf(stderr, "Try `%s -h' for more information.\n", PACKAGE_NAME);
 
        exit(EXIT_FAILURE);
 }