2009-09-09 Jim Evins <evins@snaught.com>

	* configure.in:
	* Makefile.am:
	* src/Makefile.am:
	* src/stock-pixmaps/Makefile.am:
	* qrencode-3.1.0/Makefile.am
	* data/desktop/glabels.desktop.in:
	* docs/libglabels/libglabels-decl-list.txt:
		Various build system fixes and cleanup.

git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@880 f5e0f49d-192f-0410-a22d-a8d8700d0965

diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog
index 60c7bf89c86b6233438c470ff46b40971fe030ef..e96980df115241b8efd02e62e0383c4e6b3483d6 100644 (file)
--- a/glabels2/ChangeLog
+++ b/glabels2/ChangeLog
@@ -1,3 +1,14 @@
+2009-09-09  Jim Evins  <evins@snaught.com>
+
+       * configure.in:
+       * Makefile.am:
+       * src/Makefile.am:
+       * src/stock-pixmaps/Makefile.am:
+       * qrencode-3.1.0/Makefile.am
+       * data/desktop/glabels.desktop.in:
+       * docs/libglabels/libglabels-decl-list.txt:
+               Various build system fixes and cleanup.
+
 2009-09-08  Jim Evins  <evins@snaught.com>
 
        * src/font-util.c: (gl_font_util_validate_family):

diff --git a/glabels2/Makefile.am b/glabels2/Makefile.am
index 2abd36e664e0d5370e138359685bab77d9455a7d..08ea2f23428c766edcac832dda79bf59af49f0da 100644 (file)
--- a/glabels2/Makefile.am
+++ b/glabels2/Makefile.am
@@ -21,7 +21,7 @@ EXTRA_DIST = \
        README \
        COPYING \
        COPYING-DOCS \
-       COPYING.LIBGLABELS \
+       COPYING-LIBGLABELS \
        AUTHORS \
        ChangeLog \
        INSTALL \

diff --git a/glabels2/barcode-0.98/Makefile.am b/glabels2/barcode-0.98/Makefile.am
index e7456ab9f7d2559ecb14fc3d69b6b70c558056b4..84e97c928fb00fef0b73bda7d382cbf4a01ab92f 100644 (file)
--- a/glabels2/barcode-0.98/Makefile.am
+++ b/glabels2/barcode-0.98/Makefile.am
@@ -14,7 +14,7 @@ BC_FILES =            \
        codabar.c       \
        ps.c            \
        pcl.c           \
-       barcode.h       
+       barcode.h
 
 noinst_LTLIBRARIES = libbarcode.la
 

diff --git a/glabels2/configure.in b/glabels2/configure.in
index d5be4a909f11a883cf3e1cc57dc9186aa960443e..8c2ebeb2bfec4d4219d19d6bd9dac039d480ef34 100644 (file)
--- a/glabels2/configure.in
+++ b/glabels2/configure.in
@@ -4,28 +4,32 @@ AC_PREREQ(2.52)
 
 AC_INIT(glabels, 2.3.pre0svn, http://sourceforge.net/tracker/?func=add&group_id=46122&atid=445116)
 AC_CONFIG_SRCDIR(src/glabels.c)
+
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
-GNOME_DOC_INIT
 
 AM_MAINTAINER_MODE
-AM_CONFIG_HEADER(config.h)
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+
+AC_CONFIG_HEADERS(config.h)
+
+IT_PROG_INTLTOOL([0.21])
 
-AC_PROG_INTLTOOL([0.21])
 PKG_PROG_PKG_CONFIG
 
-AM_PROG_LIBTOOL
+AC_PROG_LIBTOOL
+
+GNOME_DOC_INIT
+GTK_DOC_CHECK(1.0)
 
 AC_ISC_POSIX
 AC_PROG_CC
-AM_PROG_CC_STDC
-AC_HEADER_STDC
+AC_PROG_INSTALL
 
 GNOME_COMPILE_WARNINGS
 
-AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
-AC_PATH_PROG(GTK_BUILDER_CONVERT, gtk-builder-convert)
+AC_PATH_PROG(GLIB_GENMARSHAL,    glib-genmarshal)
+AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource)
 
-GTK_DOC_CHECK(1.0)
 
 dnl ---------------------------------------------------------------------------
 dnl - LIBGLABELS API versioning
@@ -53,10 +57,10 @@ AC_SUBST(LIBGLABELS_VERSION_INFO)
 dnl ---------------------------------------------------------------------------
 dnl - Library dependencies
 dnl ---------------------------------------------------------------------------
-GLIB_REQUIRED=2.18.0
-GTK_REQUIRED=2.14.0
+GLIB_REQUIRED=2.20.0
+GTK_REQUIRED=2.16.0
 LIBXML_REQUIRED=2.7.0
-LIBEBOOK_REQUIRED=2.24.0
+LIBEBOOK_REQUIRED=2.26.0
 
 dnl Make above strings available for packaging files (e.g. rpm spec files)
 AC_SUBST(GLIB_REQUIRED)
