From 342c88812810ab209374410d6fcf820ff622a6d7 Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Wed, 30 Jul 2008 12:01:35 +0200 Subject: [PATCH] Maintainer's effort n.2: - tabify Makefile.am - fix INCLUDES and AM_CPPFLAGS - fix service.in --- Makefile.am | 2 +- configure.ac | 12 +- data/Makefile.am | 4 +- data/org.gnome.MediaManager.service.in | 2 +- libmmanager-gtk/Makefile.am | 61 +++++---- libmmanager-gtk/mm-gtk-application-store.c | 7 +- libmmanager-gtk/mm-gtk-application-view.c | 6 +- src/Makefile.am | 211 +++++++++++++++-------------- src/libmmanager.pc.in | 2 +- src/mm-dbus-manager.c | 2 +- src/mm-module-manager.c | 2 +- 11 files changed, 156 insertions(+), 155 deletions(-) rewrite libmmanager-gtk/Makefile.am (76%) diff --git a/Makefile.am b/Makefile.am index f494a6b..db5cffb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = src po data libmmanager-gtk test +SUBDIRS = po data src libmmanager-gtk test EXTRA_DIST = \ ChangeLog diff --git a/configure.ac b/configure.ac index dcb9da1..51048b5 100644 --- a/configure.ac +++ b/configure.ac @@ -46,9 +46,9 @@ AM_PROG_LIBTOOL AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums]) -###################################### -# dbus-binding tool and service file # -###################################### +###################### +# dbus-binding tool # +###################### AC_PATH_PROG([DBUS_BINDING_TOOL],[dbus-binding-tool],[no]) @@ -56,12 +56,6 @@ if test "$DBUS_BINDING_TOOL" = "no"; then AC_MSG_ERROR([dbus-binding-tool not found]) fi -AS_AC_EXPAND(DATADIR, $datadir) -DBUS_SERVICES_DIR="$DATADIR/dbus-1/services" -AC_SUBST(DBUS_SERVICES_DIR) -AC_DEFINE_UNQUOTED(DBUS_SERVICES_DIR, "$DBUS_SERVICES_DIR", [Where -services dir for DBUS is]) - ######################## # internationalization # ######################## diff --git a/data/Makefile.am b/data/Makefile.am index 7f6bd35..cc0e357 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,11 +1,11 @@ # Dbus service file -servicedir = $(DBUS_SERVICES_DIR) +servicedir = $(datadir)/dbus-1/services service_in_files = org.gnome.MediaManager.service.in service_DATA = $(service_in_files:.service.in=.service) # Rule to make the service file with bindir expanded $(service_DATA): $(service_in_files) Makefile - @sed -e "s|@bindir@|$(bindir)|" $<> $@ + @sed -e "s|\@bindir\@|$(bindir)|" $< > $@ EXTRA_DIST = \ $(service_in_files) diff --git a/data/org.gnome.MediaManager.service.in b/data/org.gnome.MediaManager.service.in index b0314ab..cb28d72 100644 --- a/data/org.gnome.MediaManager.service.in +++ b/data/org.gnome.MediaManager.service.in @@ -1,3 +1,3 @@ [D-BUS Service] -Name=org.gnome.MediaManager +Name=org.gnome.MediaManager.Manager Exec=@bindir@/mm-dbus-manager diff --git a/libmmanager-gtk/Makefile.am b/libmmanager-gtk/Makefile.am dissimilarity index 76% index 7365a3a..b595cab 100644 --- a/libmmanager-gtk/Makefile.am +++ b/libmmanager-gtk/Makefile.am @@ -1,30 +1,31 @@ -AM_CPPFLAGS = \ - -I. \ - -I$(top_srcdir) \ - -DDATADIR=\""$(datadir)"\" \ - $(MMEDIAMANAGER_CFLAGS) \ - $(GTK_CFLAGS) - -lib_LTLIBRARIES = libmmanager-gtk.la - -libmmanager_gtk_la_LIBADD = \ - $(MMEDIAMANAGER_LIBS) \ - $(GTK_LIBS) \ - $(top_builddir)/src/libmmanager.la - -libmmanager_gtk_la_includedir=$(includedir)/libmmanager-gtk - -libmmanager_gtk_la_include_HEADERS = \ - mm-gtk.h \ - mm-gtk-application-store.h \ - mm-gtk-application-view.h - -libmmanager_gtk_la_SOURCES = \ - mm-gtk-application-store.c \ - mm-gtk-application-view.c - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libmmanager-gtk.pc - -EXTRA_DIST = \ - libmmanager-gtk.pc.in +INCLUDES = \ + -I. \ + -I$(top_srcdir) \ + -I$(top_srcdir)/src \ + -I$(top_builddir) \ + -DDATADIR=\""$(datadir)"\" \ + $(MMEDIAMANAGER_CFLAGS) \ + $(GTK_CFLAGS) + +lib_LTLIBRARIES = libmmanager-gtk.la + +libmmanager_gtk_la_LIBADD = \ + $(MMEDIAMANAGER_LIBS) \ + $(GTK_LIBS) \ + $(top_builddir)/src/libmmanager.la + +libmmanager_gtk_la_includedir=$(includedir)/libmmanager-gtk + +libmmanager_gtk_la_include_HEADERS = \ + mm-gtk.h \ + mm-gtk-application-store.h \ + mm-gtk-application-view.h + +libmmanager_gtk_la_SOURCES = \ + mm-gtk-application-store.c \ + mm-gtk-application-view.c + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = libmmanager-gtk.pc + +EXTRA_DIST = libmmanager-gtk.pc.in diff --git a/libmmanager-gtk/mm-gtk-application-store.c b/libmmanager-gtk/mm-gtk-application-store.c index 3866995..66410c4 100644 --- a/libmmanager-gtk/mm-gtk-application-store.c +++ b/libmmanager-gtk/mm-gtk-application-store.c @@ -20,8 +20,11 @@ #include "mm-gtk-application-store.h" -#include -#include +#include "libmmanager/mm-type-builtins.h" +#include "libmmanager/mm-types.h" +#include "libmmanager/mm-application.h" +#include "libmmanager/mm-manager.h" +#include "libmmanager/mm-category.h" #include #include diff --git a/libmmanager-gtk/mm-gtk-application-view.c b/libmmanager-gtk/mm-gtk-application-view.c index 5df1d3b..fb58857 100644 --- a/libmmanager-gtk/mm-gtk-application-view.c +++ b/libmmanager-gtk/mm-gtk-application-view.c @@ -21,9 +21,9 @@ #include "mm-gtk-application-view.h" #include "mm-gtk-application-store.h" -#include -#include -#include +#include "libmmanager/mm-application.h" +#include "libmmanager/mm-category.h" +#include "libmmanager/mm-type-builtins.h" #include diff --git a/src/Makefile.am b/src/Makefile.am index 63a8de7..fa8b154 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,118 +1,121 @@ -AM_CPPFLAGS = \ - -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ - -DPACKAGE_SRC_DIR=\""$(srcdir)"\" \ - -DPACKAGE_DATA_DIR=\""$(datadir)"\" - -AM_CFLAGS =\ - -Wall\ - -Werror\ - -g +AM_CPPFLAGS = \ + -I. \ + -I$(top_srcdir) \ + -I$(top_builddir) + +AM_CFLAGS = \ + -Wall \ + -Werror \ + -g + +INCLUDES = \ + -DMMEDIAMANAGER_EXTENSIONDIR=\""($libdir)/mmediamanager/extensions"\" bin_PROGRAMS = \ - mm-dbus-manager + mm-dbus-manager lib_LTLIBRARIES = \ - libmmanager.la + libmmanager.la mm_dbus_manager_headers = \ - mm-dbus-manager.h + mm-dbus-manager.h mm_dbus_manager_SOURCES = \ - mm-dbus-manager-main.c \ - mm-dbus-manager.c \ - mm-dbus-manager-type-builtins.c \ - mm-dbus-manager-type-builtins.h \ - $(mm_dbus_manager_headers) + mm-dbus-manager-main.c \ + mm-dbus-manager.c \ + mm-dbus-manager-type-builtins.c \ + mm-dbus-manager-type-builtins.h \ + $(mm_dbus_manager_headers) mm_dbus_manager_CFLAGS = \ - $(DBUS_CFLAGS) \ - $(MMEDIAMANAGER_CFLAGS) + $(DBUS_CFLAGS) \ + $(MMEDIAMANAGER_CFLAGS) mm_dbus_manager_LDADD = \ - libmmanager.la \ - $(DBUS_LIBS) \ - $(MMEDIAMANAGER_LIBS) + libmmanager.la \ + $(DBUS_LIBS) \ + $(MMEDIAMANAGER_LIBS) libmmanager_la_includedir=$(includedir)/libmmanager -libmmanager_la_headers = \ - mm.h \ - mm-application.h \ - mm-dbus-application.h \ - mm-so-application.h \ - mm-application-provider.h \ - mm-category.h \ - mm-dbus-category.h \ - mm-so-category.h \ - mm-category-provider.h \ - mm-hit.h \ - mm-hit-collection.h \ - mm-hit-collection-provider.h \ - mm-manager.h \ - mm-module-manager.h \ - mm-filter.h \ - mm-attribute.h \ - mm-base-attributes.h \ - mm-filter-param.h \ - mm-attribute-manager.h \ - mm-attribute-base-manager.h \ - mm-module.h \ - mm-string-utils.h \ - mm-utils.h \ - mm-types.h \ - mm-error.h - -libmmanager_la_include_HEADERS = \ - $(libmmanager_la_headers) \ - mm-type-builtins.h - -libmmanager_la_SOURCES = \ - mm-application.c \ - mm-dbus-application.c \ - mm-so-application.c \ - mm-application-provider.c \ - mm-category.c \ - mm-dbus-category.c \ - mm-so-category.c \ - mm-category-provider.c \ - mm-hit.c \ - mm-hit-collection.c \ - mm-hit-collection-provider.c \ - mm-manager.c \ - mm-module.c \ - mm-module-manager.c \ - mm-type-builtins.c \ - mm-filter.c \ - mm-attribute.c \ - mm-filter-param.c \ - mm-attribute-manager.c \ - mm-string-utils.c \ - 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 \ - mm-dbus-manager-client-bindings.h \ - mm-dbus-manager-server-bindings.h \ - mm-dbus-manager-type-builtins.c \ - mm-dbus-manager-type-builtins.h - -stamp_files = \ - stamp-mm-type-builtins.c \ - stamp-mm-type-builtins.h \ - stamp-mm-dbus-manager-client-bindings.h \ - stamp-mm-dbus-manager-server-bindings.h \ - stamp-mm-dbus-manager-type-builtins.c \ - stamp-mm-dbus-manager-type-builtins.h +libmmanager_la_headers = \ + mm.h \ + mm-application.h \ + mm-dbus-application.h \ + mm-so-application.h \ + mm-application-provider.h \ + mm-category.h \ + mm-dbus-category.h \ + mm-so-category.h \ + mm-category-provider.h \ + mm-hit.h \ + mm-hit-collection.h \ + mm-hit-collection-provider.h \ + mm-manager.h \ + mm-module-manager.h \ + mm-filter.h \ + mm-attribute.h \ + mm-base-attributes.h \ + mm-filter-param.h \ + mm-attribute-manager.h \ + mm-attribute-base-manager.h \ + mm-module.h \ + mm-string-utils.h \ + mm-utils.h \ + mm-types.h \ + mm-error.h + +libmmanager_la_include_HEADERS = \ + $(libmmanager_la_headers) \ + mm-type-builtins.h + +libmmanager_la_SOURCES = \ + mm-application.c \ + mm-dbus-application.c \ + mm-so-application.c \ + mm-application-provider.c \ + mm-category.c \ + mm-dbus-category.c \ + mm-so-category.c \ + mm-category-provider.c \ + mm-hit.c \ + mm-hit-collection.c \ + mm-hit-collection-provider.c \ + mm-manager.c \ + mm-module.c \ + mm-module-manager.c \ + mm-type-builtins.c \ + mm-filter.c \ + mm-attribute.c \ + mm-filter-param.c \ + mm-attribute-manager.c \ + mm-string-utils.c \ + 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 \ + mm-dbus-manager-client-bindings.h \ + mm-dbus-manager-server-bindings.h \ + mm-dbus-manager-type-builtins.c \ + mm-dbus-manager-type-builtins.h + +stamp_files = \ + stamp-mm-type-builtins.c \ + stamp-mm-type-builtins.h \ + stamp-mm-dbus-manager-client-bindings.h \ + stamp-mm-dbus-manager-server-bindings.h \ + stamp-mm-dbus-manager-type-builtins.c \ + stamp-mm-dbus-manager-type-builtins.h mm-type-builtins.c: stamp-mm-type-builtins.c Makefile @true @@ -231,8 +234,8 @@ MAINTAINERCLEANFILES = $(stamp_files) $(BUILT_SOURCES) pkgconfigdir=$(libdir)/pkgconfig pkgconfig_DATA=libmmanager.pc -EXTRA_DIST = \ - libmmanager.pc.in \ - mm-dbus-manager-info.xml \ - mm-dbus-module-info.xml +EXTRA_DIST = \ + libmmanager.pc.in \ + mm-dbus-manager-info.xml \ + mm-dbus-module-info.xml diff --git a/src/libmmanager.pc.in b/src/libmmanager.pc.in index 05d79b7..d661e6c 100644 --- a/src/libmmanager.pc.in +++ b/src/libmmanager.pc.in @@ -2,7 +2,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@/libmmanager -extensiondir=/home/anarki/mmediamanager-extensions +extensiondir=@libdir@/mmediamanager/extensions Name: libmmanager Description: MManager library diff --git a/src/mm-dbus-manager.c b/src/mm-dbus-manager.c index c653f36..dad2d2b 100644 --- a/src/mm-dbus-manager.c +++ b/src/mm-dbus-manager.c @@ -85,7 +85,7 @@ activate_applications (MMDBusManager *manager) const char *dirname; GError *error = NULL; - dirname = "/home/anarki/mmediamanager-extensions/dbus"; + dirname = MMEDIAMANAGER_EXTENSIONDIR"/dbus"; dir = g_dir_open (dirname, 0, &error); if (!dir) { g_warning ("Unable to open the DBus extensions directory %s: %s", diff --git a/src/mm-module-manager.c b/src/mm-module-manager.c index b4eac2f..a4f267d 100644 --- a/src/mm-module-manager.c +++ b/src/mm-module-manager.c @@ -89,7 +89,7 @@ mm_module_manager_init (MMModuleManager *manager) MMModuleManagerDetails *details = manager->details = MM_MODULE_MANAGER_GET_PRIVATE (manager); - details->path = g_strdup ("/home/anarki/mmediamanager-extensions"); + details->path = g_strdup (MMEDIAMANAGER_EXTENSIONDIR); details->modules = NULL; load_modules (manager); } -- 2.11.4.GIT