[Xfce4-commits] r27279 - in xfce4-settings/trunk: . dialogs dialogs/accessibility-settings dialogs/appearance-settings dialogs/keyboard-settings dialogs/mouse-settings xfce4-settings-helper xfce4-settings-manager
Nick Schermer
nick at xfce.org
Sun Jul 13 21:24:20 CEST 2008
Author: nick
Date: 2008-07-13 19:24:20 +0000 (Sun, 13 Jul 2008)
New Revision: 27279
Modified:
xfce4-settings/trunk/ChangeLog
xfce4-settings/trunk/Makefile.am
xfce4-settings/trunk/configure.ac.in
xfce4-settings/trunk/dialogs/Makefile.am
xfce4-settings/trunk/dialogs/accessibility-settings/Makefile.am
xfce4-settings/trunk/dialogs/accessibility-settings/main.c
xfce4-settings/trunk/dialogs/appearance-settings/Makefile.am
xfce4-settings/trunk/dialogs/appearance-settings/main.c
xfce4-settings/trunk/dialogs/keyboard-settings/Makefile.am
xfce4-settings/trunk/dialogs/keyboard-settings/main.c
xfce4-settings/trunk/dialogs/mouse-settings/Makefile.am
xfce4-settings/trunk/dialogs/mouse-settings/main.c
xfce4-settings/trunk/xfce4-settings-helper/Makefile.am
xfce4-settings/trunk/xfce4-settings-helper/main.c
xfce4-settings/trunk/xfce4-settings-manager/Makefile.am
xfce4-settings/trunk/xfce4-settings-manager/main.c
Log:
* xfce4-settings-manager/Makefile.am,
dialogs/accessibility-settings/Makefile.am,
dialogs/mouse-settings/Makefile.am, dialogs/Makefile.am,
dialogs/appearance-settings/Makefile.am,
dialogs/keyboard-settings/Makefile.am,
xfce4-settings-helper/Makefile.am: Make all the make files look
the same. Add LDFLAGS and G_LOG_DOMAIN. Add PLATFORM_CPPFLAGS
for the CFLAGS used for debugging.
* xfce4-settings-manager/main.c, dialogs/accessibility-settings/main.c,
dialogs/mouse-settings/main.c, dialogs/appearance-settings/main.c,
dialogs/keyboard-settings/main.c, xfce4-settings-helper/main.c:
Use the G_LOG_DOMAIN for the version info and init error.
Add the Xfce version to the version information.
* Set svn:keywords Id on all the make files and configure.ac.in.
Modified: xfce4-settings/trunk/ChangeLog
===================================================================
--- xfce4-settings/trunk/ChangeLog 2008-07-13 18:36:34 UTC (rev 27278)
+++ xfce4-settings/trunk/ChangeLog 2008-07-13 19:24:20 UTC (rev 27279)
@@ -1,5 +1,22 @@
2008-07-13 Nick Schermer <nick at xfce.org>
+ * xfce4-settings-manager/Makefile.am,
+ dialogs/accessibility-settings/Makefile.am,
+ dialogs/mouse-settings/Makefile.am, dialogs/Makefile.am,
+ dialogs/appearance-settings/Makefile.am,
+ dialogs/keyboard-settings/Makefile.am,
+ xfce4-settings-helper/Makefile.am: Make all the make files look
+ the same. Add LDFLAGS and G_LOG_DOMAIN. Add PLATFORM_CPPFLAGS
+ for the CFLAGS used for debugging.
+ * xfce4-settings-manager/main.c, dialogs/accessibility-settings/main.c,
+ dialogs/mouse-settings/main.c, dialogs/appearance-settings/main.c,
+ dialogs/keyboard-settings/main.c, xfce4-settings-helper/main.c:
+ Use the G_LOG_DOMAIN for the version info and init error.
+ Add the Xfce version to the version information.
+ * Set svn:keywords Id on all the make files and configure.ac.in.
+
+2008-07-13 Nick Schermer <nick at xfce.org>
+
* xfce4-settings-manager/main.c: Add basic version information
and gtk_init error. Destroy dialog after running it.
* xfce4-settings-manager/xfce-settings-manager-dialog.c: Free
Modified: xfce4-settings/trunk/Makefile.am
===================================================================
--- xfce4-settings/trunk/Makefile.am 2008-07-13 18:36:34 UTC (rev 27278)
+++ xfce4-settings/trunk/Makefile.am 2008-07-13 19:24:20 UTC (rev 27279)
@@ -1,3 +1,5 @@
+# $Id$
+
SUBDIRS = \
dialogs \
xfce4-settings-helper \
Property changes on: xfce4-settings/trunk/Makefile.am
___________________________________________________________________
Name: svn:keywords
+ Id
Property changes on: xfce4-settings/trunk/configure.ac.in
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: xfce4-settings/trunk/dialogs/Makefile.am
===================================================================
--- xfce4-settings/trunk/dialogs/Makefile.am 2008-07-13 18:36:34 UTC (rev 27278)
+++ xfce4-settings/trunk/dialogs/Makefile.am 2008-07-13 19:24:20 UTC (rev 27279)
@@ -1,3 +1,5 @@
+# $Id$
+
SUBDIRS = \
appearance-settings \
accessibility-settings \
Property changes on: xfce4-settings/trunk/dialogs/Makefile.am
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: xfce4-settings/trunk/dialogs/accessibility-settings/Makefile.am
===================================================================
--- xfce4-settings/trunk/dialogs/accessibility-settings/Makefile.am 2008-07-13 18:36:34 UTC (rev 27278)
+++ xfce4-settings/trunk/dialogs/accessibility-settings/Makefile.am 2008-07-13 19:24:20 UTC (rev 27279)
@@ -1,5 +1,16 @@
-bin_PROGRAMS = xfce4-accessibility-settings
+# $Id$
+INCLUDES = \
+ -I${top_srcdir} \
+ -DDATADIR=\"$(datadir)\" \
+ -DSRCDIR=\"$(top_srcdir)\" \
+ -DLOCALEDIR=\"$(localedir)\" \
+ -DG_LOG_DOMAIN=\"xfce4-accessibility-settings\" \
+ $(PLATFORM_CPPFLAGS)
+
+bin_PROGRAMS = \
+ xfce4-accessibility-settings
+
xfce4_accessibility_settings_SOURCES = \
main.c \
accessibility-dialog_glade.h
@@ -10,11 +21,12 @@
$(GLADE_CFLAGS) \
$(DBUS_GLIB_CFLAGS) \
$(LIBXFCEGUI4_CFLAGS) \
- $(XFCONF_CFLAGS) \
- -DDATADIR=\"$(datadir)\" \
- -DSRCDIR=\"$(top_srcdir)\" \
- -DLOCALEDIR=\"$(localedir)\"
+ $(XFCONF_CFLAGS)
+xfce4_accessibility_settings_LDFLAGS = \
+ -no-undefined \
+ $(PLATFORM_LDFLAGS)
+
xfce4_accessibility_settings_LDADD = \
$(GTK_LIBS) \
$(GLIB_LIBS) \
@@ -23,13 +35,10 @@
$(LIBXFCEGUI4_LIBS) \
$(XFCONF_LIBS)
-INCLUDES = \
- -I${top_srcdir}
-
if MAINTAINER_MODE
BUILT_SOURCES = \
-accessibility-dialog_glade.h
+ accessibility-dialog_glade.h
accessibility-dialog_glade.h: accessibility-dialog.glade
exo-csource --static --name=accessibility_dialog_glade $< >$@
@@ -46,8 +55,10 @@
@INTLTOOL_DESKTOP_RULE@
EXTRA_DIST = \
- $(desktop_in_files) \
+ $(desktop_in_files) \
accessibility-dialog.glade
DISTCLEANFILES = \
$(desktop_DATA)
+
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
Property changes on: xfce4-settings/trunk/dialogs/accessibility-settings/Makefile.am
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: xfce4-settings/trunk/dialogs/accessibility-settings/main.c
===================================================================
--- xfce4-settings/trunk/dialogs/accessibility-settings/main.c 2008-07-13 18:36:34 UTC (rev 27278)
+++ xfce4-settings/trunk/dialogs/accessibility-settings/main.c 2008-07-13 19:24:20 UTC (rev 27279)
@@ -171,8 +171,8 @@
if (G_LIKELY (error))
{
/* print error */
- g_print ("xfce4-accessibility-settings: %s.\n", error->message);
- g_print (_("Type '%s --help' for usage."), "xfce4-accessibility-settings");
+ g_print ("%s: %s.\n", G_LOG_DOMAIN, error->message);
+ g_print (_("Type '%s --help' for usage."), G_LOG_DOMAIN);
g_print ("\n");
/* cleanup */
@@ -189,7 +189,7 @@
/* check if we should print version information */
if (G_UNLIKELY (opt_version))
{
- g_print ("xfce4-settings-helper %s\n\n", PACKAGE_VERSION);
+ g_print ("%s %s (Xfce %s)\n\n", G_LOG_DOMAIN, PACKAGE_VERSION, xfce_version_string ());
g_print ("%s\n", "Copyright (c) 2008");
g_print ("\t%s\n\n", _("The Xfce development team. All rights reserved."));
g_print (_("Please report bugs to <%s>."), PACKAGE_BUGREPORT);
Modified: xfce4-settings/trunk/dialogs/appearance-settings/Makefile.am
===================================================================
--- xfce4-settings/trunk/dialogs/appearance-settings/Makefile.am 2008-07-13 18:36:34 UTC (rev 27278)
+++ xfce4-settings/trunk/dialogs/appearance-settings/Makefile.am 2008-07-13 19:24:20 UTC (rev 27279)
@@ -1,5 +1,16 @@
-bin_PROGRAMS = xfce4-appearance-settings
+# $Id$
+INCLUDES = \
+ -I${top_srcdir} \
+ -DDATADIR=\"$(datadir)\" \
+ -DSRCDIR=\"$(top_srcdir)\" \
+ -DLOCALEDIR=\"$(localedir)\" \
+ -DG_LOG_DOMAIN=\"xfce4-appearance-settings\" \
+ $(PLATFORM_CPPFLAGS)
+
+bin_PROGRAMS = \
+ xfce4-appearance-settings
+
xfce4_appearance_settings_SOURCES = \
main.c \
images.h \
@@ -11,11 +22,12 @@
$(GLADE_CFLAGS) \
$(DBUS_GLIB_CFLAGS) \
$(LIBXFCEGUI4_CFLAGS) \
- $(XFCONF_CFLAGS) \
- -DDATADIR=\"$(datadir)\" \
- -DSRCDIR=\"$(top_srcdir)\" \
- -DLOCALEDIR=\"$(localedir)\"
+ $(XFCONF_CFLAGS)
+xfce4_appearance_settings_LDFLAGS = \
+ -no-undefined \
+ $(PLATFORM_LDFLAGS)
+
xfce4_appearance_settings_LDADD = \
$(GTK_LIBS) \
$(GLIB_LIBS) \
@@ -24,13 +36,10 @@
$(LIBXFCEGUI4_LIBS) \
$(XFCONF_LIBS)
-INCLUDES = \
- -I${top_srcdir}
-
if MAINTAINER_MODE
BUILT_SOURCES = \
-appearance-dialog_glade.h
+ appearance-dialog_glade.h
appearance-dialog_glade.h: appearance-dialog.glade
exo-csource --static --name=appearance_dialog_glade $< >$@
@@ -47,8 +56,10 @@
@INTLTOOL_DESKTOP_RULE@
EXTRA_DIST = \
- $(desktop_in_files) \
+ $(desktop_in_files) \
appearance-dialog.glade
DISTCLEANFILES = \
$(desktop_DATA)
+
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
Property changes on: xfce4-settings/trunk/dialogs/appearance-settings/Makefile.am
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: xfce4-settings/trunk/dialogs/appearance-settings/main.c
===================================================================
--- xfce4-settings/trunk/dialogs/appearance-settings/main.c 2008-07-13 18:36:34 UTC (rev 27278)
+++ xfce4-settings/trunk/dialogs/appearance-settings/main.c 2008-07-13 19:24:20 UTC (rev 27279)
@@ -740,8 +740,8 @@
if (G_LIKELY (error))
{
/* print error */
- g_print ("xfce4-appearance-settings: %s.\n", error->message);
- g_print (_("Type '%s --help' for usage."), "xfce4-appearance-settings");
+ g_print ("%s: %s.\n", G_LOG_DOMAIN, error->message);
+ g_print (_("Type '%s --help' for usage."), G_LOG_DOMAIN);
g_print ("\n");
/* cleanup */
@@ -758,7 +758,7 @@
/* print version information */
if (G_UNLIKELY (opt_version))
{
- g_print ("Xfce4-appearance-settings %s (Xfce %s)\n\n", PACKAGE_VERSION, xfce_version_string ());
+ g_print ("%s %s (Xfce %s)\n\n", G_LOG_DOMAIN, PACKAGE_VERSION, xfce_version_string ());
g_print ("%s\n", "Copyright (c) 2004-2008");
g_print ("\t%s\n\n", _("The Xfce development team. All rights reserved."));
g_print (_("Please report bugs to <%s>."), PACKAGE_BUGREPORT);
Modified: xfce4-settings/trunk/dialogs/keyboard-settings/Makefile.am
===================================================================
--- xfce4-settings/trunk/dialogs/keyboard-settings/Makefile.am 2008-07-13 18:36:34 UTC (rev 27278)
+++ xfce4-settings/trunk/dialogs/keyboard-settings/Makefile.am 2008-07-13 19:24:20 UTC (rev 27279)
@@ -1,5 +1,16 @@
-bin_PROGRAMS = xfce4-keyboard-settings
+# $Id$
+INCLUDES = \
+ -I${top_srcdir} \
+ -DDATADIR=\"$(datadir)\" \
+ -DSRCDIR=\"$(top_srcdir)\" \
+ -DLOCALEDIR=\"$(localedir)\" \
+ -DG_LOG_DOMAIN=\"xfce4-keyboard-settings\" \
+ $(PLATFORM_CPPFLAGS)
+
+bin_PROGRAMS = \
+ xfce4-keyboard-settings
+
xfce4_keyboard_settings_SOURCES = \
main.c \
shortcut-dialog.c \
@@ -12,11 +23,12 @@
$(GLADE_CFLAGS) \
$(DBUS_GLIB_CFLAGS) \
$(LIBXFCEGUI4_CFLAGS) \
- $(XFCONF_CFLAGS) \
- -DDATADIR=\"$(datadir)\" \
- -DSRCDIR=\"$(top_srcdir)\" \
- -DLOCALEDIR=\"$(localedir)\"
+ $(XFCONF_CFLAGS)
+xfce4_keyboard_settings_LDFLAGS = \
+ -no-undefined \
+ $(PLATFORM_LDFLAGS)
+
xfce4_keyboard_settings_LDADD = \
$(GTK_LIBS) \
$(GLIB_LIBS) \
@@ -25,13 +37,10 @@
$(LIBXFCEGUI4_LIBS) \
$(XFCONF_LIBS)
-INCLUDES = \
- -I${top_srcdir}
-
if MAINTAINER_MODE
BUILT_SOURCES = \
-keyboard-dialog_glade.h
+ keyboard-dialog_glade.h
keyboard-dialog_glade.h: keyboard-dialog.glade
exo-csource --static --name=keyboard_dialog_glade $< >$@
@@ -48,9 +57,10 @@
@INTLTOOL_DESKTOP_RULE@
EXTRA_DIST = \
- $(desktop_in_files) \
+ $(desktop_in_files) \
keyboard-dialog.glade
-
DISTCLEANFILES = \
$(desktop_DATA)
+
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
Property changes on: xfce4-settings/trunk/dialogs/keyboard-settings/Makefile.am
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: xfce4-settings/trunk/dialogs/keyboard-settings/main.c
===================================================================
--- xfce4-settings/trunk/dialogs/keyboard-settings/main.c 2008-07-13 18:36:34 UTC (rev 27278)
+++ xfce4-settings/trunk/dialogs/keyboard-settings/main.c 2008-07-13 19:24:20 UTC (rev 27279)
@@ -501,8 +501,8 @@
if (G_LIKELY (error))
{
/* print error */
- g_print ("xfce4-accessibility-settings: %s.\n", error->message);
- g_print (_("Type '%s --help' for usage."), "xfce4-accessibility-settings");
+ g_print ("%s: %s.\n", G_LOG_DOMAIN, error->message);
+ g_print (_("Type '%s --help' for usage."), G_LOG_DOMAIN);
g_print ("\n");
/* cleanup */
@@ -519,7 +519,7 @@
/* Print version information and quit when the user entered --version or -v */
if (G_UNLIKELY (opt_version))
{
- g_print ("xfce4-settings-helper %s\n\n", PACKAGE_VERSION);
+ g_print ("%s %s (Xfce %s)\n\n", G_LOG_DOMAIN, PACKAGE_VERSION, xfce_version_string ());
g_print ("%s\n", "Copyright (c) 2008");
g_print ("\t%s\n\n", _("The Xfce development team. All rights reserved."));
g_print (_("Please report bugs to <%s>."), PACKAGE_BUGREPORT);
Modified: xfce4-settings/trunk/dialogs/mouse-settings/Makefile.am
===================================================================
--- xfce4-settings/trunk/dialogs/mouse-settings/Makefile.am 2008-07-13 18:36:34 UTC (rev 27278)
+++ xfce4-settings/trunk/dialogs/mouse-settings/Makefile.am 2008-07-13 19:24:20 UTC (rev 27279)
@@ -1,7 +1,19 @@
-bin_PROGRAMS = xfce4-mouse-settings
+# $Id$
+
+INCLUDES = \
+ -I${top_srcdir} \
+ -DDATADIR=\"$(datadir)\" \
+ -DSRCDIR=\"$(top_srcdir)\" \
+ -DLOCALEDIR=\"$(localedir)\" \
+ -DG_LOG_DOMAIN=\"xfce4-mouse-settings\" \
+ $(PLATFORM_CPPFLAGS)
+
+bin_PROGRAMS = \
+ xfce4-mouse-settings
+
xfce4_mouse_settings_SOURCES = \
main.c \
- mouse-dialog-glade.h
+ mouse-dialog_glade.h
xfce4_mouse_settings_CFLAGS = \
$(GTK_CFLAGS) \
@@ -13,11 +25,12 @@
$(XI_CFLAGS) \
$(XCURSOR_CFLAGS) \
$(HAL_CFLAGS) \
- $(XFCONF_CFLAGS) \
- -DDATADIR=\"$(datadir)\" \
- -DSRCDIR=\"$(top_srcdir)\" \
- -DLOCALEDIR=\"$(localedir)\"
+ $(XFCONF_CFLAGS)
+xfce4_mouse_settings_LDFLAGS = \
+ -no-undefined \
+ $(PLATFORM_LDFLAGS)
+
xfce4_mouse_settings_LDADD = \
$(GTK_LIBS) \
$(GLIB_LIBS) \
@@ -29,16 +42,12 @@
$(XI_LIBS) \
$(XCURSOR_LIBS)
-INCLUDES = \
- -I${top_srcdir} \
- -DG_LOG_DOMAIN=\"Xfce4-mouse-settings\"
-
if MAINTAINER_MODE
BUILT_SOURCES = \
-mouse-dialog-glade.h
+ mouse-dialog_glade.h
-mouse-dialog-glade.h: mouse-dialog.glade
+mouse-dialog_glade.h: mouse-dialog.glade
exo-csource --static --name=mouse_dialog_glade $< >$@
endif
@@ -53,8 +62,10 @@
@INTLTOOL_DESKTOP_RULE@
EXTRA_DIST = \
- $(desktop_in_files) \
+ $(desktop_in_files) \
mouse-dialog.glade
DISTCLEANFILES = \
$(desktop_DATA)
+
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
Property changes on: xfce4-settings/trunk/dialogs/mouse-settings/Makefile.am
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: xfce4-settings/trunk/dialogs/mouse-settings/main.c
===================================================================
--- xfce4-settings/trunk/dialogs/mouse-settings/main.c 2008-07-13 18:36:34 UTC (rev 27278)
+++ xfce4-settings/trunk/dialogs/mouse-settings/main.c 2008-07-13 19:24:20 UTC (rev 27279)
@@ -50,7 +50,7 @@
#include <libxfce4util/libxfce4util.h>
#include <libxfcegui4/libxfcegui4.h>
-#include "mouse-dialog-glade.h"
+#include "mouse-dialog_glade.h"
@@ -1062,8 +1062,8 @@
if (G_LIKELY (error))
{
/* print error */
- g_print ("xfce4-mouse-settings: %s.\n", error->message);
- g_print (_("Type '%s --help' for usage."), "xfce4-mouse-settings");
+ g_print ("%s: %s.\n", G_LOG_DOMAIN, error->message);
+ g_print (_("Type '%s --help' for usage."), G_LOG_DOMAIN);
g_print ("\n");
/* cleanup */
@@ -1080,7 +1080,7 @@
/* print version information */
if (G_UNLIKELY (opt_version))
{
- g_print ("Xfce4-mouse-settings %s (Xfce %s)\n\n", PACKAGE_VERSION, xfce_version_string ());
+ g_print ("%s %s (Xfce %s)\n\n", G_LOG_DOMAIN, PACKAGE_VERSION, xfce_version_string ());
g_print ("%s\n", "Copyright (c) 2004-2008");
g_print ("\t%s\n\n", _("The Xfce development team. All rights reserved."));
g_print (_("Please report bugs to <%s>."), PACKAGE_BUGREPORT);
Modified: xfce4-settings/trunk/xfce4-settings-helper/Makefile.am
===================================================================
--- xfce4-settings/trunk/xfce4-settings-helper/Makefile.am 2008-07-13 18:36:34 UTC (rev 27278)
+++ xfce4-settings/trunk/xfce4-settings-helper/Makefile.am 2008-07-13 19:24:20 UTC (rev 27279)
@@ -1,69 +1,63 @@
# $Id$
-INCLUDES = \
- -I$(top_builddir) \
- -I$(top_srcdir) \
- -DBINDIR=\"$(bindir)\" \
- -DDATADIR=\"$(datadir)\" \
- -DG_LOG_DOMAIN=\"Xfce4-settings-helper\" \
- -DLIBDIR=\"$(libdir)\" \
- -DLIBEXECDIR=\"$(libexecdir)\" \
- -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
+INCLUDES = \
+ -I${top_srcdir} \
+ -DDATADIR=\"$(datadir)\" \
+ -DSRCDIR=\"$(top_srcdir)\" \
+ -DLOCALEDIR=\"$(localedir)\" \
+ -DG_LOG_DOMAIN=\"xfce4-settings-helper\" \
$(PLATFORM_CPPFLAGS)
-bin_PROGRAMS = \
+bin_PROGRAMS = \
xfce4-settings-helper
-xfce4_settings_helper_SOURCES = \
- main.c \
- accessx.c \
- accessx.h \
- xkb.c \
- xkb.h \
- pointers.c \
+xfce4_settings_helper_SOURCES = \
+ main.c \
+ accessx.c \
+ accessx.h \
+ xkb.c \
+ xkb.h \
+ pointers.c \
pointers.h
-xfce4_settings_helper_CFLAGS = \
- $(GTK_CFLAGS) \
- $(GLIB_CFLAGS) \
- $(GTHREAD_CFLAGS) \
- $(DBUS_GLIB_CFLAGS) \
- $(XFCONF_CFLAGS) \
- $(LIBXFCE4UTIL_CFLAGS) \
- $(XI_CFLAGS) \
+xfce4_settings_helper_CFLAGS = \
+ $(GTK_CFLAGS) \
+ $(GLIB_CFLAGS) \
+ $(GTHREAD_CFLAGS) \
+ $(DBUS_GLIB_CFLAGS) \
+ $(XFCONF_CFLAGS) \
+ $(LIBXFCE4UTIL_CFLAGS) \
+ $(XI_CFLAGS) \
$(LIBX11_CFLAGS)
-xfce4_settings_helper_LDFLAGS = \
- -no-undefined \
+xfce4_settings_helper_LDFLAGS = \
+ -no-undefined \
$(PLATFORM_LDFLAGS)
-xfce4_settings_helper_LDADD = \
- $(GTK_LIBS) \
- $(GLIB_LIBS) \
- $(GTHREAD_LIBS) \
- $(DBUS_GLIB_LIBS) \
- $(XFCONF_LIBS) \
- $(LIBXFCE4UTIL_LIBS) \
- $(XI_LIBS) \
+xfce4_settings_helper_LDADD = \
+ $(GTK_LIBS) \
+ $(GLIB_LIBS) \
+ $(GTHREAD_LIBS) \
+ $(DBUS_GLIB_LIBS) \
+ $(XFCONF_LIBS) \
+ $(LIBXFCE4UTIL_LIBS) \
+ $(XI_LIBS) \
$(LIBX11_LIBS)
if HAVE_LIBNOTIFY
-xfce4_settings_helper_CFLAGS += \
+xfce4_settings_helper_CFLAGS += \
$(LIBNOTIFY_CFLAGS)
-xfce4_settings_helper_LDADD += \
+xfce4_settings_helper_LDADD += \
$(LIBNOTIFY_LIBS)
endif
if HAVE_HAL
-xfce4_settings_helper_CFLAGS += \
+xfce4_settings_helper_CFLAGS += \
$(HAL_CFLAGS)
-xfce4_settings_helper_LDADD += \
+xfce4_settings_helper_LDADD += \
$(HAL_LIBS)
endif
-clean-local:
- rm -f *.core core core.*
-
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
Property changes on: xfce4-settings/trunk/xfce4-settings-helper/Makefile.am
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: xfce4-settings/trunk/xfce4-settings-helper/main.c
===================================================================
--- xfce4-settings/trunk/xfce4-settings-helper/main.c 2008-07-13 18:36:34 UTC (rev 27278)
+++ xfce4-settings/trunk/xfce4-settings-helper/main.c 2008-07-13 19:24:20 UTC (rev 27279)
@@ -62,7 +62,7 @@
pid_t pid;
/* setup translation domain */
- xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
+ xfce_textdomain (GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
/* initialize the gthread system */
if (!g_thread_supported ())
@@ -74,8 +74,8 @@
if (G_LIKELY (error))
{
/* print error */
- g_print ("xfce4-settings-helper: %s.\n", error->message);
- g_print (_("Type '%s --help' for usage."), "xfce4-settings-helper");
+ g_print ("%s: %s.\n", G_LOG_DOMAIN, error->message);
+ g_print (_("Type '%s --help' for usage."), G_LOG_DOMAIN);
g_print ("\n");
/* cleanup */
@@ -92,7 +92,7 @@
/* check if we should print version information */
if (G_UNLIKELY (opt_version))
{
- g_print ("xfce4-settings-helper %s\n\n", PACKAGE_VERSION);
+ g_print ("%s %s (Xfce %s)\n\n", G_LOG_DOMAIN, PACKAGE_VERSION, xfce_version_string ());
g_print ("%s\n", "Copyright (c) 2008");
g_print ("\t%s\n\n", _("The Xfce development team. All rights reserved."));
g_print (_("Please report bugs to <%s>."), PACKAGE_BUGREPORT);
Modified: xfce4-settings/trunk/xfce4-settings-manager/Makefile.am
===================================================================
--- xfce4-settings/trunk/xfce4-settings-manager/Makefile.am 2008-07-13 18:36:34 UTC (rev 27278)
+++ xfce4-settings/trunk/xfce4-settings-manager/Makefile.am 2008-07-13 19:24:20 UTC (rev 27279)
@@ -1,23 +1,37 @@
-bin_PROGRAMS = xfce4-settings-manager
+# $Id$
INCLUDES = \
+ -I${top_srcdir} \
+ -DDATADIR=\"$(datadir)\" \
+ -DSRCDIR=\"$(top_srcdir)\" \
-DLOCALEDIR=\"$(localedir)\" \
+ -DG_LOG_DOMAIN=\"xfce4-settings-manager\" \
+ $(PLATFORM_CPPFLAGS)
+
+bin_PROGRAMS = \
+ xfce4-settings-manager
+
+xfce4_settings_manager_SOURCES = \
+ main.c \
+ xfce-settings-manager-dialog.c \
+ xfce-settings-manager-dialog.h
+
+xfce4_settings_manager_CFLAGS = \
$(GTK_CFLAGS) \
$(LIBXFCE4UTIL_CFLAGS) \
$(LIBXFCEGUI4_CFLAGS) \
$(EXO_CFLAGS)
-LIBS = \
+xfce4_settings_manager_LDFLAGS = \
+ -no-undefined \
+ $(PLATFORM_LDFLAGS)
+
+xfce4_settings_manager_LDADD = \
$(GTK_LIBS) \
$(LIBXFCE4UTIL_LIBS) \
$(LIBXFCEGUI4_LIBS) \
$(EXO_LIBS)
-xfce4_settings_manager_SOURCES = \
- main.c \
- xfce-settings-manager-dialog.c \
- xfce-settings-manager-dialog.h
-
desktopdir = $(datadir)/applications
desktop_in_files = xfce-settings-manager.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@@ -29,3 +43,5 @@
DISTCLEANFILES = \
$(desktop_DATA)
+
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
Property changes on: xfce4-settings/trunk/xfce4-settings-manager/Makefile.am
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: xfce4-settings/trunk/xfce4-settings-manager/main.c
===================================================================
--- xfce4-settings/trunk/xfce4-settings-manager/main.c 2008-07-13 18:36:34 UTC (rev 27278)
+++ xfce4-settings/trunk/xfce4-settings-manager/main.c 2008-07-13 19:24:20 UTC (rev 27279)
@@ -49,8 +49,8 @@
if(!gtk_init_with_args(&argc, &argv, "", option_entries, GETTEXT_PACKAGE, &error)) {
if(G_LIKELY(error)) {
- g_print("xfce4-settings-manager: %s.\n", error->message);
- g_print(_("Type '%s --help' for usage."), "xfce4-settings-manager");
+ g_print("%s: %s.\n", G_LOG_DOMAIN, error->message);
+ g_print(_("Type '%s --help' for usage."), G_LOG_DOMAIN);
g_print("\n");
g_error_free(error);
@@ -61,7 +61,7 @@
}
if (G_UNLIKELY (opt_version)) {
- g_print("xfce4-settings-manager %s\n\n", PACKAGE_VERSION);
+ g_print("%s %s (Xfce %s)\n\n", G_LOG_DOMAIN, PACKAGE_VERSION, xfce_version_string ());
g_print("%s\n", "Copyright (c) 2008");
g_print("\t%s\n\n", _("The Xfce development team. All rights reserved."));
g_print(_("Please report bugs to <%s>."), PACKAGE_BUGREPORT);
More information about the Xfce4-commits
mailing list