@@ -189,7 +193,6 @@ data/dtd/Makefile
 data/man/Makefile
 po/Makefile.in
 help/Makefile
-help/C/Makefile
 docs/Makefile
 docs/libglabels/Makefile
 glabels.spec

diff --git a/glabels2/data/desktop/glabels.desktop.in b/glabels2/data/desktop/glabels.desktop.in
index be70f928d0ef03eda29442e1d458d2745709a6ec..6f0956cf5205dbce876f8d77c40987595848a3ea 100644 (file)
--- a/glabels2/data/desktop/glabels.desktop.in
+++ b/glabels2/data/desktop/glabels.desktop.in
@@ -6,6 +6,6 @@ Exec=glabels %F
 Icon=glabels.png
 Terminal=false
 Type=Application
-Categories=GNOME;Application;Office;
+Categories=GTK;Office;
 StartupNotify=true
 MimeType=application/x-glabels;

diff --git a/glabels2/docs/libglabels/libglabels-decl-list.txt b/glabels2/docs/libglabels/libglabels-decl-list.txt
index d1dcf984d6def23c45f03dd4ae27ed690ac074db..d3e6343c1b158c1b8e031df63f6ed35de95a8a43 100644 (file)
--- a/glabels2/docs/libglabels/libglabels-decl-list.txt
+++ b/glabels2/docs/libglabels/libglabels-decl-list.txt
@@ -1,3 +1,26 @@
+<SECTION>
+<FILE>xml-paper</FILE>
+lgl_xml_paper_read_papers_from_file
+lgl_xml_paper_parse_papers_doc
+lgl_xml_paper_parse_paper_node
+</SECTION>
+
+<SECTION>
+<FILE>enums</FILE>
+lglUnitsType
+</SECTION>
+
+<SECTION>
+<FILE>xml-category</FILE>
+lgl_xml_category_read_categories_from_file
+lgl_xml_category_parse_categories_doc
+lgl_xml_category_parse_category_node
+</SECTION>
+
+<SECTION>
+<FILE>libglabels</FILE>
+</SECTION>
+
 <SECTION>
 <FILE>db</FILE>
 lglDbRegStatus
@@ -36,46 +59,6 @@ lgl_db_print_known_templates
 lgl_db_print_aliases
 </SECTION>
 
-<SECTION>
-<FILE>xml</FILE>
-LGL_XML_NAME_SPACE
-lgl_xml_get_prop_string
-lgl_xml_get_prop_i18n_string
-lgl_xml_get_prop_double
-lgl_xml_get_prop_boolean
-lgl_xml_get_prop_int
-lgl_xml_get_prop_uint
-lgl_xml_get_prop_length
-lgl_xml_set_prop_string
-lgl_xml_set_prop_double
-lgl_xml_set_prop_boolean
-lgl_xml_set_prop_int
-lgl_xml_set_prop_uint_hex
-lgl_xml_set_prop_length
-lgl_xml_is_node
-lgl_xml_get_node_content
-lgl_xml_set_default_units
-</SECTION>
-
-<SECTION>
-<FILE>xml-template</FILE>
-lgl_xml_template_read_templates_from_file
-lgl_xml_template_parse_templates_doc
-lgl_xml_template_parse_template_node
-lgl_xml_template_write_templates_to_file
-lgl_xml_template_write_template_to_file
-lgl_xml_template_create_template_node
-</SECTION>
-
-<SECTION>
-<FILE>libglabels</FILE>
-</SECTION>
-
-<SECTION>
-<FILE>enums</FILE>
-lglUnitsType
-</SECTION>
-
 <SECTION>
 <FILE>str</FILE>
 lgl_str_utf8_casecmp
@@ -135,25 +118,42 @@ lgl_template_markup_free
 </SECTION>
 
 <SECTION>
-<FILE>xml-paper</FILE>
-lgl_xml_paper_read_papers_from_file
-lgl_xml_paper_parse_papers_doc
-lgl_xml_paper_parse_paper_node
+<FILE>category</FILE>
+lglCategory
+lgl_category_new
+lgl_category_dup
+lgl_category_free
 </SECTION>
 
 <SECTION>
-<FILE>xml-category</FILE>
-lgl_xml_category_read_categories_from_file
-lgl_xml_category_parse_categories_doc
-lgl_xml_category_parse_category_node
+<FILE>xml</FILE>
+LGL_XML_NAME_SPACE
+lgl_xml_get_prop_string
+lgl_xml_get_prop_i18n_string
+lgl_xml_get_prop_double
+lgl_xml_get_prop_boolean
+lgl_xml_get_prop_int
+lgl_xml_get_prop_uint
+lgl_xml_get_prop_length
+lgl_xml_set_prop_string
+lgl_xml_set_prop_double
+lgl_xml_set_prop_boolean
+lgl_xml_set_prop_int
+lgl_xml_set_prop_uint_hex
+lgl_xml_set_prop_length
+lgl_xml_is_node
+lgl_xml_get_node_content
+lgl_xml_set_default_units
 </SECTION>
 
 <SECTION>
