multiload: Use common subdirs - src, data

author: rbuj <[email protected]> 2020-12-02 09:54:00 +0100
committer: raveit65 <[email protected]> 2020-12-13 15:45:33 +0100
commit: 61e25238728dd5cb9922932a5b7279eb6cdb15da (patch)
tree: 07c73bb9d083054c0d71d0a19e019d6f5ab5c710
parent: 3cf85cb5229c3e87fed2f926004fed724e94e8cb (diff)
download: mate-applets-61e25238728dd5cb9922932a5b7279eb6cdb15da.tar.bz2
mate-applets-61e25238728dd5cb9922932a5b7279eb6cdb15da.tar.xz
20 files changed, 87 insertions, 79 deletions
diff --git a/configure.ac b/configure.ac
index 7b5df13c..3e5884dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -564,8 +564,10 @@ drivemount/data/org.mate.drivemount.gschema.xml
 drivemount/help/Makefile
 drivemount/src/Makefile
 multiload/Makefile
-multiload/org.mate.panel.applet.multiload.gschema.xml
+multiload/data/Makefile
+multiload/data/org.mate.panel.applet.multiload.gschema.xml
 multiload/docs/Makefile
+multiload/src/Makefile
 charpick/Makefile
 charpick/org.mate.panel.applet.charpick.gschema.xml
 charpick/help/Makefile
