diff options
Diffstat (limited to 'command/src')
| -rw-r--r-- | command/src/Makefile.am | 33 | ||||
| -rw-r--r-- | command/src/command.c | 14 |
2 files changed, 33 insertions, 14 deletions
diff --git a/command/src/Makefile.am b/command/src/Makefile.am index 3497672d..b8a20cc1 100644 --- a/command/src/Makefile.am +++ b/command/src/Makefile.am @@ -1,27 +1,41 @@ NULL = -command_applet_libdir= $(pkglibdir) -command_applet_lib_LTLIBRARIES=libcommand-applet.la - AM_CPPFLAGS = \ + $(WARN_FLAGS) \ $(MATE_APPLETS4_CFLAGS) \ -I$(srcdir) \ $(DISABLE_DEPRECATED_CFLAGS) \ $(NULL) - -libcommand_applet_la_SOURCES = \ - command.c \ - ma-command.c \ - ma-command.h \ +BUILT_SOURCES = \ command-resources.c \ command-resources.h \ $(NULL) +APPLET_SOURCES = \ + command.c \ + ma-command.c \ + ma-command.h \ + $(NULL) -libcommand_applet_la_LIBADD = \ +APPLET_LIBS = \ $(MATE_APPLETS4_LIBS) \ $(NULL) +if ENABLE_IN_PROCESS +pkglib_LTLIBRARIES = libcommand-applet.la +nodist_libcommand_applet_la_SOURCES = $(BUILT_SOURCES) +libcommand_applet_la_SOURCES = $(APPLET_SOURCES) +libcommand_applet_la_CFLAGS = $(AM_CFLAGS) +libcommand_applet_la_LDFLAGS = -module -avoid-version +libcommand_applet_la_LIBADD = $(APPLET_LIBS) +else !ENABLE_IN_PROCESS +libexec_PROGRAMS = command-applet +nodist_command_applet_SOURCES = $(BUILT_SOURCES) +command_applet_SOURCES = $(APPLET_SOURCES) +command_applet_CFLAGS = $(AM_CFLAGS) +command_applet_LDADD = $(APPLET_LIBS) +endif !ENABLE_IN_PROCESS + command-resources.c: $(srcdir)/../data/command-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../data --generate-dependencies $(srcdir)/../data/command-resources.gresource.xml) $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data --generate --c-name command $< @@ -29,6 +43,7 @@ command-resources.h: $(srcdir)/../data/command-resources.gresource.xml $(shell $ $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data --generate --c-name command $< CLEANFILES = \ + $(BUILT_SOURCES) $(NULL) -include $(top_srcdir)/git.mk diff --git a/command/src/command.c b/command/src/command.c index cc751349..c4ff027a 100644 --- a/command/src/command.c +++ b/command/src/command.c @@ -418,6 +418,10 @@ command_applet_fill (MatePanelApplet* applet) CommandApplet *command_applet; AtkObject *atk_widget; +#ifndef ENABLE_IN_PROCESS + g_set_application_name (_("Command Applet")); +#endif + gtk_window_set_default_icon_name (APPLET_ICON); mate_panel_applet_set_flags (applet, MATE_PANEL_APPLET_EXPAND_MINOR); @@ -506,8 +510,8 @@ command_factory (MatePanelApplet* applet, const char* iid, gpointer data) } /* needed by mate-panel applet library */ -MATE_PANEL_APPLET_IN_PROCESS_FACTORY("CommandAppletFactory", - PANEL_TYPE_APPLET, - "Command applet", - command_factory, - NULL) +PANEL_APPLET_FACTORY ("CommandAppletFactory", + PANEL_TYPE_APPLET, + "Command applet", + command_factory, + NULL) |