From: Jim Evins Date: Fri, 26 Nov 2010 03:47:16 +0000 (-0500) Subject: Cleanup of build system. X-Git-Tag: glabels-2_3_1~118 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=30419b26c459fd1a9339c1c8a0341fc43ea7308f;p=glabels Cleanup of build system. - 'make distcheck' is now successful - Removed several old artifacts --- diff --git a/.gitignore b/.gitignore index f8476387..186b8a7a 100644 --- a/.gitignore +++ b/.gitignore @@ -89,6 +89,20 @@ glabels-*.tar.gz /docs/libglabels/libglabels*.prerequisites /docs/libglabels/libglabels*.signals +/docs/libglbarcode/*.stamp +/docs/libglbarcode/xml/ +/docs/libglbarcode/html/ +/docs/libglbarcode/libglbarcode*-decl.txt +/docs/libglbarcode/libglbarcode*-decl-list.txt +/docs/libglbarcode/libglbarcode*-undeclared.txt +/docs/libglbarcode/libglbarcode*-unused.txt +/docs/libglbarcode/libglbarcode*-undocumented.txt +/docs/libglbarcode/libglbarcode*.args +/docs/libglbarcode/libglbarcode*.hierarchy +/docs/libglbarcode/libglbarcode*.interfaces +/docs/libglbarcode/libglbarcode*.prerequisites +/docs/libglbarcode/libglbarcode*.signals + # # Ignore artifacts from editors, patching, etc. # diff --git a/Makefile.am b/Makefile.am index b2dee282..da1735c2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -15,7 +15,7 @@ EXTRA_DIST = \ COPYING.README_FIRST \ COPYING \ COPYING-DOCS \ - COPYING-LIBGLABELS \ + COPYING-LIBS \ COPYING-TEMPLATES \ AUTHORS \ ChangeLog \ @@ -32,7 +32,9 @@ EXTRA_DIST = \ DISTCLEANFILES = gnome-doc-utils.make -DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper +DISTCHECK_CONFIGURE_FLAGS = \ + --disable-scrollkeeper \ + --enable-gtk-doc dist-hook: @if test -d "$(srcdir)/.git"; \ diff --git a/configure.ac b/configure.ac index 15173bb9..9bb2e3b4 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,24 @@ dnl Process this file with autoconf to produce a configure script. -AC_PREREQ(2.63) -AC_INIT([glabels],[2.3.0],[http://sourceforge.net/tracker/?func=add&group_id=46122&atid=445116]) +dnl --------------------------------------------------------------------------- +dnl - GLABELS version +dnl --------------------------------------------------------------------------- +m4_define([glabels_major_version], [2]) +m4_define([glabels_minor_version], [3]) +m4_define([glabels_micro_version], [1]) + +m4_define([glabels_version], + [glabels_major_version.glabels_minor_version.glabels_micro_version]) + +dnl --------------------------------------------------------------------------- + + +AC_PREREQ(2.64) +AC_INIT([glabels],[glabels_version], + [http://bugzilla.gnome.org/enter_bug.cgi?product=glabels], + [glabels]) + AC_CONFIG_SRCDIR(src/glabels.c) AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) @@ -31,10 +47,9 @@ GNOME_COMPILE_WARNINGS AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal) AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource) -AC_PATH_PROG(UPDATE_MIME_DATABASE, update-mime-database) -AC_PATH_PROG(UPDATE_DESKTOP_DATABASE, update-desktop-database) AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache) + dnl --------------------------------------------------------------------------- dnl - GLABELS branch dnl --------------------------------------------------------------------------- @@ -287,18 +302,6 @@ if test "x$enable_deprecations" = "xyes"; then fi -dnl --------------------------------------------------------------------------- -dnl - Disable updating of mime and desktop databases -dnl --------------------------------------------------------------------------- -AC_ARG_ENABLE(update-mimedb, AS_HELP_STRING([--disable-update-mimedb],[disable the update-mime-database after install [default=no]]),, - enable_update_mimedb=yes) -AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, test x$enable_update_mimedb = xyes) - -AC_ARG_ENABLE(update-desktopdb, AS_HELP_STRING([--disable-update-desktopdb],[disable the update-desktop-database after install [default=no]]),, - enable_update_desktopdb=yes) -AM_CONDITIONAL(ENABLE_UPDATE_DESKTOPDB, test x$enable_update_desktopdb = xyes) - - dnl --------------------------------------------------------------------------- dnl - i18n support dnl --------------------------------------------------------------------------- diff --git a/data/desktop/Makefile.am b/data/desktop/Makefile.am index 2be4ed6e..0358d5a5 100644 --- a/data/desktop/Makefile.am +++ b/data/desktop/Makefile.am @@ -12,12 +12,3 @@ EXTRA_DIST = $(DESKTOP_IN_FILES) CLEANFILES = $(DESKTOP_FILES) -install-data-hook: -if ENABLE_UPDATE_DESKTOPDB - $(UPDATE_DESKTOP_DATABASE) -endif - -uninstall-hook: -if ENABLE_UPDATE_DESKTOPDB - $(UPDATE_DESKTOP_DATABASE) -endif diff --git a/data/mime/Makefile.am b/data/mime/Makefile.am index 94f2431e..1c71a5e8 100644 --- a/data/mime/Makefile.am +++ b/data/mime/Makefile.am @@ -14,13 +14,3 @@ CLEANFILES = \ $(xml_files) -install-data-hook: -if ENABLE_UPDATE_MIMEDB - $(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime" -endif - -uninstall-hook: -if ENABLE_UPDATE_MIMEDB - $(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime" -endif - diff --git a/po/POTFILES.in b/po/POTFILES.in index 0ec9ba59..18528f1f 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,6 +1,5 @@ # List of source files containing translatable strings. -data/schemas/org.gnome.glabels-3.gschema.xml.in.in src/bc-backends.c src/bc-backends.h src/bc-builtin.c @@ -217,6 +216,8 @@ libglabels/xml-template.h [type: gettext/glade]data/ui/template-designer.ui [type: gettext/glade]data/ui/print-op-dialog-custom-widget.ui +data/schemas/org.gnome.glabels-3.gschema.xml.in.in + [type: gettext/ini]data/desktop/glabels-3.0.desktop.in [type: gettext/xml]data/mime/glabels-3.0.xml.in diff --git a/po/POTFILES.skip b/po/POTFILES.skip new file mode 100644 index 00000000..bdb5b800 --- /dev/null +++ b/po/POTFILES.skip @@ -0,0 +1,3 @@ +# List of source files containing translatable strings that should be ignored. + +data/schemas/org.gnome.glabels-3.gschema.xml.in diff --git a/src/Makefile.am b/src/Makefile.am index 057bdc30..e63f32d9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,14 +1,16 @@ SUBDIRS= \ - ../libglabels \ - ../libglbarcode \ pixmaps \ cursors bin_PROGRAMS = glabels-3 glabels-3-batch INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_builddir) \ + -I$(top_srcdir)/libglabels \ -I$(top_builddir)/libglabels \ + -I$(top_srcdir)/libglbarcode \ -I$(top_builddir)/libglbarcode \ $(GLABELS_CFLAGS) \ $(LIBEBOOK_CFLAGS) \