diff --git a/multiload/Makefile.am b/multiload/Makefile.am
index ae48940a..576d2297 100644
--- a/multiload/Makefile.am
+++ b/multiload/Makefile.am
@@ -1,68 +1,3 @@
-SUBDIRS = docs
-
-AM_CPPFLAGS = \
- -I$(srcdir) \
- -DMULTILOAD_MENU_UI_DIR=\""$(uidir)"\" \
- $(MATE_APPLETS4_CFLAGS) \
- $(GTOP_APPLETS_CFLAGS) \
- $(GIO_CFLAGS) \
- ${WARN_CFLAGS}
-
-libexec_PROGRAMS = mate-multiload-applet
-
-mate_multiload_applet_SOURCES = \
- global.h \
- linux-proc.h \
- load-graph.h \
- linux-proc.c \
- load-graph.c \
- main.c \
- properties.c \
- netspeed.c netspeed.h \
- autoscaler.c \
- autoscaler.h
-
-mate_multiload_applet_LDADD = \
- $(MATE_APPLETS4_LIBS) \
- $(GTOP_APPLETS_LIBS) \
- $(GIO_LIBS) \
- -lm
-
-multiload_gschema_in_files = org.mate.panel.applet.multiload.gschema.xml.in
-gsettings_SCHEMAS = $(multiload_gschema_in_files:.xml.in=.xml)
-@GSETTINGS_RULES@
-
-EXTRA_DIST = \
- $(applet_in_files).in \
- $(service_in_files) \
- $(multiload_gschema_in_files) \
- $(ui_DATA)
-
-uidir = $(datadir)/mate/ui
-ui_DATA = multiload-applet-menu.xml
-
-appletdir = $(datadir)/mate-panel/applets
-applet_in_files = org.mate.applets.MultiLoadApplet.mate-panel-applet.desktop.in
-applet_DATA = $(applet_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet)
-
-$(applet_in_files): $(applet_in_files).in Makefile
- $(AM_V_GEN)sed \
- -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
- -e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \
- $< > $@
-
-$(applet_DATA): $(applet_in_files) Makefile
- $(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
-
-servicedir = $(datadir)/dbus-1/services
-service_in_files = org.mate.panel.applet.MultiLoadAppletFactory.service.in
-service_DATA = $(service_in_files:.service.in=.service)
-
-org.mate.panel.applet.MultiLoadAppletFactory.service: $(service_in_files)
- $(AM_V_GEN)sed \
- -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
- $< > $@
-
-CLEANFILES = $(applet_DATA) $(applet_in_files) $(service_DATA) $(gsettings_SCHEMAS) *.gschema.valid
+SUBDIRS = docs data src
 
 -include $(top_srcdir)/git.mk
diff --git a/multiload/data/Makefile.am b/multiload/data/Makefile.am
new file mode 100644
index 00000000..bacb6f1e
--- /dev/null
+++ b/multiload/data/Makefile.am
@@ -0,0 +1,44 @@
+multiload_gschema_in_files = org.mate.panel.applet.multiload.gschema.xml.in
+gsettings_SCHEMAS = $(multiload_gschema_in_files:.xml.in=.xml)
+@GSETTINGS_RULES@
+
+uidir = $(datadir)/mate/ui
+ui_DATA = multiload-applet-menu.xml
+
+appletdir = $(datadir)/mate-panel/applets
+applet_in_in_files = org.mate.applets.MultiLoadApplet.mate-panel-applet.desktop.in.in
+applet_in_files = $(applet_in_in_files:.desktop.in.in=.desktop.in)
+applet_DATA = $(applet_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet)
+
+$(applet_in_files): $(applet_in_files).in Makefile
+ $(AM_V_GEN)sed \
+ -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
+ -e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \
+ $< > $@
+
+$(applet_DATA): $(applet_in_files) Makefile
+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
+
+servicedir = $(datadir)/dbus-1/services
+service_in_files = org.mate.panel.applet.MultiLoadAppletFactory.service.in
+service_DATA = $(service_in_files:.service.in=.service)
+
+org.mate.panel.applet.MultiLoadAppletFactory.service: $(service_in_files)
+ $(AM_V_GEN)sed \
+ -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
+ $< > $@
+
+CLEANFILES = \
+ $(applet_DATA) \
+ $(applet_in_files) \
+ $(service_DATA) \
+ $(gsettings_SCHEMAS) \
+ *.gschema.valid
+
+EXTRA_DIST = \
+ $(applet_in_in_files) \
+ $(service_in_files) \
+ $(multiload_gschema_in_files) \
+ $(ui_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/multiload/multiload-applet-menu.xml b/multiload/data/multiload-applet-menu.xml
index 88d28dd9..88d28dd9 100644
--- a/multiload/multiload-applet-menu.xml
+++ b/multiload/data/multiload-applet-menu.xml
diff --git a/multiload/org.mate.applets.MultiLoadApplet.mate-panel-applet.desktop.in.in b/multiload/data/org.mate.applets.MultiLoadApplet.mate-panel-applet.desktop.in.in
index 3eacb2fb..3eacb2fb 100644
--- a/multiload/org.mate.applets.MultiLoadApplet.mate-panel-applet.desktop.in.in
+++ b/multiload/data/org.mate.applets.MultiLoadApplet.mate-panel-applet.desktop.in.in
diff --git a/multiload/org.mate.panel.applet.MultiLoadAppletFactory.service.in b/multiload/data/org.mate.panel.applet.MultiLoadAppletFactory.service.in
index d4c7da3c..d4c7da3c 100644
--- a/multiload/org.mate.panel.applet.MultiLoadAppletFactory.service.in
+++ b/multiload/data/org.mate.panel.applet.MultiLoadAppletFactory.service.in
diff --git a/multiload/org.mate.panel.applet.multiload.gschema.xml.in b/multiload/data/org.mate.panel.applet.multiload.gschema.xml.in
index 9f199bc3..9f199bc3 100644
--- a/multiload/org.mate.panel.applet.multiload.gschema.xml.in
+++ b/multiload/data/org.mate.panel.applet.multiload.gschema.xml.in
diff --git a/multiload/src/Makefile.am b/multiload/src/Makefile.am
new file mode 100644
index 00000000..ab0ab6fd
--- /dev/null
+++ b/multiload/src/Makefile.am
@@ -0,0 +1,29 @@
+AM_CPPFLAGS = \
+ -I$(srcdir) \
+ -DMULTILOAD_MENU_UI_DIR=\""$(datadir)/mate/ui/"\" \
+ $(MATE_APPLETS4_CFLAGS) \
+ $(GTOP_APPLETS_CFLAGS) \
+ $(GIO_CFLAGS) \
+ ${WARN_CFLAGS}
+
+libexec_PROGRAMS = mate-multiload-applet
+
+mate_multiload_applet_SOURCES = \
+ global.h \
+ linux-proc.h \
+ load-graph.h \
+ linux-proc.c \
+ load-graph.c \
+ main.c \
+ properties.c \
+ netspeed.c netspeed.h \
+ autoscaler.c \
+ autoscaler.h
+
+mate_multiload_applet_LDADD = \
+ $(MATE_APPLETS4_LIBS) \
+ $(GTOP_APPLETS_LIBS) \
+ $(GIO_LIBS) \
+ -lm
+
+-include $(top_srcdir)/git.mk
diff --git a/multiload/autoscaler.c b/multiload/src/autoscaler.c
index 735b2713..735b2713 100644
--- a/multiload/autoscaler.c
+++ b/multiload/src/autoscaler.c
diff --git a/multiload/autoscaler.h b/multiload/src/autoscaler.h
index d0ae4cd6..d0ae4cd6 100644
--- a/multiload/autoscaler.h
+++ b/multiload/src/autoscaler.h
diff --git a/multiload/global.h b/multiload/src/global.h
index da3383c4..da3383c4 100644
--- a/multiload/global.h
+++ b/multiload/src/global.h
diff --git a/multiload/linux-proc.c b/multiload/src/linux-proc.c
index 6059e9e3..6059e9e3 100644
--- a/multiload/linux-proc.c
+++ b/multiload/src/linux-proc.c
diff --git a/multiload/linux-proc.h b/multiload/src/linux-proc.h
index 0aba1a0e..0aba1a0e 100644
--- a/multiload/linux-proc.h
+++ b/multiload/src/linux-proc.h
diff --git a/multiload/load-graph.c b/multiload/src/load-graph.c
index 953dc5b2..953dc5b2 100644
--- a/multiload/load-graph.c
+++ b/multiload/src/load-graph.c
diff --git a/multiload/load-graph.h b/multiload/src/load-graph.h
index 76effcd6..76effcd6 100644
--- a/multiload/load-graph.h
+++ b/multiload/src/load-graph.h
diff --git a/multiload/main.c b/multiload/src/main.c
index 7c2886f8..50732e01 100644
--- a/multiload/main.c
+++ b/multiload/src/main.c
@@ -484,7 +484,6 @@ multiload_applet_new(MatePanelApplet *applet, const gchar *iid, gpointer data)
 MultiloadApplet *ma;
 GSettings *lockdown_settings;
 GtkActionGroup *action_group;
- gchar *ui_path;
 
 context = gtk_widget_get_style_context (GTK_WIDGET (applet));
 gtk_style_context_add_class (context, "multiload-applet");
@@ -510,10 +509,9 @@ multiload_applet_new(MatePanelApplet *applet, const gchar *iid, gpointer data)
 multiload_menu_actions,
 G_N_ELEMENTS (multiload_menu_actions),
 ma);
- ui_path = g_build_filename (MULTILOAD_MENU_UI_DIR, "multiload-applet-menu.xml", NULL);
- mate_panel_applet_setup_menu_from_file (applet, ui_path, action_group);
- g_free (ui_path);
-
+ mate_panel_applet_setup_menu_from_file (applet,
+ MULTILOAD_MENU_UI_DIR "multiload-applet-menu.xml",
+ action_group);
 
 if (mate_panel_applet_get_locked_down (applet)) {
 GtkAction *action;
diff --git a/multiload/netspeed.c b/multiload/src/netspeed.c
index 3e889c8f..3e889c8f 100644
--- a/multiload/netspeed.c
+++ b/multiload/src/netspeed.c
diff --git a/multiload/netspeed.h b/multiload/src/netspeed.h
index 5bc19cf1..5bc19cf1 100644
--- a/multiload/netspeed.h
+++ b/multiload/src/netspeed.h
diff --git a/multiload/properties.c b/multiload/src/properties.c
index c1ee09b6..c1ee09b6 100644
--- a/multiload/properties.c
+++ b/multiload/src/properties.c
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3f85ec69..aa7d1bc8 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -42,13 +42,13 @@ mateweather/mateweather-pref.c
 mateweather/main.c
 mateweather/org.mate.applets.MateWeatherApplet.mate-panel-applet.desktop.in.in
 # NB. these are actually separate files
-multiload/linux-proc.c
-multiload/load-graph.c
-multiload/main.c
-multiload/netspeed.c
-multiload/org.mate.applets.MultiLoadApplet.mate-panel-applet.desktop.in.in
-multiload/org.mate.panel.applet.multiload.gschema.xml.in
-multiload/properties.c
+multiload/data/org.mate.applets.MultiLoadApplet.mate-panel-applet.desktop.in.in
+multiload/data/org.mate.panel.applet.multiload.gschema.xml.in
+multiload/src/linux-proc.c
+multiload/src/load-graph.c
+multiload/src/main.c
+multiload/src/netspeed.c
+multiload/src/properties.c
 netspeed/data/netspeed-details.ui
 netspeed/data/netspeed-preferences.ui
 netspeed/data/org.mate.panel.applet.netspeed.gschema.xml.in
author	rbuj <[email protected]>	2020-12-02 09:54:00 +0100
committer	raveit65 <[email protected]>	2020-12-13 15:45:33 +0100
commit	61e25238728dd5cb9922932a5b7279eb6cdb15da (patch)
tree	07c73bb9d083054c0d71d0a19e019d6f5ab5c710
parent	3cf85cb5229c3e87fed2f926004fed724e94e8cb (diff)
download	mate-applets-61e25238728dd5cb9922932a5b7279eb6cdb15da.tar.bz2 mate-applets-61e25238728dd5cb9922932a5b7279eb6cdb15da.tar.xz