summaryrefslogtreecommitdiff
path: root/drivemount/src
diff options
context:
space:
mode:
Diffstat (limited to 'drivemount/src')
-rw-r--r--drivemount/src/Makefile.am21
-rw-r--r--drivemount/src/drivemount.c4
2 files changed, 8 insertions, 17 deletions
diff --git a/drivemount/src/Makefile.am b/drivemount/src/Makefile.am
index 28b273c0..a5b60c1e 100644
--- a/drivemount/src/Makefile.am
+++ b/drivemount/src/Makefile.am
@@ -1,5 +1,8 @@
NULL =
+mate_drivemount_applet_libdir= $(pkglibdir)
+mate_drivemount_applet_lib_LTLIBRARIES=libmate-drivemount-applet.la
+
AM_CPPFLAGS = \
-I. \
-I$(srcdir) \
@@ -8,26 +11,17 @@ AM_CPPFLAGS = \
$(MATE_APPLETS4_CFLAGS) \
$(NULL)
-libexec_PROGRAMS = mate-drivemount-applet
-
-BUILT_SOURCES = \
- drivemount-resources.c \
- drivemount-resources.h \
- $(NULL)
-
-nodist_mate_drivemount_applet_SOURCES = \
- $(BUILT_SOURCES) \
- $(NULL)
-
-mate_drivemount_applet_SOURCES = \
+libmate_drivemount_applet_la_SOURCES = \
drivemount.c \
drive-list.c \
drive-list.h \
drive-button.c \
drive-button.h \
+ drivemount-resources.c \
+ drivemount-resources.h \
$(NULL)
-mate_drivemount_applet_LDADD = \
+libmate_drivemount_applet_la_LIBADD = \
$(MATE_APPLETS4_LIBS)
drivemount-resources.c: ../data/drivemount-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../data/ --generate-dependencies $(srcdir)/../data/drivemount-resources.gresource.xml)
@@ -37,7 +31,6 @@ drivemount-resources.h: ../data/drivemount-resources.gresource.xml $(shell $(GLI
$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data/ --generate --c-name drivemount $<
CLEANFILES = \
- $(BUILT_SOURCES) \
$(NULL)
-include $(top_srcdir)/git.mk
diff --git a/drivemount/src/drivemount.c b/drivemount/src/drivemount.c
index a425237b..6b10f9fa 100644
--- a/drivemount/src/drivemount.c
+++ b/drivemount/src/drivemount.c
@@ -179,8 +179,6 @@ applet_factory (MatePanelApplet *applet,
GtkActionGroup *action_group;
if (!strcmp (iid, drivemount_iid)) {
- g_set_application_name (_("Disk Mounter"));
-
gtk_window_set_default_icon_name ("media-floppy");
mate_panel_applet_set_flags (applet, MATE_PANEL_APPLET_EXPAND_MINOR);
@@ -223,7 +221,7 @@ applet_factory (MatePanelApplet *applet,
return ret;
}
-MATE_PANEL_APPLET_OUT_PROCESS_FACTORY (factory_iid,
+MATE_PANEL_APPLET_IN_PROCESS_FACTORY (factory_iid,
PANEL_TYPE_APPLET,
"Drive-Mount-Applet",
applet_factory, NULL)