[gnome-mastermind] Clean up autotools stuff
- From: Filippo Argiolas <fargiolas src gnome org>
- To: svn-commits-list gnome org
- Subject: [gnome-mastermind] Clean up autotools stuff
- Date: Sat, 18 Apr 2009 07:44:49 -0400 (EDT)
commit a83e5fcf3913b353294033a2d5964b5a6309fa9b
Author: Filippo Argiolas <filippo argiolas gmail com>
Date: Sat Apr 18 11:33:16 2009 +0200
Clean up autotools stuff
---
configure.ac | 36 +++++++++---------------------------
po/LINGUAS | 11 +++++++++++
src/Makefile.am | 1 +
src/gnome-mastermind.c | 12 ++----------
4 files changed, 23 insertions(+), 37 deletions(-)
diff --git a/configure.ac b/configure.ac
index e06c27d..a76b97a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,10 +8,12 @@ AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE([1.8])
-AC_CONFIG_HEADERS([config.h])
+AM_CONFIG_HEADER([config.h])
dnl Check for C compiler
AC_LANG([C])
+AC_PROG_CC
+AM_PROG_CC_STDC
AC_ISC_POSIX
dnl Checks for various programs
@@ -19,29 +21,6 @@ AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
-dnl Various checks just so we're really sane checking (proposed by AzaToth)
-AC_C_VOLATILE
-
-AC_TYPE_MODE_T
-AC_TYPE_PID_T
-
-AC_CHECK_HEADERS([ctype.h fcntl.h math.h stdio.h errno.h])
-
-AC_CHECK_FUNCS([dup2])
-AC_CHECK_FUNCS([floor])
-AC_CHECK_FUNCS([mkdir])
-AC_CHECK_FUNCS([rmdir])
-AC_CHECK_FUNCS([strchr])
-AC_CHECK_FUNCS([strcspn])
-AC_CHECK_FUNCS([strncasecmp])
-AC_CHECK_FUNCS([strstr])
-AC_CHECK_FUNCS([strtol])
-
-AC_FUNC_FORK
-AC_FUNC_MALLOC
-AC_FUNC_REALLOC
-AC_FUNC_STAT
-
dnl Next four lines is a hack to prevent libtool checking for C++/F77
m4_undefine([AC_PROG_CXX])
m4_defun([AC_PROG_CXX],[])
@@ -53,6 +32,10 @@ AC_DISABLE_STATIC
AC_ENABLE_SHARED
AC_PROG_LIBTOOL
+AM_MAINTAINER_MODE
+GNOME_MAINTAINER_MODE_DEFINES
+GNOME_COMPILE_WARNINGS
+
dnl pkg-config
PKG_PROG_PKG_CONFIG
@@ -70,7 +53,6 @@ PKG_CHECK_MODULES([GTK_DEP],
gdk-pixbuf-2.0 >= 2.8.0])
PKG_CHECK_MODULES([GCONF], [gconf-2.0 >= 2.0.0])
-dnl CLOCK defines
GM_DEFINES='-DDATA_DIR="\"$(datadir)\"" -DPKGDATA_DIR="\"$(pkgdatadir)\""'
AC_SUBST([GM_DEFINES])
@@ -93,8 +75,8 @@ AM_GLIB_GNU_GETTEXT
gmlocaledir='${prefix}/${DATADIRNAME}/locale'
AC_SUBST(gmlocaledir)
-ALL_LINGUAS="it pl fr sv de en_GB eu id ar pt_BR es"
-AC_SUBST(ALL_LINGUAS)
+#ALL_LINGUAS="it pl fr sv de en_GB eu id ar pt_BR es"
+#AC_SUBST(ALL_LINGUAS)
GNOME_DOC_INIT
diff --git a/po/LINGUAS b/po/LINGUAS
new file mode 100644
index 0000000..1b5e4dc
--- /dev/null
+++ b/po/LINGUAS
@@ -0,0 +1,11 @@
+ar
+de
+en_GB
+es
+eu
+fr
+id
+it
+pl
+pt_BR
+sv
diff --git a/src/Makefile.am b/src/Makefile.am
index bb24ab3..49472c8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,4 +18,5 @@ gnome_mastermind_CFLAGS = \
-D_XOPEN_SOURCE=600
gnome_mastermind_SOURCES = \
+ gnome-mastermind.h \
gnome-mastermind.c
diff --git a/src/gnome-mastermind.c b/src/gnome-mastermind.c
index 3f73688..2ccd6df 100644
--- a/src/gnome-mastermind.c
+++ b/src/gnome-mastermind.c
@@ -32,17 +32,9 @@
#include <gdk/gdkkeysyms.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gconf/gconf-client.h>
+#include <cairo/cairo.h>
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif /* HAVE_CONFIG_H */
-
-#ifdef ENABLE_NLS
-#include <glib/gi18n.h>
-#else /* !ENABLE_NLS */
-#define _(String) (String)
-#define N_(String) (String)
-#endif /* ENABLE__NLS */
+#include "gnome-mastermind.h"
#define TRAY_ROWS 1
#define TRAY_COLS 8
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]