-<FILE>category</FILE>
-lglCategory
-lgl_category_new
-lgl_category_dup
-lgl_category_free
+<FILE>xml-template</FILE>
+lgl_xml_template_read_templates_from_file
+lgl_xml_template_parse_templates_doc
+lgl_xml_template_parse_template_node
+lgl_xml_template_write_templates_to_file
+lgl_xml_template_write_template_to_file
+lgl_xml_template_create_template_node
 </SECTION>
 
 <SECTION>

diff --git a/glabels2/help/C/Makefile.am b/glabels2/help/C/Makefile.am
deleted file mode 100644 (file)
index 340802c..0000000
--- a/glabels2/help/C/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-figdir = figures
-docname = glabels
-lang = C
-omffile = glabels-C.omf
-entities = legal.xml
-
-include $(top_srcdir)/xmldocs.make
-dist-hook: app-dist-hook
-

diff --git a/glabels2/help/Makefile.am b/glabels2/help/Makefile.am
index 0f272ef946464d8ab5bb54da1a23fe4807645968..708fb593147a2daab92deb028b22b360f13a63f4 100644 (file)
--- a/glabels2/help/Makefile.am
+++ b/glabels2/help/Makefile.am
@@ -12,7 +12,7 @@ DOC_FIGURES = figures/glabels-template-cd.png         \
              figures/merge-ex1-1.png                   \
              figures/merge-ex1-2.png                   \
              figures/merge-ex1-3.png                   \
-             figures/merge-ex1-4.png                   \       
+             figures/merge-ex1-4.png                   \
              figures/merge-ex2-1.png                   \
              figures/merge-ex2-2.png                   \
              figures/merge-ex2-3.png                   \

diff --git a/glabels2/qrencode-3.1.0/Makefile.am b/glabels2/qrencode-3.1.0/Makefile.am
index 52dfc98ee674da2deafeada2372b529b58777642..ab517d0d9ea0d2cdf075de60caa70ea7be9fb017 100644 (file)
--- a/glabels2/qrencode-3.1.0/Makefile.am
+++ b/glabels2/qrencode-3.1.0/Makefile.am
@@ -3,6 +3,7 @@ INCLUDES = \
 
 QR_ENCODE_FILES =              \
        qrencode.c              \
+       qrencode.h              \
        qrencode_inner.h        \
        qrinput.c               \
        qrinput.h               \
@@ -26,7 +27,7 @@ EXTRA_DIST =                  \
        acinclude.m4            \
        autogen.sh              \
        configure.ac.dist       \
-       Changelog               \
+       ChangeLog               \
        COPYING                 \
        Doxyfile                \
        libqrencode.pc.in       \

diff --git a/glabels2/src/Makefile.am b/glabels2/src/Makefile.am
index a7ca062f99d175bd5adcec678f4a6d0b85bbcbc9..4a78708a1e74388329805f04163f2cb590f087fc 100644 (file)
--- a/glabels2/src/Makefile.am
+++ b/glabels2/src/Makefile.am
@@ -292,10 +292,10 @@ glabels_batch_SOURCES =           \
        $(BUILT_SOURCES)
 
 marshal.h: marshal.list $(GLIB_GENMARSHAL)
-       $(GLIB_GENMARSHAL) $< --header --prefix=gl_marshal > $@
+       $(AM_V_GEN) $(GLIB_GENMARSHAL) $< --header --prefix=gl_marshal > $@
 
 marshal.c: marshal.list $(GLIB_GENMARSHAL)
-       echo "#include \"marshal.h\"" > $@ && \
+       $(AM_V_GEN) echo "#include \"marshal.h\"" > $@ && \
        $(GLIB_GENMARSHAL) $< --body --prefix=gl_marshal >> $@
 
 EXTRA_DIST = \

diff --git a/glabels2/src/stock-pixmaps/Makefile.am b/glabels2/src/stock-pixmaps/Makefile.am
index 5e34a9556914e2a0f7fb88b2eedbf39c60b9ebe7..006253781aef31b17929e9e812d6ab076003b7e0 100644 (file)
--- a/glabels2/src/stock-pixmaps/Makefile.am
+++ b/glabels2/src/stock-pixmaps/Makefile.am
@@ -88,7 +88,7 @@ noinst_DATA = stockpixbufs.h
 CLEANFILES = $(noinst_DATA)
 
 stockpixbufs.h: $(IMAGES)
-       gdk-pixbuf-csource                                                \
+       $(AM_V_GEN) $(GDK_PIXBUF_CSOURCE)                                                 \
           --raw --build-list $(VARIABLES1) > $(srcdir)/stockpixbufs.h || \
            ( rm -f $(srcdir)/stockpixbufs.h && false )