From e7ba84a1f7cb2cf6d8ee8bb74d8b994ecccb4886 Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Sun, 27 Jul 2008 16:14:10 +0200 Subject: [PATCH] Maintainer's effort! Reworked autofoo scripts in a much more nice fashion, bump intltool req to 0.4.0 and added a script that should generate ChangeLog from the git history on the fly. --- INSTALL | 238 ++++++++++++++++++++++++++++++++++++++++++++++- Makefile.am | 39 +++----- autogen.sh | 181 +++++------------------------------ configure.ac | 92 +++++++++--------- src/Makefile.am | 32 ++++--- src/libmmanager.pc.in | 2 +- src/mm-dbus-manager.c | 4 +- src/mm.h | 37 ++++---- test/clients/Makefile.am | 17 +++- 9 files changed, 381 insertions(+), 261 deletions(-) rewrite INSTALL (100%) mode change 120000 => 100644 rewrite Makefile.am (98%) rewrite autogen.sh (95%) diff --git a/INSTALL b/INSTALL deleted file mode 120000 index 5bb6e7b..0000000 --- a/INSTALL +++ /dev/null @@ -1 +0,0 @@ -/usr/share/automake-1.10/INSTALL \ No newline at end of file diff --git a/INSTALL b/INSTALL new file mode 100644 index 0000000..d3c5b40 --- /dev/null +++ b/INSTALL @@ -0,0 +1,237 @@ +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007 Free Software Foundation, Inc. + +This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +Basic Installation +================== + +Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. + + 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 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. + + Running `configure' might take a while. 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. + + 6. Often, you can also type `make uninstall' to remove the installed + files again. + +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=c99 CFLAGS=-g 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 can use 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 `..'. + + With a non-GNU `make', it is safer 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). + +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: + + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/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/Makefile.am b/Makefile.am dissimilarity index 98% index d844c1d..5996e51 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,24 +1,15 @@ -## Process this file with automake to produce Makefile.in -## Created by Anjuta - -SUBDIRS = src po test data - -mmediamanagerdocdir = ${prefix}/doc/mmediamanager -mmediamanagerdoc_DATA = \ - README\ - COPYING\ - AUTHORS\ - ChangeLog\ - INSTALL\ - NEWS - -EXTRA_DIST = $(mmediamanagerdoc_DATA) - -# Copy all the spec files. Of cource, only one is actually used. -dist-hook: - for specfile in *.spec; do \ - if test -f $$specfile; then \ - cp -p $$specfile $(distdir); \ - fi \ - done - +SUBDIRS = src po test data libmmanager-gtk + +EXTRA_DIST = \ + autogen.sh \ + ChangeLog + +ChangeLog: + @if test -f $(top_srcdir)/.git/HEAD; then \ + git log --stat > $@; + fi + +dist: ChangeLog + +.PHONY: ChangeLog + diff --git a/autogen.sh b/autogen.sh dissimilarity index 95% index 9ab346a..cf86e17 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,159 +1,22 @@ -#!/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.ac) || { - 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 "^IT_PROG_INTLTOOL" $srcdir/configure.ac >/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.ac >/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.ac >/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.ac >/dev/null) && { - (grep "sed.*POTFILES" $srcdir/configure.ac) > /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.ac -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.ac >/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 "^IT_PROG_INTLTOOL" configure.ac >/dev/null; then - echo "Running intltoolize..." - intltoolize --copy --force --automake - fi - if grep "^AM_PROG_XML_I18N_TOOLS" configure.ac >/dev/null; then - echo "Running xml-i18n-toolize..." - xml-i18n-toolize --copy --force --automake - fi - if grep "^AM_PROG_LIBTOOL" configure.ac >/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.ac >/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 +#!/bin/sh +# Run this to generate all the initial makefiles, etc. + +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +PKG_NAME="mmediamanager" + +(test -f $srcdir/src/mm-manager.c) || { + echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" + echo " top-level $PKG_NAME directory" + exit 1 +} + +which gnome-autogen.sh || { + echo "You need to install gnome-common from GNOME SVN and make" + echo "sure the gnome-autogen.sh script is in your \$PATH." + exit 1 +} + +REQUIRED_AUTOMAKE_VERSION=1.9 USE_GNOME2_MACROS=1 . gnome-autogen.sh + diff --git a/configure.ac b/configure.ac index 842d166..c015cd4 100644 --- a/configure.ac +++ b/configure.ac @@ -16,10 +16,21 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(mmediamanager, 0.1.0) +m4_define([mmediamanager_version_major],[0]) +m4_define([mmediamanager_version_minor],[1]) +m4_define([mmediamanager_version_micro],[0]) +m4_define([mmediamanager_version],[mmediamanager_version_major.mmediamanager_version_minor.mmediamanager_version_micro]) + +AC_INIT([mmediamanager],[mmediamanager_version],[http://repo.or.cz/w/mmediamanager.git]) + +GNOME_COMMON_INIT + +AC_PREREQ([2.59]) +AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_SRCDIR([configure.ac]) + +AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-bzip2 tar-ustar]) -AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) -AM_CONFIG_HEADER(config.h) AM_MAINTAINER_MODE AC_ISC_POSIX @@ -27,7 +38,18 @@ AC_PROG_CC AM_PROG_CC_STDC AC_HEADER_STDC +AM_PROG_LIBTOOL + +################ +# glib-mkenums # +################ + AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums]) + +###################################### +# dbus-binding tool and service file # +###################################### + AC_PATH_PROG([DBUS_BINDING_TOOL],[dbus-binding-tool],[no]) if test "$DBUS_BINDING_TOOL" = "no"; then @@ -40,30 +62,33 @@ AC_SUBST(DBUS_SERVICES_DIR) AC_DEFINE_UNQUOTED(DBUS_SERVICES_DIR, "$DBUS_SERVICES_DIR", [Where services dir for DBUS is]) -dnl *************************************************************************** -dnl Internationalization -dnl *************************************************************************** +######################## +# internationalization # +######################## + GETTEXT_PACKAGE=mmediamanager -AC_SUBST(GETTEXT_PACKAGE) -AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name]) +AC_SUBST([GETTEXT_PACKAGE]) +AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"], [Gettext package]) AM_GLIB_GNU_GETTEXT -IT_PROG_INTLTOOL([0.35.0]) -AM_PROG_LIBTOOL +IT_PROG_INTLTOOL([0.40.0]) + +##################### +# dependency checks # +##################### PKG_CHECK_MODULES(MMEDIAMANAGER, [glib-2.0 gthread-2.0 gio-unix-2.0 gobject-2.0 gmodule-2.0 - dbus-glib-1 libxml-2.0 ]) AC_SUBST(MMEDIAMANAGER_CFLAGS) AC_SUBST(MMEDIAMANAGER_LIBS) ######## -# DBus +# dbus # ######## PKG_CHECK_MODULES(DBUS, [dbus-glib-1 @@ -72,45 +97,24 @@ PKG_CHECK_MODULES(DBUS, [dbus-glib-1 AC_SUBST(DBUS_CFLAGS) AC_SUBST(DBUS_LIBS) -################################################## -# Check for gtk-doc. -################################################## -AC_ARG_WITH(html-dir, [ --with-html-dir=PATH path to installed docs ]) -if test "x$with_html_dir" = "x" ; then - HTML_DIR='${datadir}/gtk-doc/html' -else - HTML_DIR=$with_html_dir -fi -AC_SUBST(HTML_DIR) - -gtk_doc_min_version=1.0 -AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version]) -if pkg-config --atleast-version=$gtk_doc_min_version gtk-doc; then - AC_MSG_RESULT(yes) - GTKDOC=true -else - AC_MSG_RESULT(no) - GTKDOC=false -fi -dnl Let people disable the gtk-doc stuff. -AC_ARG_ENABLE(gtk-doc, - [ --enable-gtk-doc Use gtk-doc to build documentation [default=auto]], - enable_gtk_doc="$enableval", enable_gtk_doc=auto) -if test x$enable_gtk_doc = xauto ; then - if test x$GTKDOC = xtrue ; then - enable_gtk_doc=yes - else - enable_gtk_doc=no - fi -fi -AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes) +########### +# gtk-doc # +########### + +GNOME_DOC_INIT +GTK_DOC_CHECK([1.0]) +################ +# output files # +################ AC_OUTPUT([ Makefile data/Makefile src/libmmanager.pc src/Makefile +libmmanager-gtk/libmmanager-gtk.pc +libmmanager-gtk/Makefile test/Makefile test/clients/Makefile po/Makefile.in diff --git a/src/Makefile.am b/src/Makefile.am index 0ae227b..f979e7e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,8 +3,7 @@ AM_CPPFLAGS = \ -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \ - -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ - $(MMEDIAMANAGER_CFLAGS) + -DPACKAGE_DATA_DIR=\""$(datadir)"\" AM_CFLAGS =\ -Wall\ @@ -18,8 +17,7 @@ lib_LTLIBRARIES = \ libmmanager.la mm_dbus_manager_headers = \ - mm-dbus-manager.h \ - mm-error.h + mm-dbus-manager.h mm_dbus_manager_SOURCES = \ mm-dbus-manager-main.c \ @@ -28,15 +26,18 @@ mm_dbus_manager_SOURCES = \ mm-dbus-manager-type-builtins.h \ $(mm_dbus_manager_headers) -mm_dbus_manager_INCLUDES = \ - $(DBUS_CFLAGS) +mm_dbus_manager_CFLAGS = \ + $(DBUS_CFLAGS) \ + $(MMEDIAMANAGER_CFLAGS) mm_dbus_manager_LDADD = \ - $(DBUS_LIBS) + libmmanager.la \ + $(DBUS_LIBS) \ + $(MMEDIAMANAGER_LIBS) libmmanager_includedir=$(includedir)/libmmanager -libmmanager_headers = \ +libmmanager_la_headers = \ mm.h \ mm-application.h \ mm-dbus-application.h \ @@ -91,6 +92,14 @@ libmmanager_la_SOURCES = \ mm-utils.c \ mm-attribute-base-manager.c +libmmanager_la_CFLAGS = \ + $(MMEDIAMANAGER_CFLAGS) \ + $(DBUS_CFLAGS) + +libmmanager_la_LIBADD = \ + $(MMEDIAMANAGER_LIBS) \ + $(DBUS_LIBS) + BUILT_SOURCES = \ mm-type-builtins.c \ mm-type-builtins.h \ @@ -123,7 +132,7 @@ stamp-mm-type-builtins.c: Makefile $(libmmanager_headers) --vtail " { 0, NULL, NULL }\n };\n\n" \ --vtail " type = g_@type@_register_static (\"@EnumName@\", _@enum_name@_values);\n }\n\n" \ --vtail " return type;\n}\n\n" \ - $(libmmanager_headers) > xgen-$(@F) \ + $(libmmanager_la_headers) > xgen-$(@F) \ && ( cmp -s xgen-$(@F) $(@F:stamp-%=%) || cp xgen-$(@F) $(@F:stamp-%=%) ) \ && rm -f xgen-$(@F) \ && echo timestamp > $(@F) @@ -141,7 +150,7 @@ stamp-mm-type-builtins.h: Makefile $(libmmanager_headers) --fprod "\n/* --- @filename@ --- */" \ --eprod "#define MM_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n" \ --eprod "GType @enum_name@_get_type (void);\n" \ - $(libmmanager_headers) > xgen-$(@F) \ + $(libmmanager_la_headers) > xgen-$(@F) \ && ( cmp -s xgen-$(@F) $(@F:stamp-%=%) || cp xgen-$(@F) $(@F:stamp-%=%) ) \ && rm -f xgen-$(@F) \ && echo timestamp > $(@F) @@ -226,5 +235,6 @@ pkgconfig_DATA=libmmanager.pc EXTRA_DIST = \ libmmanager.pc.in \ - mm-dbus-manager-info.xml + mm-dbus-manager-info.xml \ + mm-dbus-module-info.xml diff --git a/src/libmmanager.pc.in b/src/libmmanager.pc.in index 2a2e6d4..05d79b7 100644 --- a/src/libmmanager.pc.in +++ b/src/libmmanager.pc.in @@ -7,7 +7,7 @@ extensiondir=/home/anarki/mmediamanager-extensions Name: libmmanager Description: MManager library Version: @VERSION@ -Requires: glib-2.0 gio-unix-2.0 gmodule-2.0 +Requires: glib-2.0 gio-unix-2.0 gmodule-2.0 dbus-glib-1 Libs: -L${libdir} -lmmanager Cflags: -I${includedir} diff --git a/src/mm-dbus-manager.c b/src/mm-dbus-manager.c index d97062f..c653f36 100644 --- a/src/mm-dbus-manager.c +++ b/src/mm-dbus-manager.c @@ -23,9 +23,9 @@ #include #include #include -#include "mm-dbus-manager.h" -#include "mm-dbus-manager-type-builtins.h" #include "mm-error.h" +#include "mm-dbus-manager.h" +#include "mm-type-builtins.h" gboolean mm_dbus_manager_register_app (MMDBusManager *manager, char *path, char *name, GError **error); diff --git a/src/mm.h b/src/mm.h index 1ff1f86..c087e43 100644 --- a/src/mm.h +++ b/src/mm.h @@ -21,23 +21,24 @@ #ifndef __MM_H__ #define __MM_H__ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "mm-application-provider.h" +#include "mm-application.h" +#include "mm-attribute-base-manager.h" +#include "mm-attribute-manager.h" +#include "mm-attribute.h" +#include "mm-base-attributes.h" +#include "mm-category-provider.h" +#include "mm-category.h" +#include "mm-error.h" +#include "mm-filter-param.h" +#include "mm-hit-collection-provider.h" +#include "mm-hit.h" +#include "mm-manager.h" +#include "mm-module-manager.h" +#include "mm-module.h" +#include "mm-so-application.h" +#include "mm-string-utils.h" +#include "mm-types.h" +#include "mm-utils.h" #endif /* __MM_H__ */ diff --git a/test/clients/Makefile.am b/test/clients/Makefile.am index 3cf49a8..2ed1ffd 100644 --- a/test/clients/Makefile.am +++ b/test/clients/Makefile.am @@ -9,7 +9,10 @@ INCLUDES = \ -I$(top_srcdir)/src \ $(MMEDIAMANAGER_CFLAGS) -bin_PROGRAMS = \ +LDADD = \ + $(top_builddir)/src/libmmanager.la + +noinst_PROGRAMS = \ mm-test-applications \ mm-test-dbus-client \ mm-test-dbus-register \ @@ -26,9 +29,21 @@ mm_test_applications_LDADD = \ mm_test_dbus_client_SOURCES = \ test-dbus-client.c +mm_test_dbus_client_LDADD = \ + $(DBUS_LIBS) + +mm_test_dbus_client_CFLAGS = \ + $(DBUS_CFLAGS) + mm_test_dbus_register_SOURCES = \ test-dbus-register.c +mm_test_dbus_register_LDADD = \ + $(DBUS_LIBS) + +mm_test_dbus_register_CFLAGS = \ + $(DBUS_CFLAGS) + mm_test_dbus_spawn_SOURCES = \ test-dbus-spawn.c -- 2.11.4.GIT