diff options
Diffstat (limited to 'timerapplet/src')
| -rw-r--r-- | timerapplet/src/Makefile.am | 33 | ||||
| -rw-r--r-- | timerapplet/src/timerapplet.c | 13 |
2 files changed, 32 insertions, 14 deletions
diff --git a/timerapplet/src/Makefile.am b/timerapplet/src/Makefile.am index 5341cc16..75688baa 100644 --- a/timerapplet/src/Makefile.am +++ b/timerapplet/src/Makefile.am @@ -1,8 +1,5 @@ NULL = -mate_timer_applet_libdir= $(pkglibdir) -mate_timer_applet_lib_LTLIBRARIES=libmate-timer-applet.la - AM_CPPFLAGS = \ $(MATE_APPLETS4_CFLAGS) \ $(LIBNOTIFY_CFLAGS) \ @@ -10,18 +7,35 @@ AM_CPPFLAGS = \ $(DISABLE_DEPRECATED_CFLAGS) \ $(NULL) -libmate_timer_applet_la_SOURCES = \ - timerapplet.c \ - timerapplet-resources.c \ - timerapplet-resources.h \ +AM_CFLAGS = $(WARN_CFLAGS) + +BUILT_SOURCES = \ + timerapplet-resources.c \ + timerapplet-resources.h \ + $(NULL) +APPLET_SOURCES = \ + timerapplet.c \ $(NULL) -libmate_timer_applet_la_LIBADD = \ +APPLET_LIBS = \ $(MATE_APPLETS4_LIBS) \ $(LIBNOTIFY_LIBS) \ $(NULL) -libmate_timer_applet_la_CFLAGS = $(WARN_CFLAGS) +if ENABLE_IN_PROCESS +pkglib_LTLIBRARIES = libmate-timer-applet.la +nodist_libmate_timer_applet_la_SOURCES = $(BUILT_SOURCES) +libmate_timer_applet_la_SOURCES = $(APPLET_SOURCES) +libmate_timer_applet_la_CFLAGS = $(AM_CFLAGS) +libmate_timer_applet_la_LDFLAGS = -module -avoid-version +libmate_timer_applet_la_LIBADD = $(APPLET_LIBS) +else !ENABLE_IN_PROCESS +libexec_PROGRAMS = timer-applet +nodist_timer_applet_SOURCES = $(BUILT_SOURCES) +timer_applet_SOURCES = $(APPLET_SOURCES) +timer_applet_CFLAGS = $(AM_CFLAGS) +timer_applet_LDADD = $(APPLET_LIBS) +endif !ENABLE_IN_PROCESS timerapplet-resources.c: $(srcdir)/../data/timerapplet-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../data --generate-dependencies $(srcdir)/../data/timerapplet-resources.gresource.xml) $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data --generate --c-name timerapplet $< @@ -30,6 +44,7 @@ timerapplet-resources.h: $(srcdir)/../data/timerapplet-resources.gresource.xml $ $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data --generate --c-name timerapplet $< CLEANFILES = \ + $(BUILT_SOURCES) \ $(NULL) -include $(top_srcdir)/git.mk diff --git a/timerapplet/src/timerapplet.c b/timerapplet/src/timerapplet.c index f2fcfc1e..2c397b16 100644 --- a/timerapplet/src/timerapplet.c +++ b/timerapplet/src/timerapplet.c @@ -376,6 +376,9 @@ timer_applet_fill (MatePanelApplet* applet_widget) TimerApplet *applet; AtkObject *atk_obj; +#ifndef ENABLE_IN_PROCESS + g_set_application_name (_("Timer Applet")); +#endif gtk_window_set_default_icon_name (APPLET_ICON); if (!notify_is_initted ()) @@ -456,8 +459,8 @@ timer_factory (MatePanelApplet* applet, const char* iid, gpointer data) } /* needed by mate-panel applet library */ -MATE_PANEL_APPLET_IN_PROCESS_FACTORY("TimerAppletFactory", - PANEL_TYPE_APPLET, - "Timer applet", - timer_factory, - NULL) +PANEL_APPLET_FACTORY ("TimerAppletFactory", + PANEL_TYPE_APPLET, + "Timer applet", + timer_factory, + NULL) |