From: Andrea Zagli Date: Sat, 15 Dec 2012 15:33:01 +0000 (+0100) Subject: Updated autotools. X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=aeb16a7a4e598f922b1ce5287a6ad642bc054a7c;p=libgfeed Updated autotools. Setted version to 0.2.0. Added .gitignore. Replaced custom autogen.sh with gnome-autogen. --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..079f86a --- /dev/null +++ b/.gitignore @@ -0,0 +1,33 @@ +*.o +*.lo +*.la +.deps +.libs +m4 +missing +libtool +install-sh +Makefile +Makefile.in +ltmain.sh +stamp-h1 +aclocal.m4 +autom4te.cache +config.guess +config.h +config.h.in~ +config.log +config.status +configure +config.sub +libgfeed.pc +INSTALL +depcomp +docs/reference/version.xml +gtk-doc.make +test/test_atom +test/test_atom_load +test/test_atom_load_buffer +test/test_rss +test/test_rss_load +test/test_rss_load_buffer diff --git a/Makefile.am b/Makefile.am index 4c0b500..4bb8dfd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,3 +5,24 @@ EXTRA_DIST = libgfeed.pc.in pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libgfeed.pc +distclean-local: + if test "$(srcdir)" = "."; then :; else \ + rm -f ChangeLog; \ + fi + +ChangeLog: + @echo Creating $@ + @if test -d "$(srcdir)/.git"; then \ + (GIT_DIR=$(top_srcdir)/.git ./missing --run git log --stat -M -C --name-status --date=short --no-color) | fmt --split-only > $@.tmp \ + && mv -f $@.tmp $@ \ + || ($(RM) $@.tmp; \ + echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \ + (test -f $@ || echo git-log is required to generate this file >> $@)); \ + else \ + test -f $@ || \ + (echo A git checkout and git-log is required to generate ChangeLog >&2 && \ + echo A git checkout and git-log is required to generate this file >> $@); \ + fi + +.PHONY: ChangeLog + diff --git a/autogen.sh b/autogen.sh index 108b37e..7d6c249 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,98 +1,23 @@ -#!/bin/sh +#!/bin/bash # Run this to generate all the initial makefiles, etc. srcdir=`dirname $0` test -z "$srcdir" && srcdir=. -ORIGDIR=`pwd` -cd $srcdir -PROJECT=libgfeed -TEST_TYPE=-f -FILE=configure.ac +PKG_NAME="libgfeed" -DIE=0 - -have_libtool=false -if libtoolize --version < /dev/null > /dev/null 2>&1 ; then - libtool_version=`libtoolize --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'` - case $libtool_version in - 1.4*|1.5*) - have_libtool=true - ;; - esac -fi -if $have_libtool ; then : ; else - echo - echo "You must have libtool 1.4 installed to compile $PROJECT." - echo "Install the appropriate package for your distribution," - echo "or get the source tarball at http://ftp.gnu.org/gnu/libtool/" - DIE=1 -fi - -(gtkdocize --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "You must have gtk-doc installed to compile $PROJECT." - echo "Install the appropriate package for your distribution," - echo "or get the source tarball at http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/" - DIE=1 +(test -f $srcdir/configure.ac \ + && test -d $srcdir/src \ + && test -f $srcdir/src/gfeed.h) || { + echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" + echo " top-level libgfeed directory" + exit 1 } -(autoconf --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "You must have autoconf installed to compile $PROJECT." - echo "Install the appropriate package for your distribution," - echo "or get the source tarball at http://ftp.gnu.org/gnu/autoconf/" - DIE=1 +which gnome-autogen.sh || { + echo "You need to install gnome-common from GNOME and make" + echo "sure the gnome-autogen.sh script is in your \$PATH." + exit 1 } -if automake --version < /dev/null > /dev/null 2>&1 ; then - AUTOMAKE=automake - ACLOCAL=aclocal -else - echo - echo "You must have automake 1.7.x installed to compile $PROJECT." - echo "Install the appropriate package for your distribution," - echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/" - DIE=1 -fi - -if test "$DIE" -eq 1; then - exit 1 -fi - -test $TEST_TYPE $FILE || { - echo "You must run this script in the top-level $PROJECT directory" - exit 1 -} - -if test -z "$AUTOGEN_SUBDIR_MODE"; then - if test -z "$*"; then - echo "I am going to run ./configure with no arguments - if you wish " - echo "to pass any to it, please specify them on the $0 command line." - fi -fi - -rm -rf autom4te.cache - -# README and INSTALL are required by automake, but may be deleted by clean -# up rules. to get automake to work, simply touch these here, they will be -# regenerated from their corresponding *.in files by ./configure anyway. -touch README INSTALL - -$ACLOCAL || exit $? - -libtoolize --force || exit $? -gtkdocize || exit $? - -autoheader || exit $? - -$AUTOMAKE --add-missing || exit $? -autoconf || exit $? -cd $ORIGDIR || exit $? - -if test -z "$AUTOGEN_SUBDIR_MODE"; then - $srcdir/configure --enable-maintainer-mode $AUTOGEN_CONFIGURE_ARGS "$@" || exit $? - - echo - echo "Now type 'make' to compile $PROJECT." -fi +USE_GNOME2_MACROS=1 . gnome-autogen.sh diff --git a/config.h.in b/config.h.in index 8622f26..563e23a 100644 --- a/config.h.in +++ b/config.h.in @@ -37,6 +37,10 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#undef LT_OBJDIR + /* Name of package */ #undef PACKAGE @@ -52,6 +56,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION diff --git a/configure.ac b/configure.ac index 7d51124..511f06e 100644 --- a/configure.ac +++ b/configure.ac @@ -2,16 +2,24 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([libgfeed], [0.1.1], [azagli@inwind.it]) +AC_INIT([libgfeed], [0.2.0], [azagli@libero.it]) AC_CONFIG_SRCDIR([src/rss.c]) AC_CONFIG_HEADER([config.h]) -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE(-Wall) + +m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) + AM_MAINTAINER_MODE -AC_LIBTOOL_WIN32_DLL + +AC_CONFIG_MACRO_DIR([m4]) AC_CANONICAL_SYSTEM +LT_INIT + +AC_LIBTOOL_WIN32_DLL + # Checks for programs. AC_PROG_CC AC_PROG_CXX @@ -40,6 +48,20 @@ AC_STRUCT_TM AC_FUNC_MALLOC AC_FUNC_STRFTIME +dnl ****************************** +dnl Check for Operating System +dnl ****************************** + +platform_win32=no + +case "$host" in +*-mingw*) + platform_win32=yes + ;; +esac + +AM_CONDITIONAL(PLATFORM_WIN32, [test $platform_win32 = yes]) + AC_CONFIG_FILES([ libgfeed.pc Makefile diff --git a/docs/reference/libgfeed-undocumented.txt b/docs/reference/libgfeed-undocumented.txt deleted file mode 100644 index 69b2fdf..0000000 --- a/docs/reference/libgfeed-undocumented.txt +++ /dev/null @@ -1,168 +0,0 @@ -44% symbol docs coverage. -128 symbols documented. -0 symbols incomplete. -160 not documented. - - -Atom -AtomCategory -AtomCommon -AtomContent -AtomContentType -AtomDate -AtomEntry -AtomGenerator -AtomID -AtomLink -AtomPerson -AtomSource -AtomText -AtomTextType -RSSCHANNEL_DAY_FRIDAY -RSSCHANNEL_DAY_MONDAY -RSSCHANNEL_DAY_SATURDAY -RSSCHANNEL_DAY_SUNDAY -RSSCHANNEL_DAY_THURSDAY -RSSCHANNEL_DAY_TUESDAY -RSSCHANNEL_DAY_WEDNESDAY -RSSCHANNEL_HOUR_0 -RSSCHANNEL_HOUR_1 -RSSCHANNEL_HOUR_10 -RSSCHANNEL_HOUR_11 -RSSCHANNEL_HOUR_12 -RSSCHANNEL_HOUR_13 -RSSCHANNEL_HOUR_14 -RSSCHANNEL_HOUR_15 -RSSCHANNEL_HOUR_16 -RSSCHANNEL_HOUR_17 -RSSCHANNEL_HOUR_18 -RSSCHANNEL_HOUR_19 -RSSCHANNEL_HOUR_2 -RSSCHANNEL_HOUR_20 -RSSCHANNEL_HOUR_21 -RSSCHANNEL_HOUR_22 -RSSCHANNEL_HOUR_23 -RSSCHANNEL_HOUR_3 -RSSCHANNEL_HOUR_4 -RSSCHANNEL_HOUR_5 -RSSCHANNEL_HOUR_6 -RSSCHANNEL_HOUR_7 -RSSCHANNEL_HOUR_8 -RSSCHANNEL_HOUR_9 -Rss -RssCategory -RssChannel -RssChannelItem -RssCloud -RssEnclosure -RssGuid -RssImage -RssSource -RssTextInput -atom_category_get_xml -atom_category_new -atom_category_new_from_xml -atom_common_get_xml -atom_common_new -atom_common_set_properties_from_xml -atom_content_get_xml -atom_content_new -atom_content_new_from_xml -atom_date_get_xml -atom_date_new -atom_date_new_from_xml -atom_entry_get_xml -atom_entry_new -atom_entry_new_from_xml -atom_generator_get_xml -atom_generator_new -atom_generator_new_from_xml -atom_get_xml_doc -atom_id_get_xml -atom_id_new -atom_id_new_from_xml -atom_link_get_xml -atom_link_new -atom_link_new_from_xml -atom_new -atom_new_from_buffer -atom_new_from_file -atom_person_get_xml -atom_person_new -atom_person_new_from_xml -atom_save_file -atom_source_get_xml -atom_source_new -atom_source_new_from_xml -atom_text_get_xml -atom_text_new -atom_text_new_from_xml -rss_category_get_xml -rss_category_new -rss_category_new_from_xml -rss_channel_add_category -rss_channel_add_item -rss_channel_get_categories -rss_channel_get_xml -rss_channel_item_add_category -rss_channel_item_get_categories -rss_channel_item_get_xml -rss_channel_item_new -rss_channel_item_new_from_xml -rss_channel_new -rss_channel_new_from_xml -rss_channel_remove_item -rss_cloud_get_xml -rss_cloud_new -rss_cloud_new_from_xml -rss_enclosure_get_xml -rss_enclosure_new -rss_enclosure_new_from_xml -rss_get_xml_doc -rss_guid_get_xml -rss_guid_new -rss_guid_new_from_xml -rss_image_get_xml -rss_image_new -rss_image_new_from_xml -rss_new -rss_new_from_buffer -rss_new_from_file -rss_save_file -rss_source_get_xml -rss_source_new -rss_source_new_from_xml -rss_text_input_get_xml -rss_text_input_new -rss_text_input_new_from_xml - - -atom:Long_Description -atom:Short_Description -atomcategory:Long_Description -atomcommon:Long_Description -atomcommon:Short_Description -atomcontent:Long_Description -atomdate:Long_Description -atomdate:Short_Description -atomentry:Long_Description -atomgenerator:Long_Description -atomid:Long_Description -atomlink:Long_Description -atomperson:Long_Description -atomsource:Short_Description -atomtext:Long_Description -atomtext:Short_Description -rss:Long_Description -rss:Short_Description -rsscategory:Long_Description -rsschannel:Long_Description -rsschannel:Short_Description -rsschannelitem:Long_Description -rsschannelitem:Short_Description -rsscloud:Long_Description -rssenclosure:Long_Description -rssguid:Long_Description -rssimage:Long_Description -rsssource:Long_Description -rsstextinput:Long_Description