summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Woodward2010-02-22 21:45:00 -0500
committerJason Woodward2010-02-22 21:59:31 -0500
commit733bcf5f308e8f42a57d6064388dbe0af0cd089b (patch)
treef346b200fa7c95b27c0840086544c242d6e22e3c
parente77afc7c0b639e335bae8809f55a1037f7951e42 (diff)
downloadgslapt-733bcf5f308e8f42a57d6064388dbe0af0cd089b.tar.gz
build system updates
-rw-r--r--Makefile.am13
-rwxr-xr-xautogen.sh159
-rw-r--r--configure.in24
-rw-r--r--po/LINGUAS21
-rw-r--r--src/Makefile.am10
-rw-r--r--stamp-h.in1
6 files changed, 45 insertions, 183 deletions
diff --git a/Makefile.am b/Makefile.am
index 9d95969..823582e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,9 +5,12 @@ SUBDIRS = src po
PKGDIR = `pwd`/pkg
EXTRA_DIST = \
- autogen.sh \
- gslapt.glade \
- gslapt.gladep
+ FAQ \
+ gslapt.desktop \
+ gslapt-kde.desktop \
+ series_map.rc \
+ slack-desc \
+ slack-required
install-data-local:
@$(NORMAL_INSTALL)
@@ -56,8 +59,4 @@ pkg: all
strip --strip-unneeded $(PKGDIR)/$(sbindir)/@PACKAGE@
( cd $(PKGDIR) && /sbin/makepkg -l y -c n ../@PACKAGE@-@VERSION@-@host_cpu@-1.tgz )
-pkgclean:
- rm -rf $(PKGDIR)
-
-clean-generic: pkgclean
diff --git a/autogen.sh b/autogen.sh
index 8fe1de8..d5d8451 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,159 +1,4 @@
#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-DIE=0
-
-if [ -n "$GNOME2_DIR" ]; then
- ACLOCAL_FLAGS="-I $GNOME2_DIR/share/aclocal $ACLOCAL_FLAGS"
- LD_LIBRARY_PATH="$GNOME2_DIR/lib:$LD_LIBRARY_PATH"
- PATH="$GNOME2_DIR/bin:$PATH"
- export PATH
- export LD_LIBRARY_PATH
-fi
-
-(test -f $srcdir/configure.in) || {
- echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
- echo " top-level package directory"
- exit 1
-}
-
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "**Error**: You must have \`autoconf' installed."
- echo "Download the appropriate package for your distribution,"
- echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
- DIE=1
-}
-
-(grep "^AC_PROG_INTLTOOL" $srcdir/configure.in >/dev/null) && {
- (intltoolize --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "**Error**: You must have \`intltool' installed."
- echo "You can get it from:"
- echo " ftp://ftp.gnome.org/pub/GNOME/"
- DIE=1
- }
-}
-
-(grep "^AM_PROG_XML_I18N_TOOLS" $srcdir/configure.in >/dev/null) && {
- (xml-i18n-toolize --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "**Error**: You must have \`xml-i18n-toolize' installed."
- echo "You can get it from:"
- echo " ftp://ftp.gnome.org/pub/GNOME/"
- DIE=1
- }
-}
-
-(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
- (libtool --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "**Error**: You must have \`libtool' installed."
- echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
- DIE=1
- }
-}
-
-(grep "^AM_GLIB_GNU_GETTEXT" $srcdir/configure.in >/dev/null) && {
- (grep "sed.*POTFILES" $srcdir/configure.in) > /dev/null || \
- (glib-gettextize --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "**Error**: You must have \`glib' installed."
- echo "You can get it from: ftp://ftp.gtk.org/pub/gtk"
- DIE=1
- }
-}
-
-(automake --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "**Error**: You must have \`automake' installed."
- echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
- DIE=1
- NO_AUTOMAKE=yes
-}
-
-
-# if no automake, don't bother testing for aclocal
-test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
- echo
- echo "**Error**: Missing \`aclocal'. The version of \`automake'"
- echo "installed doesn't appear recent enough."
- echo "You can get automake from ftp://ftp.gnu.org/pub/gnu/"
- DIE=1
-}
-
-if test "$DIE" -eq 1; then
- exit 1
-fi
-
-if test -z "$*"; then
- echo "**Warning**: I am going to run \`configure' with no arguments."
- echo "If you wish to pass any to it, please specify them on the"
- echo \`$0\'" command line."
- echo
-fi
-
-case $CC in
-xlc )
- am_opt=--include-deps;;
-esac
-
-for coin in `find $srcdir -path $srcdir/CVS -prune -o -name configure.in -print`
-do
- dr=`dirname $coin`
- if test -f $dr/NO-AUTO-GEN; then
- echo skipping $dr -- flagged as no auto-gen
- else
- echo processing $dr
- ( cd $dr
-
- aclocalinclude="$ACLOCAL_FLAGS"
-
- if grep "^AM_GLIB_GNU_GETTEXT" configure.in >/dev/null; then
- echo "Creating $dr/aclocal.m4 ..."
- test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
- echo "Running glib-gettextize... Ignore non-fatal messages."
- echo "no" | glib-gettextize --force --copy
- echo "Making $dr/aclocal.m4 writable ..."
- test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
- fi
- if grep "^AC_PROG_INTLTOOL" configure.in >/dev/null; then
- echo "Running intltoolize..."
- intltoolize --copy --force --automake
- fi
- if grep "^AM_PROG_XML_I18N_TOOLS" configure.in >/dev/null; then
- echo "Running xml-i18n-toolize..."
- xml-i18n-toolize --copy --force --automake
- fi
- if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
- if test -z "$NO_LIBTOOLIZE" ; then
- echo "Running libtoolize..."
- libtoolize --force --copy
- fi
- fi
- echo "Running aclocal $aclocalinclude ..."
- aclocal $aclocalinclude
- if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
- echo "Running autoheader..."
- autoheader
- fi
- echo "Running automake --gnu $am_opt ..."
- automake --add-missing --gnu $am_opt
- echo "Running autoconf ..."
- autoconf
- )
- fi
-done
-
-conf_flags="--enable-maintainer-mode"
-
-if test x$NOCONFIGURE = x; then
- echo Running $srcdir/configure $conf_flags "$@" ...
- $srcdir/configure $conf_flags "$@" \
- && echo Now type \`make\' to compile. || exit 1
-else
- echo Skipping configure process.
-fi
+autoreconf --install
+intltoolize --copy --force
diff --git a/configure.in b/configure.in
index 0420d6e..20cccd4 100644
--- a/configure.in
+++ b/configure.in
@@ -1,10 +1,11 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT
+AC_INIT([gslapt], [0.5.3], [woodwardj@jaos.org])
AC_CONFIG_SRCDIR([configure.in])
-AM_INIT_AUTOMAKE(gslapt, 0.5.3)
+AM_INIT_AUTOMAKE([-Wall foreign])
AM_CONFIG_HEADER(config.h)
-AM_MAINTAINER_MODE
+AC_CONFIG_SRCDIR([src/])
+IT_PROG_INTLTOOL([0.35.0])
AC_CANONICAL_HOST
@@ -41,21 +42,20 @@ AC_CHECK_LIB(gpgme,gpgme_new, [
], [AC_MSG_WARN(gpg support disabled)])
dnl AC_CHECK_MEMBER([slapt_rc_config.use_priority], [LIBS="$LIBS -lslapt"], [AC_MSG_ERROR([libslapt 0.10.2 or greater is required])], [[#include <slapt.h>]])
AC_CHECK_LIB(slapt,slapt_disk_space_check, [], [AC_MSG_ERROR(libslapt 0.10.2b or greater is required)])
-LIBS="$LIBS -lglib-2.0 -lgthread-2.0"
-
-pkg_modules="gtk+-2.0 >= 2.4.0"
-PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
-AC_SUBST(PACKAGE_CFLAGS)
-AC_SUBST(PACKAGE_LIBS)
+glib_modules="glib-2.0 gthread-2.0"
+PKG_CHECK_MODULES(GLIB, [$glib_modules])
+AC_SUBST(GLIB_CFLAGS)
+AC_SUBST(GLIB_LIBS)
+gtk_modules="gtk+-2.0 >= 2.4.0"
+PKG_CHECK_MODULES(GTK, [$gtk_modules])
+AC_SUBST(GTK_CFLAGS)
+AC_SUBST(GTK_LIBS)
GETTEXT_PACKAGE=gslapt
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
-
-dnl Add the languages which your application supports here.
-ALL_LINGUAS="bg de el en es fr gl_ES id it ja nl pl pt pt_BR ru sk sv tr uk vi zh_CN"
AM_GLIB_GNU_GETTEXT
AC_CONFIG_FILES([
diff --git a/po/LINGUAS b/po/LINGUAS
new file mode 100644
index 0000000..69169e9
--- /dev/null
+++ b/po/LINGUAS
@@ -0,0 +1,21 @@
+bg
+de
+el
+en
+es
+fr
+gl_ES
+id
+it
+ja
+nl
+pl
+pt
+pt_BR
+ru
+sk
+sv
+tr
+uk
+vi
+zh_CN
diff --git a/src/Makefile.am b/src/Makefile.am
index e857ce4..abca90d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,10 +1,5 @@
## Process this file with automake to produce Makefile.in
-INCLUDES = \
- -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
- -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
- @PACKAGE_CFLAGS@
-
sbin_PROGRAMS = gslapt
gslapt_SOURCES = \
@@ -15,5 +10,8 @@ gslapt_SOURCES = \
series.c series.h \
settings.c settings.h
-gslapt_LDADD = @PACKAGE_LIBS@ $(INTLLIBS)
+gslapt_LDADD = @GLIB_LIBS@ @GTK_LIBS@ $(INTLLIBS)
+gslapt_CPPFLAGS = @GLIB_CFLAGS@ @GTK_CFLAGS@ \
+ -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
+ -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
diff --git a/stamp-h.in b/stamp-h.in
deleted file mode 100644
index 9788f70..0000000
--- a/stamp-h.in
+++ /dev/null
@@ -1 +0,0 @@
-timestamp