From c69edbd06103ad457c2fa87369094f17d7fa9030 Mon Sep 17 00:00:00 2001 From: Jim Evins Date: Tue, 23 Feb 2010 19:49:42 -0500 Subject: [PATCH] Make libglabels parallel installable with other versions Made libglabels install as libglabels-3.0 to support parallel installation with earlier versions. Performed some related cleanup associated with this move, including installing libglabels.h into include/libglabels-3.0 and installing all other include files in include/libglabels-3.0/libglabels/. More work is still need to support parallel installation of the glabels application. --- .gitignore | 5 +- INSTALL | 236 ------------------ autogen.sh | 4 +- configure.in => configure.ac | 86 +++---- data/desktop/Makefile.am | 10 + data/mime/Makefile.am | 14 -- libglabels/Makefile.am | 26 +- ...{libglabels.pc.in => libglabels-3.0.pc.in} | 6 +- src/Makefile.am | 13 +- src/combo-util.c | 2 +- src/file.c | 2 +- src/font-history-model.c | 2 +- src/font-util.c | 2 +- src/glabels-batch.c | 2 +- src/glabels.c | 2 +- src/media-select.c | 2 +- src/merge-evolution.c | 2 +- src/merge.c | 2 +- src/mini-label-preview.c | 2 +- src/mini-preview-pixbuf-cache.c | 2 +- src/mini-preview.c | 2 +- src/prefs-model.c | 2 +- src/prefs.c | 2 +- src/print-op.c | 2 +- src/print.c | 2 +- src/rotate-label-button.c | 2 +- src/template-designer.c | 2 +- src/template-history-model.c | 2 +- src/xml-label-04.c | 2 +- src/xml-label.c | 2 +- templates/Makefile.am | 4 +- 31 files changed, 102 insertions(+), 344 deletions(-) delete mode 100644 INSTALL rename configure.in => configure.ac (79%) rename libglabels/{libglabels.pc.in => libglabels-3.0.pc.in} (66%) diff --git a/.gitignore b/.gitignore index bbfdd154..76b59138 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,7 @@ glabels-*.tar.gz # /aclocal.m4 /autom4te.cache +/autoscan.log /config.guess /config.h /config.h.in @@ -23,11 +24,13 @@ glabels-*.tar.gz /config.status /config.sub /configure +/configure.scan /depcomp /glabels.spec /gnome-doc-utils.make /gtk-doc.make /install-sh +/INSTALL /intltool-extract.in /intltool-merge.in /intltool-update.in @@ -39,7 +42,7 @@ glabels-*.tar.gz /stamp-h1 /xmldocs.make -/libglabels/libglabels.pc +/libglabels/libglabels*.pc /src/marshal.[ch] /src/stock-pixmaps/stockpixbufs.h diff --git a/INSTALL b/INSTALL deleted file mode 100644 index 23e5f25d..00000000 --- a/INSTALL +++ /dev/null @@ -1,236 +0,0 @@ -Installation Instructions -************************* - -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free -Software Foundation, Inc. - -This file is free documentation; the Free Software Foundation gives -unlimited permission to copy, distribute and modify it. - -Basic Installation -================== - -These are generic installation instructions. - - The `configure' shell script attempts to guess correct values for -various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). - - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. (Caching is -disabled by default to prevent problems with accidental use of stale -cache files.) - - If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you -may remove or edit it. - - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You only need -`configure.ac' if you want to change it or regenerate `configure' using -a newer version of `autoconf'. - -The simplest way to compile this package is: - - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. If you're - using `csh' on an old version of System V, you might need to type - `sh ./configure' instead to prevent `csh' from trying to execute - `configure' itself. - - Running `configure' takes awhile. While running, it prints some - messages telling which features it is checking for. - - 2. Type `make' to compile the package. - - 3. Optionally, type `make check' to run any self-tests that come with - the package. - - 4. Type `make install' to install the programs and any data files and - documentation. - - 5. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly - for the package's developers. If you use it, you may have to get - all sorts of other programs in order to regenerate files that came - with the distribution. - -Compilers and Options -===================== - -Some systems require unusual options for compilation or linking that the -`configure' script does not know about. Run `./configure --help' for -details on some of the pertinent environment variables. - - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: - - ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix - - *Note Defining Variables::, for more details. - -Compiling For Multiple Architectures -==================================== - -You can compile the package for more than one kind of computer at the -same time, by placing the object files for each architecture in their -own directory. To do this, you must use a version of `make' that -supports the `VPATH' variable, such as GNU `make'. `cd' to the -directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. - - If you have to use a `make' that does not support the `VPATH' -variable, you have to compile the package for one architecture at a -time in the source code directory. After you have installed the -package for one architecture, use `make distclean' before reconfiguring -for another architecture. - -Installation Names -================== - -By default, `make install' installs the package's commands under -`/usr/local/bin', include files under `/usr/local/include', etc. You -can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX'. - - You can specify separate installation prefixes for -architecture-specific files and architecture-independent files. If you -pass the option `--exec-prefix=PREFIX' to `configure', the package uses -PREFIX as the prefix for installing programs and libraries. -Documentation and other data files still use the regular prefix. - - In addition, if you use an unusual directory layout you can give -options like `--bindir=DIR' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. - - If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. - -Optional Features -================= - -Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the -package recognizes. - - For packages that use the X Window System, `configure' can usually -find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. - -Specifying the System Type -========================== - -There may be some features `configure' cannot figure out automatically, -but needs to determine by the type of machine the package will run on. -Usually, assuming the package is built to be run on the _same_ -architectures, `configure' can figure that out, but if it prints a -message saying it cannot guess the machine type, give it the -`--build=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name which has the form: - - CPU-COMPANY-SYSTEM - -where SYSTEM can have one of these forms: - - OS KERNEL-OS - - See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't -need to know the machine type. - - If you are _building_ compiler tools for cross-compiling, you should -use the option `--target=TYPE' to select the type of system they will -produce code for. - - If you want to _use_ a cross compiler, that generates code for a -platform different from the build platform, you should specify the -"host" platform (i.e., that on which the generated programs will -eventually be run) with `--host=TYPE'. - -Sharing Defaults -================ - -If you want to set default values for `configure' scripts to share, you -can create a site shell script called `config.site' that gives default -values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. - -Defining Variables -================== - -Variables not defined in a site shell script can be set in the -environment passed to `configure'. However, some packages may run -configure again during the build, and the customized values of these -variables may be lost. In order to avoid this problem, you should set -them in the `configure' command line, using `VAR=value'. For example: - - ./configure CC=/usr/local2/bin/gcc - -causes the specified `gcc' to be used as the C compiler (unless it is -overridden in the site shell script). Here is a another example: - - /bin/bash ./configure CONFIG_SHELL=/bin/bash - -Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent -configuration-related scripts to be executed by `/bin/bash'. - -`configure' Invocation -====================== - -`configure' recognizes the following options to control how it operates. - -`--help' -`-h' - Print a summary of the options to `configure', and exit. - -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' - script, and exit. - -`--cache-file=FILE' - Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to - disable caching. - -`--config-cache' -`-C' - Alias for `--cache-file=config.cache'. - -`--quiet' -`--silent' -`-q' - Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error - messages will still be shown). - -`--srcdir=DIR' - Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. - -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. - diff --git a/autogen.sh b/autogen.sh index 66bb0fd8..307c3311 100755 --- a/autogen.sh +++ b/autogen.sh @@ -4,11 +4,9 @@ srcdir=`dirname $0` test -z "$srcdir" && srcdir=. -REQUIRED_AUTOMAKE_VERSION=1.8 - PKG_NAME="glabels" -(test -f $srcdir/configure.in \ +(test -f $srcdir/configure.ac \ && test -f $srcdir/README \ && test -d $srcdir/src) || { echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" diff --git a/configure.in b/configure.ac similarity index 79% rename from configure.in rename to configure.ac index 663d849d..c461e8ad 100644 --- a/configure.in +++ b/configure.ac @@ -1,8 +1,8 @@ dnl Process this file with autoconf to produce a configure script. -AC_PREREQ(2.52) +AC_PREREQ(2.63) -AC_INIT(glabels, 2.3.pre0svn, http://sourceforge.net/tracker/?func=add&group_id=46122&atid=445116) +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) @@ -16,20 +16,27 @@ IT_PROG_INTLTOOL([0.21]) PKG_PROG_PKG_CONFIG -AC_PROG_LIBTOOL +LT_INIT GNOME_DOC_INIT GTK_DOC_CHECK(1.0) -AC_ISC_POSIX +AC_SEARCH_LIBS([strerror],[cposix]) AC_PROG_CC AC_PROG_INSTALL GNOME_COMPILE_WARNINGS -AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal) -AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource) +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) +dnl --------------------------------------------------------------------------- +dnl - LIBGLABELS branch +dnl --------------------------------------------------------------------------- +LIBGLABELS=libglabels-3.0 +AC_SUBST(LIBGLABELS) dnl --------------------------------------------------------------------------- dnl - LIBGLABELS API versioning @@ -46,13 +53,12 @@ dnl increment current, and set revision to 0. dnl 5. If any interfaces have been added since the last public release, then increment age. dnl 6. If any interfaces have been removed since the last public release, then set age dnl to 0. -LIBGLABELS_C=5 -LIBGLABELS_R=1 +LIBGLABELS_C=7 +LIBGLABELS_R=0 LIBGLABELS_A=0 -LIBGLABELS_VERSION_INFO=${LIBGLABELS_C}:${LIBGLABELS_R}:${LIBGLABELS_A} -AC_SUBST(LIBGLABELS_VERSION_INFO) - +LIBGLABELS_API_VERSION=${LIBGLABELS_C}:${LIBGLABELS_R}:${LIBGLABELS_A} +AC_SUBST(LIBGLABELS_API_VERSION) dnl --------------------------------------------------------------------------- dnl - Library dependencies @@ -83,12 +89,12 @@ AC_SUBST(LIBIEC16022_REQUIRED) dnl --------------------------------------------------------------------------- dnl - GLABELS prerequisites dnl --------------------------------------------------------------------------- -PKG_CHECK_MODULES(GLABELS, \ -glib-2.0 >= $GLIB_REQUIRED \ -gtk+-2.0 >= $GTK_REQUIRED \ -gconf-2.0 >= $GCONF_REQUIRED \ -libxml-2.0 >= $LIBXML_REQUIRED \ -) +PKG_CHECK_MODULES(GLABELS, [\ + glib-2.0 >= $GLIB_REQUIRED \ + gtk+-2.0 >= $GTK_REQUIRED \ + gconf-2.0 >= $GCONF_REQUIRED \ + libxml-2.0 >= $LIBXML_REQUIRED \ +]) AC_SUBST(GLABELS_CFLAGS) AC_SUBST(GLABELS_LIBS) @@ -97,11 +103,11 @@ AC_SUBST(GLABELS_LIBS) dnl --------------------------------------------------------------------------- dnl - LIBGLABELS more modest prerequisites dnl --------------------------------------------------------------------------- -PKG_CHECK_MODULES(LIBGLABELS, \ -glib-2.0 >= $GLIB_REQUIRED \ -gconf-2.0 >= $GCONF_REQUIRED \ -libxml-2.0 >= $LIBXML_REQUIRED \ -) +PKG_CHECK_MODULES(LIBGLABELS, [\ + glib-2.0 >= $GLIB_REQUIRED \ + gconf-2.0 >= $GCONF_REQUIRED \ + libxml-2.0 >= $LIBXML_REQUIRED \ +]) AC_SUBST(LIBGLABELS_CFLAGS) AC_SUBST(LIBGLABELS_LIBS) @@ -111,8 +117,7 @@ dnl --------------------------------------------------------------------------- dnl - Check for optional evolution data server dnl --------------------------------------------------------------------------- AC_ARG_WITH(libebook, - [AC_HELP_STRING([--without-libebook], - [build without Evolution Data Server support])]) + [AS_HELP_STRING([--without-libebook],[build without Evolution Data Server support])]) have_libebook=no if test "x$with_libebook" != xno; then PKG_CHECK_MODULES(LIBEBOOK, libebook-1.2 >= $LIBEBOOK_REQUIRED, @@ -130,8 +135,7 @@ dnl --------------------------------------------------------------------------- dnl - Check for optional GNU Barcode backend dnl --------------------------------------------------------------------------- AC_ARG_WITH(libbarcode, - [AC_HELP_STRING([--without-libbarcode], - [build without GNU Barcode support])]) + [AS_HELP_STRING([--without-libbarcode],[build without GNU Barcode support])]) have_libbarcode=no if test "x$with_libbarcode" != xno; then AC_CHECK_LIB(barcode, Barcode_Create, @@ -153,8 +157,7 @@ dnl --------------------------------------------------------------------------- dnl - Check for optional QRencode Barcode backend dnl --------------------------------------------------------------------------- AC_ARG_WITH(libqrencode, - [AC_HELP_STRING([--without-libqrencode], - [build without QR code support])]) + [AS_HELP_STRING([--without-libqrencode],[build without QR code support])]) have_libqrencode=no if test "x$with_libqrencode" != xno; then PKG_CHECK_MODULES(LIBQRENCODE, libqrencode >= $LIBQRENCODE_REQUIRED, @@ -174,8 +177,7 @@ dnl --------------------------------------------------------------------------- dnl - Check for IEC16022 Barcode backend dnl --------------------------------------------------------------------------- AC_ARG_WITH(libiec16022, - [AC_HELP_STRING([--without-libiec16022], - [build without IEC 16022 support])]) + [AS_HELP_STRING([--without-libiec16022],[build without IEC 16022 support])]) have_libiec16022=no if test "x$with_libiec16022" != xno; then PKG_CHECK_MODULES(LIBIEC16022, libiec16022 >= $LIBIEC16022_REQUIRED, @@ -195,8 +197,7 @@ dnl --------------------------------------------------------------------------- dnl - Enable deprecation testing dnl --------------------------------------------------------------------------- AC_ARG_ENABLE(deprecations, - [AC_HELP_STRING([--enable-deprecations], - [warn about deprecated usages [default=no]])],, + [AS_HELP_STRING([--enable-deprecations],[warn about deprecated usages [default=no]])],, [enable_deprecations=no]) if test "x$enable_deprecations" = "xyes"; then @@ -211,27 +212,19 @@ fi dnl --------------------------------------------------------------------------- -dnl - Is freedesktop mime dbase available? +dnl - Disable updating of mime and desktop databases dnl --------------------------------------------------------------------------- -AC_PATH_PROG(UPDATE_MIME_DATABASE, update-mime-database, no) -AM_CONDITIONAL(HAVE_NEW_MIME, test x$UPDATE_MIME_DATABASE != xno) - -AC_PATH_PROG(UPDATE_DESKTOP_DATABASE, update-desktop-database, no) -AM_CONDITIONAL(HAVE_NEWER_MIME, test x$UPDATE_DESKTOP_DATABASE != xno) - -AC_ARG_ENABLE(update-mimedb, AC_HELP_STRING([--disable-update-mimedb], - [disable the update-mime-database after install [default=no]]),, +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, AC_HELP_STRING([--disable-update-desktopdb], - [disable the update-desktop-database after install [default=no]]),, +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 - Supported languages +dnl - i18n support dnl --------------------------------------------------------------------------- GETTEXT_PACKAGE=glabels AC_SUBST(GETTEXT_PACKAGE) @@ -243,10 +236,10 @@ AM_GLIB_GNU_GETTEXT dnl --------------------------------------------------------------------------- dnl - Makefiles, etc. dnl --------------------------------------------------------------------------- -AC_OUTPUT([ +AC_CONFIG_FILES([ Makefile libglabels/Makefile -libglabels/libglabels.pc +libglabels/${LIBGLABELS}.pc src/Makefile src/pixmaps/Makefile src/stock-pixmaps/Makefile @@ -263,6 +256,7 @@ docs/Makefile docs/libglabels/Makefile glabels.spec ]) +AC_OUTPUT dnl --------------------------------------------------------------------------- diff --git a/data/desktop/Makefile.am b/data/desktop/Makefile.am index ce2a21fc..0ade4eef 100644 --- a/data/desktop/Makefile.am +++ b/data/desktop/Makefile.am @@ -11,3 +11,13 @@ desktop_DATA = $(DESKTOP_FILES) 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 027c1022..282e1842 100644 --- a/data/mime/Makefile.am +++ b/data/mime/Makefile.am @@ -29,25 +29,11 @@ CLEANFILES = $(keys_files) $(xml_files) install-data-hook: if ENABLE_UPDATE_MIMEDB -if HAVE_NEW_MIME $(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime" endif -endif -if ENABLE_UPDATE_DESKTOPDB -if HAVE_NEWER_MIME - $(UPDATE_DESKTOP_DATABASE) -endif -endif uninstall-hook: if ENABLE_UPDATE_MIMEDB -if HAVE_NEW_MIME $(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime" endif -endif -if ENABLE_UPDATE_DESKTOPDB -if HAVE_NEWER_MIME - $(UPDATE_DESKTOP_DATABASE) -endif -endif diff --git a/libglabels/Makefile.am b/libglabels/Makefile.am index 51812ddb..30ae37b4 100644 --- a/libglabels/Makefile.am +++ b/libglabels/Makefile.am @@ -1,20 +1,18 @@ -templatesdir = $(datadir)/glabels/templates +templatesdir = $(datadir)/$(LIBGLABELS)/templates INCLUDES = \ $(LIBGLABELS_CFLAGS) \ -DLIBGLABELS_TEMPLATE_DIR=\""$(templatesdir)"\" \ $(DISABLE_DEPRECATED_CFLAGS) -libglabels_la_LDFLAGS=\ - -version-info $(LIBGLABELS_VERSION_INFO) \ +libglabels_3_0_la_LDFLAGS=\ + -version-info $(LIBGLABELS_API_VERSION) \ $(LIBGLABELS_LIBS) \ -no-undefined -lib_LTLIBRARIES = libglabels.la +lib_LTLIBRARIES = libglabels-3.0.la -libglabelsincludedir=$(includedir)/libglabels - -libglabels_la_SOURCES = \ +libglabels_3_0_la_SOURCES = \ libglabels-private.h \ db.h \ db.c \ @@ -41,8 +39,14 @@ libglabels_la_SOURCES = \ str.h \ str.c -libglabelsinclude_HEADERS = \ - libglabels.h \ +libglabels_3_0includedir=$(includedir)/$(LIBGLABELS) + +libglabels_3_0include_HEADERS = \ + libglabels.h + +libglabels_3_0subincludedir=$(includedir)/$(LIBGLABELS)/libglabels + +libglabels_3_0subinclude_HEADERS = \ db.h \ units.h \ paper.h \ @@ -55,8 +59,8 @@ libglabelsinclude_HEADERS = \ str.h EXTRA_DIST = \ - libglabels.pc.in + $(LIBGLABELS).pc.in pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libglabels.pc +pkgconfig_DATA = $(LIBGLABELS).pc diff --git a/libglabels/libglabels.pc.in b/libglabels/libglabels-3.0.pc.in similarity index 66% rename from libglabels/libglabels.pc.in rename to libglabels/libglabels-3.0.pc.in index c16e8f47..8c5637a4 100644 --- a/libglabels/libglabels.pc.in +++ b/libglabels/libglabels-3.0.pc.in @@ -3,10 +3,10 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -Name: libglabels +Name: LIBGLABELS Description: GLabels Template Library Requires: glib-2.0 libxml-2.0 Version: @VERSION@ -Libs: -L${libdir} -lglabels -Cflags: -I${includedir} +Libs: -L${libdir} -lglabels-3.0 +Cflags: -I${includedir}/libglabels-3.0 diff --git a/src/Makefile.am b/src/Makefile.am index 401ae623..2ba4c837 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,8 +4,7 @@ SUBDIRS= pixmaps stock-pixmaps bin_PROGRAMS = glabels glabels-batch INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_builddir) \ + -I$(top_builddir)/libglabels \ $(GLABELS_CFLAGS) \ $(LIBEBOOK_CFLAGS) \ $(LIBBARCODE_CFLAGS) \ @@ -13,8 +12,8 @@ INCLUDES = \ $(LIBIEC16022_CFLAGS) \ $(DISABLE_DEPRECATED_CFLAGS) \ -DGLABELS_LOCALEDIR=\""$(datadir)/locale"\" \ - -DGLABELS_BUILDER_DIR=\""$(datadir)/glabels/builder/"\" \ -DGLABELS_ICON_DIR=\""$(datadir)/pixmaps/"\" \ + -DGLABELS_BUILDER_DIR=\""$(datadir)/glabels/builder/"\" \ -DGLABELS_PIXMAP_DIR=\""$(datadir)/pixmaps/glabels/"\" \ -DG_LOG_DOMAIN=\""glabels\"" @@ -22,7 +21,7 @@ glabels_LDFLAGS = -export-dynamic glabels_LDADD = \ $(GLABELS_LIBS) \ - ../libglabels/libglabels.la \ + ../libglabels/$(LIBGLABELS).la \ $(LIBEBOOK_LIBS) \ $(LIBBARCODE_LIBS) \ $(LIBQRENCODE_LIBS) \ @@ -32,7 +31,7 @@ glabels_batch_LDFLAGS = -export-dynamic glabels_batch_LDADD = \ $(GLABELS_LIBS) \ - ../libglabels/libglabels.la \ + ../libglabels/$(LIBGLABELS).la \ $(LIBEBOOK_LIBS) \ $(LIBBARCODE_LIBS) \ $(LIBQRENCODE_LIBS) \ @@ -321,8 +320,8 @@ EXTRA_DIST = \ CLEANFILES = $(BUILT_SOURCES) -$(bin_PROGRAMS): ../libglabels/libglabels.la +$(bin_PROGRAMS): ../libglabels/$(LIBGLABELS).la -../libglabels/libglabels.la: +../libglabels/$(LIBGLABELS).la: cd ../libglabels; $(MAKE) diff --git a/src/combo-util.c b/src/combo-util.c index b3f5ed5d..b0e3ffa5 100644 --- a/src/combo-util.c +++ b/src/combo-util.c @@ -24,7 +24,7 @@ #include -#include +#include /****************************************************************************/ diff --git a/src/file.c b/src/file.c index 5a1b78c4..ca04e5fd 100644 --- a/src/file.c +++ b/src/file.c @@ -31,7 +31,7 @@ #include "file-util.h" #include "window.h" #include "new-label-dialog.h" -#include "libglabels/libglabels.h" +#include #include "debug.h" diff --git a/src/font-history-model.c b/src/font-history-model.c index 0e18b9cb..0b25f05a 100644 --- a/src/font-history-model.c +++ b/src/font-history-model.c @@ -24,7 +24,7 @@ #include -#include +#include #include "font-util.h" #include "marshal.h" diff --git a/src/font-util.c b/src/font-util.c index 5c2391ba..a9c67e96 100644 --- a/src/font-util.c +++ b/src/font-util.c @@ -26,7 +26,7 @@ #include #include -#include +#include /****************************************************************************/ diff --git a/src/glabels-batch.c b/src/glabels-batch.c index bd95d515..4c6b1691 100644 --- a/src/glabels-batch.c +++ b/src/glabels-batch.c @@ -24,7 +24,7 @@ #include -#include +#include #include "merge-init.h" #include "template-history.h" #include "xml-label.h" diff --git a/src/glabels.c b/src/glabels.c index d3a107d6..d2c7d2bd 100644 --- a/src/glabels.c +++ b/src/glabels.c @@ -22,7 +22,7 @@ #include -#include +#include #include "warning-handler.h" #include "critical-error-handler.h" #include "stock.h" diff --git a/src/media-select.c b/src/media-select.c index 8033829a..bea0b006 100644 --- a/src/media-select.c +++ b/src/media-select.c @@ -26,7 +26,7 @@ #include #include -#include +#include #include "mini-preview-pixbuf-cache.h" #include "prefs.h" #include "message-bar.h" diff --git a/src/merge-evolution.c b/src/merge-evolution.c index 488dd3d7..a5ecd47d 100644 --- a/src/merge-evolution.c +++ b/src/merge-evolution.c @@ -34,7 +34,7 @@ #include #include -#include +#include #include "debug.h" diff --git a/src/merge.c b/src/merge.c index f7db354f..d83c4e44 100644 --- a/src/merge.c +++ b/src/merge.c @@ -26,7 +26,7 @@ #include #include -#include +#include #include "debug.h" diff --git a/src/mini-label-preview.c b/src/mini-label-preview.c index ec78aad9..d1f06c7e 100644 --- a/src/mini-label-preview.c +++ b/src/mini-label-preview.c @@ -22,7 +22,7 @@ #include "mini-label-preview.h" -#include +#include #include "cairo-label-path.h" #include "color.h" #include "marshal.h" diff --git a/src/mini-preview-pixbuf-cache.c b/src/mini-preview-pixbuf-cache.c index 82077ad5..347115db 100644 --- a/src/mini-preview-pixbuf-cache.c +++ b/src/mini-preview-pixbuf-cache.c @@ -24,7 +24,7 @@ #include -#include "libglabels/libglabels.h" +#include #include "mini-preview-pixbuf.h" #include "debug.h" diff --git a/src/mini-preview.c b/src/mini-preview.c index 6ba6ddef..2b7984e2 100644 --- a/src/mini-preview.c +++ b/src/mini-preview.c @@ -24,7 +24,7 @@ #include -#include "libglabels/db.h" +#include #include "cairo-label-path.h" #include "marshal.h" #include "color.h" diff --git a/src/prefs-model.c b/src/prefs-model.c index ed83c8b9..ca4537ff 100644 --- a/src/prefs-model.c +++ b/src/prefs-model.c @@ -27,7 +27,7 @@ #include #include -#include +#include #include "marshal.h" #include "str-util.h" #include "color.h" diff --git a/src/prefs.c b/src/prefs.c index f83e0bac..dc58f7da 100644 --- a/src/prefs.c +++ b/src/prefs.c @@ -23,7 +23,7 @@ #include "prefs.h" #include -#include +#include #include "debug.h" diff --git a/src/print-op.c b/src/print-op.c index 8880dbee..71113ade 100644 --- a/src/print-op.c +++ b/src/print-op.c @@ -28,7 +28,7 @@ #include #include -#include +#include #include "print.h" #include "label.h" diff --git a/src/print.c b/src/print.c index 9b9da8ff..be58b10e 100644 --- a/src/print.c +++ b/src/print.c @@ -27,7 +27,7 @@ #include #include -#include +#include #include "label.h" #include "cairo-label-path.h" diff --git a/src/rotate-label-button.c b/src/rotate-label-button.c index 65a880f1..d477edf5 100644 --- a/src/rotate-label-button.c +++ b/src/rotate-label-button.c @@ -26,7 +26,7 @@ #include #include -#include +#include #include "mini-label-preview.h" #include "hig.h" #include "marshal.h" diff --git a/src/template-designer.c b/src/template-designer.c index 675ae982..90c491cd 100644 --- a/src/template-designer.c +++ b/src/template-designer.c @@ -27,7 +27,7 @@ #include #include -#include +#include #include "prefs.h" #include "mini-preview.h" #include "mini-preview-pixbuf-cache.h" diff --git a/src/template-history-model.c b/src/template-history-model.c index 7d70b76f..e00579ec 100644 --- a/src/template-history-model.c +++ b/src/template-history-model.c @@ -24,7 +24,7 @@ #include -#include +#include #include "marshal.h" diff --git a/src/xml-label-04.c b/src/xml-label-04.c index 0e2b8836..7c7e2976 100644 --- a/src/xml-label-04.c +++ b/src/xml-label-04.c @@ -24,7 +24,7 @@ #include -#include +#include #include "label-text.h" #include "label-box.h" #include "label-line.h" diff --git a/src/xml-label.c b/src/xml-label.c index 2fcf165d..001e33ae 100644 --- a/src/xml-label.c +++ b/src/xml-label.c @@ -29,7 +29,7 @@ #include #include -#include +#include #include "label.h" #include "label-object.h" #include "label-text.h" diff --git a/templates/Makefile.am b/templates/Makefile.am index df138d9a..abc597be 100644 --- a/templates/Makefile.am +++ b/templates/Makefile.am @@ -1,11 +1,11 @@ ## Process this file with automake to produce Makefile.in -dtddir = $(datadir)/glabels/dtd +dtddir = $(datadir)/$(LIBGLABELS)/dtd dtd_DATA = \ glabels-2.3.dtd -templatesdir = $(datadir)/glabels/templates +templatesdir = $(datadir)/$(LIBGLABELS)/templates templates_DATA = \ paper-sizes.xml \ -- 2.39.5