diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | po/POTFILES.in | 4 | ||||
| -rw-r--r-- | trashapplet/Makefile.am | 33 | ||||
| -rw-r--r-- | trashapplet/data/Makefile.am | 32 | ||||
| -rw-r--r-- | trashapplet/data/org.mate.applets.TrashApplet.mate-panel-applet.desktop.in.in (renamed from trashapplet/org.mate.applets.TrashApplet.mate-panel-applet.desktop.in.in) | 0 | ||||
| -rw-r--r-- | trashapplet/data/org.mate.panel.applet.TrashAppletFactory.service.in (renamed from trashapplet/org.mate.panel.applet.TrashAppletFactory.service.in) | 0 | ||||
| -rw-r--r-- | trashapplet/data/trashapplet-empty-progress.ui (renamed from trashapplet/trashapplet-empty-progress.ui) | 0 | ||||
| -rw-r--r-- | trashapplet/data/trashapplet-menu.xml (renamed from trashapplet/trashapplet-menu.xml) | 0 | ||||
| -rw-r--r-- | trashapplet/data/trashapplet-resources.gresource.xml (renamed from trashapplet/trashapplet-resources.gresource.xml) | 0 | ||||
| -rw-r--r-- | trashapplet/src/Makefile.am | 8 |
10 files changed, 40 insertions, 38 deletions
diff --git a/configure.ac b/configure.ac index ef62a368..3c9e7b46 100644 --- a/configure.ac +++ b/configure.ac @@ -594,6 +594,7 @@ stickynotes/org.mate.stickynotes.gschema.xml stickynotes/pixmaps/Makefile stickynotes/docs/Makefile trashapplet/Makefile +trashapplet/data/Makefile trashapplet/src/Makefile trashapplet/docs/Makefile cpufreq/Makefile diff --git a/po/POTFILES.in b/po/POTFILES.in index 621aebc8..4c1e044e 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -72,7 +72,7 @@ timerapplet/data/org.mate.applets.TimerApplet.mate-panel-applet.desktop.in.in timerapplet/data/org.mate.panel.applet.timer.gschema.xml.in timerapplet/data/timerapplet-preferences.ui timerapplet/src/timerapplet.c -trashapplet/org.mate.applets.TrashApplet.mate-panel-applet.desktop.in.in +trashapplet/data/org.mate.applets.TrashApplet.mate-panel-applet.desktop.in.in +trashapplet/data/trashapplet-empty-progress.ui trashapplet/src/trashapplet.c trashapplet/src/trash-empty.c -trashapplet/trashapplet-empty-progress.ui diff --git a/trashapplet/Makefile.am b/trashapplet/Makefile.am index 26b85624..5b5350a3 100644 --- a/trashapplet/Makefile.am +++ b/trashapplet/Makefile.am @@ -1,34 +1,3 @@ -SUBDIRS = src docs - -appletdir = $(datadir)/mate-panel/applets -applet_in_files = org.mate.applets.TrashApplet.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.TrashAppletFactory.service.in -service_DATA = $(service_in_files:.service.in=.service) - -org.mate.panel.applet.TrashAppletFactory.service: $(service_in_files) - $(AM_V_GEN)sed \ - -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \ - $< > $@ - -EXTRA_DIST = \ - $(applet_in_files).in \ - $(service_in_files) \ - trashapplet-empty-progress.ui \ - trashapplet-menu.xml \ - trashapplet-resources.gresource.xml - -CLEANFILES = $(applet_DATA) $(applet_in_files) $(service_DATA) +SUBDIRS = data src docs -include $(top_srcdir)/git.mk diff --git a/trashapplet/data/Makefile.am b/trashapplet/data/Makefile.am new file mode 100644 index 00000000..8603d6c2 --- /dev/null +++ b/trashapplet/data/Makefile.am @@ -0,0 +1,32 @@ +appletdir = $(datadir)/mate-panel/applets +applet_in_files = org.mate.applets.TrashApplet.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.TrashAppletFactory.service.in +service_DATA = $(service_in_files:.service.in=.service) + +org.mate.panel.applet.TrashAppletFactory.service: $(service_in_files) + $(AM_V_GEN)sed \ + -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \ + $< > $@ + +EXTRA_DIST = \ + $(applet_in_files).in \ + $(service_in_files) \ + trashapplet-empty-progress.ui \ + trashapplet-menu.xml \ + trashapplet-resources.gresource.xml + +CLEANFILES = $(applet_DATA) $(applet_in_files) $(service_DATA) + +-include $(top_srcdir)/git.mk diff --git a/trashapplet/org.mate.applets.TrashApplet.mate-panel-applet.desktop.in.in b/trashapplet/data/org.mate.applets.TrashApplet.mate-panel-applet.desktop.in.in index 77161ccc..77161ccc 100644 --- a/trashapplet/org.mate.applets.TrashApplet.mate-panel-applet.desktop.in.in +++ b/trashapplet/data/org.mate.applets.TrashApplet.mate-panel-applet.desktop.in.in diff --git a/trashapplet/org.mate.panel.applet.TrashAppletFactory.service.in b/trashapplet/data/org.mate.panel.applet.TrashAppletFactory.service.in index ead24d1d..ead24d1d 100644 --- a/trashapplet/org.mate.panel.applet.TrashAppletFactory.service.in +++ b/trashapplet/data/org.mate.panel.applet.TrashAppletFactory.service.in diff --git a/trashapplet/trashapplet-empty-progress.ui b/trashapplet/data/trashapplet-empty-progress.ui index 59c371a5..59c371a5 100644 --- a/trashapplet/trashapplet-empty-progress.ui +++ b/trashapplet/data/trashapplet-empty-progress.ui diff --git a/trashapplet/trashapplet-menu.xml b/trashapplet/data/trashapplet-menu.xml index e2bc5359..e2bc5359 100644 --- a/trashapplet/trashapplet-menu.xml +++ b/trashapplet/data/trashapplet-menu.xml diff --git a/trashapplet/trashapplet-resources.gresource.xml b/trashapplet/data/trashapplet-resources.gresource.xml index db287937..db287937 100644 --- a/trashapplet/trashapplet-resources.gresource.xml +++ b/trashapplet/data/trashapplet-resources.gresource.xml diff --git a/trashapplet/src/Makefile.am b/trashapplet/src/Makefile.am index 194e44ad..2def1827 100644 --- a/trashapplet/src/Makefile.am +++ b/trashapplet/src/Makefile.am @@ -23,11 +23,11 @@ trashapplet_LDADD = \ $(GIO_LIBS) \ -lX11 -trashapplet-resources.c: ../trashapplet-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../ --generate-dependencies $(srcdir)/../trashapplet-resources.gresource.xml) - $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../ --generate --c-name trashapplet $< +trashapplet-resources.c: ../data/trashapplet-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../data/ --generate-dependencies $(srcdir)/../data/trashapplet-resources.gresource.xml) + $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data/ --generate --c-name trashapplet $< -trashapplet-resources.h: ../trashapplet-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../ --generate-dependencies $(srcdir)/../trashapplet-resources.gresource.xml) - $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../ --generate --c-name trashapplet $< +trashapplet-resources.h: ../data/trashapplet-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../data/ --generate-dependencies $(srcdir)/../data/trashapplet-resources.gresource.xml) + $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data/ --generate --c-name trashapplet $< CLEANFILES = \ $(BUILT_SOURCES) |