Commit 4800ad3a authored by Pierre Wieser's avatar Pierre Wieser

Rename binaries to fma-xxx, moving them all to libexecdir/

parent 6698a533
......@@ -152,6 +152,7 @@ AC_CONFIG_FILES([
src/test/Makefile
src/ui/Makefile
src/utils/Makefile
src/utils/fma-gconf2key.sh
test/Makefile
test/plugman/Makefile
])
......
......@@ -30,15 +30,12 @@ NA_UTILS_LDADD = \
$(NAUTILUS_ACTIONS_LIBS) \
$(NULL)
bin_PROGRAMS = \
nautilus-actions-new \
nautilus-actions-print \
nautilus-actions-run \
$(NULL)
pkglibexec_PROGRAMS = \
na-print-schemas \
na-set-conf \
fma-new \
fma-print \
fma-print-schemas \
fma-run \
fma-set-conf \
$(NULL)
AM_CPPFLAGS += \
......@@ -49,23 +46,23 @@ AM_CPPFLAGS += \
$(NAUTILUS_ACTIONS_CFLAGS) \
$(NULL)
nautilus_actions_new_SOURCES = \
nautilus-actions-new.c \
fma_new_SOURCES = \
fma-new.c \
console-utils.c \
console-utils.h \
$(NULL)
nautilus_actions_new_LDADD = \
fma_new_LDADD = \
$(NA_UTILS_LDADD) \
$(NULL)
nautilus_actions_print_SOURCES = \
nautilus-actions-print.c \
fma_print_SOURCES = \
fma-print.c \
console-utils.c \
console-utils.h \
$(NULL)
nautilus_actions_print_LDADD = \
fma_print_LDADD = \
$(NA_UTILS_LDADD) \
$(NULL)
......@@ -84,37 +81,37 @@ fma-run-bindings.c fma-run-bindings.h: $(top_srcdir)/src/plugin-tracker/fma-trac
--c-generate-object-manager \
$<
nodist_nautilus_actions_run_SOURCES = \
nodist_fma_run_SOURCES = \
$(BUILT_SOURCES) \
$(NULL)
nautilus_actions_run_SOURCES = \
nautilus-actions-run.c \
fma_run_SOURCES = \
fma-run.c \
console-utils.c \
console-utils.h \
$(NULL)
nautilus_actions_run_LDADD = \
fma_run_LDADD = \
$(NA_UTILS_LDADD) \
$(NULL)
na_print_schemas_SOURCES = \
na-print-schemas.c \
fma_print_schemas_SOURCES = \
fma-print-schemas.c \
console-utils.c \
console-utils.h \
$(NULL)
na_print_schemas_LDADD = \
fma_print_schemas_LDADD = \
$(NA_UTILS_LDADD) \
$(NULL)
na_set_conf_SOURCES = \
na-set-conf.c \
fma_set_conf_SOURCES = \
fma-set-conf.c \
console-utils.c \
console-utils.h \
$(NULL)
na_set_conf_LDADD = \
fma_set_conf_LDADD = \
$(NA_UTILS_LDADD) \
$(NULL)
......@@ -130,21 +127,21 @@ CLEANFILES = \
if HAVE_GCONF
pkglibexec_PROGRAMS += \
na-delete-xmltree \
fma-delete-xmltree \
$(NULL)
na_delete_xmltree_SOURCES = \
na-delete-xmltree.c \
fma_delete_xmltree_SOURCES = \
fma-delete-xmltree.c \
console-utils.c \
console-utils.h \
$(NULL)
na_delete_xmltree_LDADD = \
fma_delete_xmltree_LDADD = \
$(NA_UTILS_LDADD) \
$(NULL)
pkglibexec_SCRIPTS = \
fma-gconf2key.sh \
fma-gconf2key.sh \
$(NULL)
do_subst = sed \
......
......@@ -27,8 +27,8 @@
* ... and many others (see AUTHORS)
*/
#ifndef __CONSOLE_UTILS_H__
#define __CONSOLE_UTILS_H__
#ifndef __UTILS_CONSOLE_UTILS_H__
#define __UTILS_CONSOLE_UTILS_H__
/**
* SECTION: console-utils
......@@ -47,4 +47,4 @@ void console_init_log_handler( void );
G_END_DECLS
#endif /* __CONSOLE_UTILS_H__ */
#endif /* __UTILS_CONSOLE_UTILS_H__ */
......@@ -353,8 +353,10 @@ init_options( void )
g_option_context_set_summary( context, _(
"The created action defaults to be written to stdout.\n"
"It can also be written to an output folder, in a file later suitable for an import in NACT.\n"
"Or you may choose to directly write the action into your FileManager-Actions configuration." ));
"It can also be written to an output folder, "
"in a file later suitable for an import in user configuration tool.\n"
"Or you may choose to directly write the action as a .desktop file "
"into your FileManager-Actions configuration." ));
g_option_context_set_translation_domain( context, GETTEXT_PACKAGE );
......
......@@ -58,7 +58,7 @@ static GOptionEntry entries[] = {
{ "id" , 'i', 0, G_OPTION_ARG_STRING , &id,
N_( "The internal identifier of the action to be launched" ), N_( "<STRING>" ) },
{ "target" , 't', 0, G_OPTION_ARG_FILENAME_ARRAY, &targets_array,
N_( "A target, file or folder, for the action. More than one options may be specified" ), N_( "<URI>" ) },
N_( "A target, file or folder, for the action. More than one target may be specified" ), N_( "<URI>" ) },
{ NULL }
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment