diff --git a/configure.ac b/configure.ac index fd782eeb7..954cd3a91 100644 --- a/configure.ac +++ b/configure.ac @@ -1064,59 +1064,7 @@ Makefile enlightenment.spec enlightenment.pc src/bin/e_fm_shared_types.h -src/modules/ibar/module.desktop -src/modules/clock/module.desktop -src/modules/pager/module.desktop -src/modules/pager_plain/module.desktop -src/modules/battery/module.desktop -src/modules/temperature/module.desktop -src/modules/notification/module.desktop -src/modules/cpufreq/module.desktop -src/modules/ibox/module.desktop -src/modules/start/module.desktop -src/modules/winlist/module.desktop -src/modules/fileman/module.desktop -src/modules/fileman_opinfo/module.desktop -src/modules/conf/module.desktop -src/modules/conf_theme/module.desktop -src/modules/conf_intl/module.desktop -src/modules/conf_applications/module.desktop -src/modules/conf_display/module.desktop -src/modules/conf_shelves/module.desktop -src/modules/conf_bindings/module.desktop -src/modules/conf_window_remembers/module.desktop -src/modules/conf_window_manipulation/module.desktop -src/modules/conf_menus/module.desktop -src/modules/conf_dialogs/module.desktop -src/modules/conf_performance/module.desktop -src/modules/conf_paths/module.desktop -src/modules/conf_interaction/module.desktop -src/modules/msgbus/module.desktop -src/modules/conf_randr/module.desktop -src/modules/gadman/module.desktop -src/modules/mixer/module.desktop -src/modules/connman/module.desktop -src/modules/bluez4/module.desktop -src/modules/syscon/module.desktop -src/modules/everything/module.desktop src/modules/everything/everything.pc -src/modules/systray/module.desktop -src/modules/appmenu/module.desktop -src/modules/quickaccess/module.desktop -src/modules/teamwork/module.desktop -src/modules/shot/module.desktop -src/modules/backlight/module.desktop -src/modules/geolocation/module.desktop -src/modules/tasks/module.desktop -src/modules/xkbswitch/module.desktop -src/modules/tiling/module.desktop -src/modules/music-control/module.desktop -src/modules/packagekit/module.desktop -src/modules/wl_desktop_shell/module.desktop -src/modules/wireless/module.desktop -src/modules/time/module.desktop -src/modules/luncher/module.desktop -src/modules/sysinfo/module.desktop data/xsession/enlightenment.desktop data/etc/sysactions.conf data/units/enlightenment.service diff --git a/src/modules/.gitignore b/src/modules/.gitignore deleted file mode 100644 index 592aee683..000000000 --- a/src/modules/.gitignore +++ /dev/null @@ -1 +0,0 @@ -module.desktop diff --git a/src/modules/Makefile_appmenu.mk b/src/modules/Makefile_appmenu.mk index 0796a56a8..d2adbed86 100644 --- a/src/modules/Makefile_appmenu.mk +++ b/src/modules/Makefile_appmenu.mk @@ -1,4 +1,4 @@ -EXTRA_DIST += src/modules/appmenu/module.desktop.in \ +EXTRA_DIST += src/modules/appmenu/module.desktop \ src/modules/appmenu/e-module-appmenu.edj if USE_MODULE_APPMENU appmenudir = $(MDIR)/appmenu diff --git a/src/modules/Makefile_backlight.mk b/src/modules/Makefile_backlight.mk index 37d5a8ed9..61e151574 100644 --- a/src/modules/Makefile_backlight.mk +++ b/src/modules/Makefile_backlight.mk @@ -1,4 +1,4 @@ -EXTRA_DIST += src/modules/backlight/module.desktop.in \ +EXTRA_DIST += src/modules/backlight/module.desktop \ src/modules/backlight/e-module-backlight.edj if USE_MODULE_BACKLIGHT backlightdir = $(MDIR)/backlight diff --git a/src/modules/Makefile_battery.mk b/src/modules/Makefile_battery.mk index 31e277580..221a6d82d 100644 --- a/src/modules/Makefile_battery.mk +++ b/src/modules/Makefile_battery.mk @@ -1,4 +1,4 @@ -EXTRA_DIST += src/modules/battery/module.desktop.in \ +EXTRA_DIST += src/modules/battery/module.desktop \ src/modules/battery/e-module-battery.edj if USE_MODULE_BATTERY batterydir = $(MDIR)/battery diff --git a/src/modules/Makefile_bluez4.mk b/src/modules/Makefile_bluez4.mk index 817a95421..23a3915e1 100644 --- a/src/modules/Makefile_bluez4.mk +++ b/src/modules/Makefile_bluez4.mk @@ -1,4 +1,4 @@ -EXTRA_DIST += src/modules/bluez4/module.desktop.in \ +EXTRA_DIST += src/modules/bluez4/module.desktop \ src/modules/bluez4/e-module-bluez4.edj if USE_MODULE_BLUEZ4 bluez4dir = $(MDIR)/bluez4 diff --git a/src/modules/Makefile_clock.mk b/src/modules/Makefile_clock.mk index 2d30da128..478406479 100644 --- a/src/modules/Makefile_clock.mk +++ b/src/modules/Makefile_clock.mk @@ -1,4 +1,4 @@ -EXTRA_DIST += src/modules/clock/module.desktop.in \ +EXTRA_DIST += src/modules/clock/module.desktop \ src/modules/clock/e-module-clock.edj if USE_MODULE_CLOCK clockdir = $(MDIR)/clock diff --git a/src/modules/Makefile_conf.mk b/src/modules/Makefile_conf.mk index 55eeb7613..48401e32b 100644 --- a/src/modules/Makefile_conf.mk +++ b/src/modules/Makefile_conf.mk @@ -1,4 +1,4 @@ -EXTRA_DIST += src/modules/conf/module.desktop.in \ +EXTRA_DIST += src/modules/conf/module.desktop \ src/modules/conf/e-module-conf.edj if USE_MODULE_CONF confdir = $(MDIR)/conf diff --git a/src/modules/Makefile_conf_applications.mk b/src/modules/Makefile_conf_applications.mk index f565664f9..f89d98f5d 100644 --- a/src/modules/Makefile_conf_applications.mk +++ b/src/modules/Makefile_conf_applications.mk @@ -1,4 +1,4 @@ -EXTRA_DIST += src/modules/conf_applications/module.desktop.in \ +EXTRA_DIST += src/modules/conf_applications/module.desktop \ src/modules/conf_applications/e-module-conf_applications.edj if USE_MODULE_CONF_APPLICATIONS conf_applicationsdir = $(MDIR)/conf_applications diff --git a/src/modules/Makefile_conf_bindings.mk b/src/modules/Makefile_conf_bindings.mk index db769524e..ec4bf7839 100644 --- a/src/modules/Makefile_conf_bindings.mk +++ b/src/modules/Makefile_conf_bindings.mk @@ -1,4 +1,4 @@ -EXTRA_DIST += src/modules/conf_bindings/module.desktop.in +EXTRA_DIST += src/modules/conf_bindings/module.desktop if USE_MODULE_CONF_BINDINGS conf_bindingsdir = $(MDIR)/conf_bindings conf_bindings_DATA = src/modules/conf_bindings/module.desktop diff --git a/src/modules/Makefile_conf_dialogs.mk b/src/modules/Makefile_conf_dialogs.mk index b7e80ead9..2b18162d1 100644 --- a/src/modules/Makefile_conf_dialogs.mk +++ b/src/modules/Makefile_conf_dialogs.mk @@ -1,4 +1,4 @@ -EXTRA_DIST += src/modules/conf_dialogs/module.desktop.in \ +EXTRA_DIST += src/modules/conf_dialogs/module.desktop \ src/modules/conf_dialogs/e-module-conf_dialogs.edj if USE_MODULE_CONF_DIALOGS conf_dialogsdir = $(MDIR)/conf_dialogs diff --git a/src/modules/Makefile_conf_display.mk b/src/modules/Makefile_conf_display.mk index e4e560c58..d12a341b2 100644 --- a/src/modules/Makefile_conf_display.mk +++ b/src/modules/Makefile_conf_display.mk @@ -1,4 +1,4 @@ -EXTRA_DIST += src/modules/conf_display/module.desktop.in +EXTRA_DIST += src/modules/conf_display/module.desktop if USE_MODULE_CONF_DISPLAY conf_displaydir = $(MDIR)/conf_display conf_display_DATA = src/modules/conf_display/module.desktop diff --git a/src/modules/Makefile_conf_interaction.mk b/src/modules/Makefile_conf_interaction.mk index b8f92a5cd..170818850 100644 --- a/src/modules/Makefile_conf_interaction.mk +++ b/src/modules/Makefile_conf_interaction.mk @@ -1,4 +1,4 @@ -EXTRA_DIST += src/modules/conf_interaction/module.desktop.in \ +EXTRA_DIST += src/modules/conf_interaction/module.desktop \ src/modules/conf_interaction/e-module-conf_interaction.edj if USE_MODULE_CONF_INTERACTION conf_interactiondir = $(MDIR)/conf_interaction diff --git a/src/modules/Makefile_conf_intl.mk b/src/modules/Makefile_conf_intl.mk index 025e2953c..3d7e65e1c 100644 --- a/src/modules/Makefile_conf_intl.mk +++ b/src/modules/Makefile_conf_intl.mk @@ -1,4 +1,4 @@ -EXTRA_DIST += src/modules/conf_intl/module.desktop.in +EXTRA_DIST += src/modules/conf_intl/module.desktop if USE_MODULE_CONF_INTL conf_intldir = $(MDIR)/conf_intl conf_intl_DATA = src/modules/conf_intl/module.desktop diff --git a/src/modules/Makefile_conf_menus.mk b/src/modules/Makefile_conf_menus.mk index 65bec29c8..405e61897 100644 --- a/src/modules/Makefile_conf_menus.mk +++ b/src/modules/Makefile_conf_menus.mk @@ -1,4 +1,4 @@ -EXTRA_DIST += src/modules/conf_menus/module.desktop.in \ +EXTRA_DIST += src/modules/conf_menus/module.desktop \ src/modules/conf_menus/e-module-conf_menus.edj if USE_MODULE_CONF_MENUS conf_menusdir = $(MDIR)/conf_menus diff --git a/src/modules/Makefile_conf_paths.mk b/src/modules/Makefile_conf_paths.mk index c689aee71..aa7d37e2a 100644 --- a/src/modules/Makefile_conf_paths.mk +++ b/src/modules/Makefile_conf_paths.mk @@ -1,4 +1,4 @@ -EXTRA_DIST += src/modules/conf_paths/module.desktop.in \ +EXTRA_DIST += src/modules/conf_paths/module.desktop \ src/modules/conf_paths/e-module-conf_paths.edj if USE_MODULE_CONF_PATHS conf_pathsdir = $(MDIR)/conf_paths diff --git a/src/modules/Makefile_conf_performance.mk b/src/modules/Makefile_conf_performance.mk index 7ac263ead..3d956feef 100644 --- a/src/modules/Makefile_conf_performance.mk +++ b/src/modules/Makefile_conf_performance.mk @@ -1,4 +1,4 @@ -EXTRA_DIST += src/modules/conf_performance/module.desktop.in \ +EXTRA_DIST += src/modules/conf_performance/module.desktop \ src/modules/conf_performance/e-module-conf_performance.edj if USE_MODULE_CONF_PERFORMANCE conf_performancedir = $(MDIR)/conf_performance diff --git a/src/modules/Makefile_conf_randr.mk b/src/modules/Makefile_conf_randr.mk index 0e2da0529..b9c28155b 100644 --- a/src/modules/Makefile_conf_randr.mk +++ b/src/modules/Makefile_conf_randr.mk @@ -1,4 +1,4 @@ -EXTRA_DIST += src/modules/conf_randr/module.desktop.in \ +EXTRA_DIST += src/modules/conf_randr/module.desktop \ src/modules/conf_randr/e-module-conf_randr.edj if USE_MODULE_CONF_RANDR conf_randrdir = $(MDIR)/conf_randr diff --git a/src/modules/Makefile_conf_shelves.mk b/src/modules/Makefile_conf_shelves.mk index 9ee64c5d8..3db708d6b 100644 --- a/src/modules/Makefile_conf_shelves.mk +++ b/src/modules/Makefile_conf_shelves.mk @@ -1,4 +1,4 @@ -EXTRA_DIST += src/modules/conf_shelves/module.desktop.in \ +EXTRA_DIST += src/modules/conf_shelves/module.desktop \ src/modules/conf_shelves/e-module-conf_shelves.edj if USE_MODULE_CONF_SHELVES conf_shelvesdir = $(MDIR)/conf_shelves diff --git a/src/modules/Makefile_conf_theme.mk b/src/modules/Makefile_conf_theme.mk index 6b0ca744e..4e5e6c5c5 100644 --- a/src/modules/Makefile_conf_theme.mk +++ b/src/modules/Makefile_conf_theme.mk @@ -1,4 +1,4 @@ -EXTRA_DIST += src/modules/conf_theme/module.desktop.in +EXTRA_DIST += src/modules/conf_theme/module.desktop if USE_MODULE_CONF_THEME conf_themedir = $(MDIR)/conf_theme conf_theme_DATA = src/modules/conf_theme/module.desktop diff --git a/src/modules/Makefile_conf_window_manipulation.mk b/src/modules/Makefile_conf_window_manipulation.mk index 15d01d257..82122b988 100644 --- a/src/modules/Makefile_conf_window_manipulation.mk +++ b/src/modules/Makefile_conf_window_manipulation.mk @@ -1,4 +1,4 @@ -EXTRA_DIST += src/modules/conf_window_manipulation/module.desktop.in \ +EXTRA_DIST += src/modules/conf_window_manipulation/module.desktop \ src/modules/conf_window_manipulation/e-module-conf_winmanip.edj if USE_MODULE_CONF_WINDOW_MANIPULATION conf_window_manipulationdir = $(MDIR)/conf_window_manipulation diff --git a/src/modules/Makefile_conf_window_remembers.mk b/src/modules/Makefile_conf_window_remembers.mk index a7bb47d93..56b4fb96d 100644 --- a/src/modules/Makefile_conf_window_remembers.mk +++ b/src/modules/Makefile_conf_window_remembers.mk @@ -1,4 +1,4 @@ -EXTRA_DIST += src/modules/conf_window_remembers/module.desktop.in \ +EXTRA_DIST += src/modules/conf_window_remembers/module.desktop \ src/modules/conf_window_remembers/e-module-conf_window_remembers.edj if USE_MODULE_CONF_WINDOW_REMEMBERS conf_window_remembersdir = $(MDIR)/conf_window_remembers diff --git a/src/modules/Makefile_connman.mk b/src/modules/Makefile_connman.mk index eccad5cd5..b5fc1636a 100644 --- a/src/modules/Makefile_connman.mk +++ b/src/modules/Makefile_connman.mk @@ -1,4 +1,4 @@ -EXTRA_DIST += src/modules/connman/module.desktop.in \ +EXTRA_DIST += src/modules/connman/module.desktop \ src/modules/connman/e-module-connman.edj if USE_MODULE_CONNMAN connmandir = $(MDIR)/connman diff --git a/src/modules/Makefile_cpufreq.mk b/src/modules/Makefile_cpufreq.mk index d3a971282..1bf2577df 100644 --- a/src/modules/Makefile_cpufreq.mk +++ b/src/modules/Makefile_cpufreq.mk @@ -1,4 +1,4 @@ -EXTRA_DIST += src/modules/cpufreq/module.desktop.in \ +EXTRA_DIST += src/modules/cpufreq/module.desktop \ src/modules/cpufreq/e-module-cpufreq.edj if USE_MODULE_CPUFREQ cpufreqdir = $(MDIR)/cpufreq diff --git a/src/modules/Makefile_everything.mk b/src/modules/Makefile_everything.mk index b7419d19e..6c59547f5 100644 --- a/src/modules/Makefile_everything.mk +++ b/src/modules/Makefile_everything.mk @@ -1,4 +1,4 @@ -EXTRA_DIST += src/modules/everything/module.desktop.in \ +EXTRA_DIST += src/modules/everything/module.desktop \ src/modules/everything/e-module-everything.edj \ src/modules/everything/e-module-everything-start.edj if USE_MODULE_EVERYTHING diff --git a/src/modules/Makefile_fileman.mk b/src/modules/Makefile_fileman.mk index 3889f58a5..d864bdbbc 100644 --- a/src/modules/Makefile_fileman.mk +++ b/src/modules/Makefile_fileman.mk @@ -1,4 +1,4 @@ -EXTRA_DIST += src/modules/fileman/module.desktop.in \ +EXTRA_DIST += src/modules/fileman/module.desktop \ src/modules/fileman/e-module-fileman.edj if USE_MODULE_FILEMAN filemandir = $(MDIR)/fileman diff --git a/src/modules/Makefile_fileman_opinfo.mk b/src/modules/Makefile_fileman_opinfo.mk index ddf8b4787..302bca30e 100644 --- a/src/modules/Makefile_fileman_opinfo.mk +++ b/src/modules/Makefile_fileman_opinfo.mk @@ -1,4 +1,4 @@ -EXTRA_DIST += src/modules/fileman_opinfo/module.desktop.in \ +EXTRA_DIST += src/modules/fileman_opinfo/module.desktop \ src/modules/fileman_opinfo/e-module-fileman_opinfo.edj if USE_MODULE_FILEMAN_OPINFO fileman_opinfodir = $(MDIR)/fileman_opinfo diff --git a/src/modules/Makefile_gadman.mk b/src/modules/Makefile_gadman.mk index 6a0c9a4e3..95ac10de2 100644 --- a/src/modules/Makefile_gadman.mk +++ b/src/modules/Makefile_gadman.mk @@ -1,4 +1,4 @@ -EXTRA_DIST += src/modules/gadman/module.desktop.in \ +EXTRA_DIST += src/modules/gadman/module.desktop \ src/modules/gadman/e-module-gadman.edj if USE_MODULE_GADMAN gadmandir = $(MDIR)/gadman diff --git a/src/modules/Makefile_geolocation.mk b/src/modules/Makefile_geolocation.mk index 6b0966c21..b84c78bd1 100644 --- a/src/modules/Makefile_geolocation.mk +++ b/src/modules/Makefile_geolocation.mk @@ -1,4 +1,4 @@ -EXTRA_DIST += src/modules/geolocation/module.desktop.in \ +EXTRA_DIST += src/modules/geolocation/module.desktop \ src/modules/geolocation/e-module-geolocation.edj \ src/modules/geolocation/org.freedesktop.GeoClue2.xml diff --git a/src/modules/Makefile_ibar.mk b/src/modules/Makefile_ibar.mk index f808436e1..3ea63cec3 100644 --- a/src/modules/Makefile_ibar.mk +++ b/src/modules/Makefile_ibar.mk @@ -1,4 +1,4 @@ -EXTRA_DIST += src/modules/ibar/module.desktop.in \ +EXTRA_DIST += src/modules/ibar/module.desktop \ src/modules/ibar/e-module-ibar.edj if USE_MODULE_IBAR ibardir = $(MDIR)/ibar diff --git a/src/modules/Makefile_ibox.mk b/src/modules/Makefile_ibox.mk index 750a3de45..4f593d76b 100644 --- a/src/modules/Makefile_ibox.mk +++ b/src/modules/Makefile_ibox.mk @@ -1,4 +1,4 @@ -EXTRA_DIST += src/modules/ibox/module.desktop.in \ +EXTRA_DIST += src/modules/ibox/module.desktop \ src/modules/ibox/e-module-ibox.edj if USE_MODULE_IBOX iboxdir = $(MDIR)/ibox diff --git a/src/modules/Makefile_luncher.mk b/src/modules/Makefile_luncher.mk index f7bcb63ff..2f70d6375 100644 --- a/src/modules/Makefile_luncher.mk +++ b/src/modules/Makefile_luncher.mk @@ -1,4 +1,4 @@ -EXTRA_DIST += src/modules/luncher/module.desktop.in \ +EXTRA_DIST += src/modules/luncher/module.desktop \ src/modules/luncher/e-module-luncher.edj if USE_MODULE_IBAR luncherdir = $(MDIR)/luncher diff --git a/src/modules/Makefile_mixer.mk b/src/modules/Makefile_mixer.mk index 5a8f53b92..a94fe0e1d 100644 --- a/src/modules/Makefile_mixer.mk +++ b/src/modules/Makefile_mixer.mk @@ -1,4 +1,4 @@ -EXTRA_DIST += src/modules/mixer/module.desktop.in \ +EXTRA_DIST += src/modules/mixer/module.desktop \ src/modules/mixer/e-module-mixer.edj \ src/modules/mixer/emixer.png \ src/modules/mixer/emixer.desktop diff --git a/src/modules/Makefile_msgbus.mk b/src/modules/Makefile_msgbus.mk index f0f401378..7c947e26b 100644 --- a/src/modules/Makefile_msgbus.mk +++ b/src/modules/Makefile_msgbus.mk @@ -1,4 +1,4 @@ -EXTRA_DIST += src/modules/msgbus/module.desktop.in \ +EXTRA_DIST += src/modules/msgbus/module.desktop \ src/modules/msgbus/e-module-msgbus.edj if USE_MODULE_MSGBUS msgbusdir = $(MDIR)/msgbus diff --git a/src/modules/Makefile_music_control.mk b/src/modules/Makefile_music_control.mk index 9f79c9826..78d808f5c 100644 --- a/src/modules/Makefile_music_control.mk +++ b/src/modules/Makefile_music_control.mk @@ -1,4 +1,4 @@ -EXTRA_DIST += src/modules/music-control/module.desktop.in \ +EXTRA_DIST += src/modules/music-control/module.desktop \ src/modules/music-control/e-module-music-control.edj \ src/modules/music-control/introspect.xml diff --git a/src/modules/Makefile_notification.mk b/src/modules/Makefile_notification.mk index 261016719..777e85df5 100644 --- a/src/modules/Makefile_notification.mk +++ b/src/modules/Makefile_notification.mk @@ -1,4 +1,4 @@ -EXTRA_DIST += src/modules/notification/module.desktop.in \ +EXTRA_DIST += src/modules/notification/module.desktop \ src/modules/notification/e-module-notification.edj if USE_MODULE_NOTIFICATION notificationdir = $(MDIR)/notification diff --git a/src/modules/Makefile_packagekit.mk b/src/modules/Makefile_packagekit.mk index 3da129414..f91af0cde 100644 --- a/src/modules/Makefile_packagekit.mk +++ b/src/modules/Makefile_packagekit.mk @@ -1,4 +1,4 @@ -EXTRA_DIST += src/modules/packagekit/module.desktop.in \ +EXTRA_DIST += src/modules/packagekit/module.desktop \ src/modules/packagekit/e-module-packagekit.edj if USE_MODULE_PACKAGEKIT packagekitdir = $(MDIR)/packagekit diff --git a/src/modules/Makefile_pager.mk b/src/modules/Makefile_pager.mk index 3799e8952..261c8d330 100644 --- a/src/modules/Makefile_pager.mk +++ b/src/modules/Makefile_pager.mk @@ -1,4 +1,4 @@ -EXTRA_DIST += src/modules/pager/module.desktop.in \ +EXTRA_DIST += src/modules/pager/module.desktop \ src/modules/pager/e-module-pager.edj if USE_MODULE_PAGER pagerdir = $(MDIR)/pager diff --git a/src/modules/Makefile_pager_plain.mk b/src/modules/Makefile_pager_plain.mk index d9ba71729..5784ebf5c 100644 --- a/src/modules/Makefile_pager_plain.mk +++ b/src/modules/Makefile_pager_plain.mk @@ -1,4 +1,4 @@ -EXTRA_DIST += src/modules/pager_plain/module.desktop.in \ +EXTRA_DIST += src/modules/pager_plain/module.desktop \ src/modules/pager_plain/e-module-pager-plain.edj if USE_MODULE_PAGER_PLAIN pager_plaindir = $(MDIR)/pager_plain diff --git a/src/modules/Makefile_quickaccess.mk b/src/modules/Makefile_quickaccess.mk index 0268bdd07..6ce019a8e 100644 --- a/src/modules/Makefile_quickaccess.mk +++ b/src/modules/Makefile_quickaccess.mk @@ -1,4 +1,4 @@ -EXTRA_DIST += src/modules/quickaccess/module.desktop.in \ +EXTRA_DIST += src/modules/quickaccess/module.desktop \ src/modules/quickaccess/e-module-quickaccess.edj if USE_MODULE_QUICKACCESS quickaccessdir = $(MDIR)/quickaccess diff --git a/src/modules/Makefile_shot.mk b/src/modules/Makefile_shot.mk index 2c2067232..98253a104 100644 --- a/src/modules/Makefile_shot.mk +++ b/src/modules/Makefile_shot.mk @@ -1,4 +1,4 @@ -EXTRA_DIST += src/modules/shot/module.desktop.in \ +EXTRA_DIST += src/modules/shot/module.desktop \ src/modules/shot/e-module-shot.edj if USE_MODULE_SHOT diff --git a/src/modules/Makefile_start.mk b/src/modules/Makefile_start.mk index 4d2b6fac6..5704698d6 100644 --- a/src/modules/Makefile_start.mk +++ b/src/modules/Makefile_start.mk @@ -1,4 +1,4 @@ -EXTRA_DIST += src/modules/start/module.desktop.in \ +EXTRA_DIST += src/modules/start/module.desktop \ src/modules/start/e-module-start.edj if USE_MODULE_START startdir = $(MDIR)/start diff --git a/src/modules/Makefile_syscon.mk b/src/modules/Makefile_syscon.mk index 1d1d1e578..28e8c5362 100644 --- a/src/modules/Makefile_syscon.mk +++ b/src/modules/Makefile_syscon.mk @@ -1,4 +1,4 @@ -EXTRA_DIST += src/modules/syscon/module.desktop.in \ +EXTRA_DIST += src/modules/syscon/module.desktop \ src/modules/syscon/e-module-syscon.edj if USE_MODULE_SYSCON syscondir = $(MDIR)/syscon diff --git a/src/modules/Makefile_sysinfo.mk b/src/modules/Makefile_sysinfo.mk index 8dfa15d3c..237901b04 100644 --- a/src/modules/Makefile_sysinfo.mk +++ b/src/modules/Makefile_sysinfo.mk @@ -1,4 +1,4 @@ -EXTRA_DIST += src/modules/sysinfo/module.desktop.in \ +EXTRA_DIST += src/modules/sysinfo/module.desktop \ src/modules/sysinfo/e-module-sysinfo.edj if USE_MODULE_SYSINFO sysinfodir = $(MDIR)/sysinfo diff --git a/src/modules/Makefile_systray.mk b/src/modules/Makefile_systray.mk index 052688262..afa9fde09 100644 --- a/src/modules/Makefile_systray.mk +++ b/src/modules/Makefile_systray.mk @@ -1,4 +1,4 @@ -EXTRA_DIST += src/modules/systray/module.desktop.in \ +EXTRA_DIST += src/modules/systray/module.desktop \ src/modules/systray/e-module-systray.edj if USE_MODULE_SYSTRAY systraydir = $(MDIR)/systray diff --git a/src/modules/Makefile_tasks.mk b/src/modules/Makefile_tasks.mk index 75926d3cd..ef0128fce 100644 --- a/src/modules/Makefile_tasks.mk +++ b/src/modules/Makefile_tasks.mk @@ -1,4 +1,4 @@ -EXTRA_DIST += src/modules/tasks/module.desktop.in \ +EXTRA_DIST += src/modules/tasks/module.desktop \ src/modules/tasks/e-module-tasks.edj if USE_MODULE_TASKS tasksdir = $(MDIR)/tasks diff --git a/src/modules/Makefile_teamwork.mk b/src/modules/Makefile_teamwork.mk index a157fc24d..1349ed2c4 100644 --- a/src/modules/Makefile_teamwork.mk +++ b/src/modules/Makefile_teamwork.mk @@ -1,4 +1,4 @@ -EXTRA_DIST += src/modules/teamwork/module.desktop.in \ +EXTRA_DIST += src/modules/teamwork/module.desktop \ src/modules/teamwork/e-module-teamwork.edj if USE_MODULE_TEAMWORK teamworkdir = $(MDIR)/teamwork diff --git a/src/modules/Makefile_temperature.mk b/src/modules/Makefile_temperature.mk index d1cb7fb76..e8f7d8b39 100644 --- a/src/modules/Makefile_temperature.mk +++ b/src/modules/Makefile_temperature.mk @@ -1,4 +1,4 @@ -EXTRA_DIST += src/modules/temperature/module.desktop.in \ +EXTRA_DIST += src/modules/temperature/module.desktop \ src/modules/temperature/e-module-temperature.edj if USE_MODULE_TEMPERATURE temperaturedir = $(MDIR)/temperature diff --git a/src/modules/Makefile_tiling.mk b/src/modules/Makefile_tiling.mk index 932b75cd2..52edfdc05 100644 --- a/src/modules/Makefile_tiling.mk +++ b/src/modules/Makefile_tiling.mk @@ -1,4 +1,4 @@ -EXTRA_DIST += src/modules/tiling/module.desktop.in \ +EXTRA_DIST += src/modules/tiling/module.desktop \ src/modules/tiling/e-module-tiling.edj if USE_MODULE_TILING tilingdir = $(MDIR)/tiling diff --git a/src/modules/Makefile_time.mk b/src/modules/Makefile_time.mk index 14477c1b5..de4cfaaf6 100644 --- a/src/modules/Makefile_time.mk +++ b/src/modules/Makefile_time.mk @@ -1,4 +1,4 @@ -EXTRA_DIST += src/modules/time/module.desktop.in \ +EXTRA_DIST += src/modules/time/module.desktop \ src/modules/time/e-module-time.edj if USE_MODULE_TIME timedir = $(MDIR)/time diff --git a/src/modules/Makefile_winlist.mk b/src/modules/Makefile_winlist.mk index 7f3a4edc5..2d109df0a 100644 --- a/src/modules/Makefile_winlist.mk +++ b/src/modules/Makefile_winlist.mk @@ -1,4 +1,4 @@ -EXTRA_DIST += src/modules/winlist/module.desktop.in \ +EXTRA_DIST += src/modules/winlist/module.desktop \ src/modules/winlist/e-module-winlist.edj if USE_MODULE_WINLIST winlistdir = $(MDIR)/winlist diff --git a/src/modules/Makefile_wireless.mk b/src/modules/Makefile_wireless.mk index 0d28d4044..94232ca13 100644 --- a/src/modules/Makefile_wireless.mk +++ b/src/modules/Makefile_wireless.mk @@ -1,5 +1,5 @@ EXTRA_DIST += \ -src/modules/wireless/module.desktop.in \ +src/modules/wireless/module.desktop \ src/modules/wireless/e-module-wireless.edj if USE_MODULE_WIRELESS diff --git a/src/modules/Makefile_wizard.mk b/src/modules/Makefile_wizard.mk index 5866902a1..67f581d0c 100644 --- a/src/modules/Makefile_wizard.mk +++ b/src/modules/Makefile_wizard.mk @@ -3,7 +3,7 @@ wdd = src/modules/wizard/data/desktop/home.desktop \ src/modules/wizard/data/desktop/root.desktop \ src/modules/wizard/data/desktop/tmp.desktop -EXTRA_DIST += src/modules/wizard/module.desktop.in \ +EXTRA_DIST += src/modules/wizard/module.desktop \ src/modules/wizard/e-module-wizard.edj \ $(wd) \ $(wdd) diff --git a/src/modules/Makefile_wl_desktop_shell.mk b/src/modules/Makefile_wl_desktop_shell.mk index 6b5b74e87..4a8087f25 100644 --- a/src/modules/Makefile_wl_desktop_shell.mk +++ b/src/modules/Makefile_wl_desktop_shell.mk @@ -1,6 +1,6 @@ -EXTRA_DIST += src/modules/wl_desktop_shell/module.desktop.in \ +EXTRA_DIST += src/modules/wl_desktop_shell/module.desktop \ src/modules/wl_desktop_shell/e-module-wl_desktop_shell.edj \ -src/modules/wl_desktop_shell/module.desktop.in +src/modules/wl_desktop_shell/module.desktop if USE_MODULE_WL_DESKTOP_SHELL wl_desktop_shelldir = $(MDIR)/wl_desktop_shell diff --git a/src/modules/Makefile_xkbswitch.mk b/src/modules/Makefile_xkbswitch.mk index 00ef2ec1c..139358cf4 100644 --- a/src/modules/Makefile_xkbswitch.mk +++ b/src/modules/Makefile_xkbswitch.mk @@ -1,4 +1,4 @@ -EXTRA_DIST += src/modules/xkbswitch/module.desktop.in \ +EXTRA_DIST += src/modules/xkbswitch/module.desktop \ src/modules/xkbswitch/e-module-xkbswitch.edj if USE_MODULE_XKBSWITCH xkbswitchdir = $(MDIR)/xkbswitch diff --git a/src/modules/appmenu/module.desktop.in b/src/modules/appmenu/module.desktop similarity index 100% rename from src/modules/appmenu/module.desktop.in rename to src/modules/appmenu/module.desktop diff --git a/src/modules/backlight/module.desktop.in b/src/modules/backlight/module.desktop similarity index 100% rename from src/modules/backlight/module.desktop.in rename to src/modules/backlight/module.desktop diff --git a/src/modules/battery/module.desktop.in b/src/modules/battery/module.desktop similarity index 100% rename from src/modules/battery/module.desktop.in rename to src/modules/battery/module.desktop diff --git a/src/modules/bluez4/module.desktop.in b/src/modules/bluez4/module.desktop similarity index 100% rename from src/modules/bluez4/module.desktop.in rename to src/modules/bluez4/module.desktop diff --git a/src/modules/clock/module.desktop.in b/src/modules/clock/module.desktop similarity index 100% rename from src/modules/clock/module.desktop.in rename to src/modules/clock/module.desktop diff --git a/src/modules/conf/module.desktop.in b/src/modules/conf/module.desktop similarity index 100% rename from src/modules/conf/module.desktop.in rename to src/modules/conf/module.desktop diff --git a/src/modules/conf_applications/module.desktop.in b/src/modules/conf_applications/module.desktop similarity index 100% rename from src/modules/conf_applications/module.desktop.in rename to src/modules/conf_applications/module.desktop diff --git a/src/modules/conf_bindings/module.desktop.in b/src/modules/conf_bindings/module.desktop similarity index 100% rename from src/modules/conf_bindings/module.desktop.in rename to src/modules/conf_bindings/module.desktop diff --git a/src/modules/conf_dialogs/module.desktop.in b/src/modules/conf_dialogs/module.desktop similarity index 100% rename from src/modules/conf_dialogs/module.desktop.in rename to src/modules/conf_dialogs/module.desktop diff --git a/src/modules/conf_display/module.desktop.in b/src/modules/conf_display/module.desktop similarity index 100% rename from src/modules/conf_display/module.desktop.in rename to src/modules/conf_display/module.desktop diff --git a/src/modules/conf_interaction/module.desktop.in b/src/modules/conf_interaction/module.desktop similarity index 100% rename from src/modules/conf_interaction/module.desktop.in rename to src/modules/conf_interaction/module.desktop diff --git a/src/modules/conf_intl/module.desktop.in b/src/modules/conf_intl/module.desktop similarity index 100% rename from src/modules/conf_intl/module.desktop.in rename to src/modules/conf_intl/module.desktop diff --git a/src/modules/conf_menus/module.desktop.in b/src/modules/conf_menus/module.desktop similarity index 100% rename from src/modules/conf_menus/module.desktop.in rename to src/modules/conf_menus/module.desktop diff --git a/src/modules/conf_paths/module.desktop.in b/src/modules/conf_paths/module.desktop similarity index 100% rename from src/modules/conf_paths/module.desktop.in rename to src/modules/conf_paths/module.desktop diff --git a/src/modules/conf_performance/module.desktop.in b/src/modules/conf_performance/module.desktop similarity index 100% rename from src/modules/conf_performance/module.desktop.in rename to src/modules/conf_performance/module.desktop diff --git a/src/modules/conf_randr/module.desktop.in b/src/modules/conf_randr/module.desktop similarity index 100% rename from src/modules/conf_randr/module.desktop.in rename to src/modules/conf_randr/module.desktop diff --git a/src/modules/conf_shelves/module.desktop.in b/src/modules/conf_shelves/module.desktop similarity index 100% rename from src/modules/conf_shelves/module.desktop.in rename to src/modules/conf_shelves/module.desktop diff --git a/src/modules/conf_theme/module.desktop.in b/src/modules/conf_theme/module.desktop similarity index 100% rename from src/modules/conf_theme/module.desktop.in rename to src/modules/conf_theme/module.desktop diff --git a/src/modules/conf_window_manipulation/module.desktop.in b/src/modules/conf_window_manipulation/module.desktop similarity index 100% rename from src/modules/conf_window_manipulation/module.desktop.in rename to src/modules/conf_window_manipulation/module.desktop diff --git a/src/modules/conf_window_remembers/module.desktop.in b/src/modules/conf_window_remembers/module.desktop similarity index 100% rename from src/modules/conf_window_remembers/module.desktop.in rename to src/modules/conf_window_remembers/module.desktop diff --git a/src/modules/connman/module.desktop.in b/src/modules/connman/module.desktop similarity index 100% rename from src/modules/connman/module.desktop.in rename to src/modules/connman/module.desktop diff --git a/src/modules/cpufreq/module.desktop.in b/src/modules/cpufreq/module.desktop similarity index 100% rename from src/modules/cpufreq/module.desktop.in rename to src/modules/cpufreq/module.desktop diff --git a/src/modules/everything/module.desktop.in b/src/modules/everything/module.desktop similarity index 100% rename from src/modules/everything/module.desktop.in rename to src/modules/everything/module.desktop diff --git a/src/modules/fileman/module.desktop.in b/src/modules/fileman/module.desktop similarity index 100% rename from src/modules/fileman/module.desktop.in rename to src/modules/fileman/module.desktop diff --git a/src/modules/fileman_opinfo/module.desktop.in b/src/modules/fileman_opinfo/module.desktop similarity index 100% rename from src/modules/fileman_opinfo/module.desktop.in rename to src/modules/fileman_opinfo/module.desktop diff --git a/src/modules/gadman/module.desktop.in b/src/modules/gadman/module.desktop similarity index 100% rename from src/modules/gadman/module.desktop.in rename to src/modules/gadman/module.desktop diff --git a/src/modules/geolocation/module.desktop.in b/src/modules/geolocation/module.desktop similarity index 100% rename from src/modules/geolocation/module.desktop.in rename to src/modules/geolocation/module.desktop diff --git a/src/modules/ibar/module.desktop.in b/src/modules/ibar/module.desktop similarity index 100% rename from src/modules/ibar/module.desktop.in rename to src/modules/ibar/module.desktop diff --git a/src/modules/ibox/module.desktop.in b/src/modules/ibox/module.desktop similarity index 100% rename from src/modules/ibox/module.desktop.in rename to src/modules/ibox/module.desktop diff --git a/src/modules/layout/module.desktop.in b/src/modules/layout/module.desktop similarity index 100% rename from src/modules/layout/module.desktop.in rename to src/modules/layout/module.desktop diff --git a/src/modules/luncher/module.desktop.in b/src/modules/luncher/module.desktop similarity index 100% rename from src/modules/luncher/module.desktop.in rename to src/modules/luncher/module.desktop diff --git a/src/modules/mixer/module.desktop.in b/src/modules/mixer/module.desktop similarity index 100% rename from src/modules/mixer/module.desktop.in rename to src/modules/mixer/module.desktop diff --git a/src/modules/msgbus/module.desktop.in b/src/modules/msgbus/module.desktop similarity index 100% rename from src/modules/msgbus/module.desktop.in rename to src/modules/msgbus/module.desktop diff --git a/src/modules/music-control/module.desktop.in b/src/modules/music-control/module.desktop similarity index 100% rename from src/modules/music-control/module.desktop.in rename to src/modules/music-control/module.desktop diff --git a/src/modules/notification/module.desktop.in b/src/modules/notification/module.desktop similarity index 100% rename from src/modules/notification/module.desktop.in rename to src/modules/notification/module.desktop diff --git a/src/modules/packagekit/module.desktop.in b/src/modules/packagekit/module.desktop similarity index 100% rename from src/modules/packagekit/module.desktop.in rename to src/modules/packagekit/module.desktop diff --git a/src/modules/pager/module.desktop.in b/src/modules/pager/module.desktop similarity index 100% rename from src/modules/pager/module.desktop.in rename to src/modules/pager/module.desktop diff --git a/src/modules/pager_plain/module.desktop.in b/src/modules/pager_plain/module.desktop similarity index 100% rename from src/modules/pager_plain/module.desktop.in rename to src/modules/pager_plain/module.desktop diff --git a/src/modules/quickaccess/module.desktop.in b/src/modules/quickaccess/module.desktop similarity index 100% rename from src/modules/quickaccess/module.desktop.in rename to src/modules/quickaccess/module.desktop diff --git a/src/modules/shot/module.desktop.in b/src/modules/shot/module.desktop similarity index 100% rename from src/modules/shot/module.desktop.in rename to src/modules/shot/module.desktop diff --git a/src/modules/start/module.desktop.in b/src/modules/start/module.desktop similarity index 100% rename from src/modules/start/module.desktop.in rename to src/modules/start/module.desktop diff --git a/src/modules/syscon/module.desktop.in b/src/modules/syscon/module.desktop similarity index 100% rename from src/modules/syscon/module.desktop.in rename to src/modules/syscon/module.desktop diff --git a/src/modules/sysinfo/module.desktop.in b/src/modules/sysinfo/module.desktop similarity index 100% rename from src/modules/sysinfo/module.desktop.in rename to src/modules/sysinfo/module.desktop diff --git a/src/modules/systray/module.desktop.in b/src/modules/systray/module.desktop similarity index 100% rename from src/modules/systray/module.desktop.in rename to src/modules/systray/module.desktop diff --git a/src/modules/tasks/module.desktop.in b/src/modules/tasks/module.desktop similarity index 100% rename from src/modules/tasks/module.desktop.in rename to src/modules/tasks/module.desktop diff --git a/src/modules/teamwork/module.desktop.in b/src/modules/teamwork/module.desktop similarity index 100% rename from src/modules/teamwork/module.desktop.in rename to src/modules/teamwork/module.desktop diff --git a/src/modules/temperature/module.desktop.in b/src/modules/temperature/module.desktop similarity index 100% rename from src/modules/temperature/module.desktop.in rename to src/modules/temperature/module.desktop diff --git a/src/modules/tiling/module.desktop.in b/src/modules/tiling/module.desktop similarity index 100% rename from src/modules/tiling/module.desktop.in rename to src/modules/tiling/module.desktop diff --git a/src/modules/time/module.desktop.in b/src/modules/time/module.desktop similarity index 100% rename from src/modules/time/module.desktop.in rename to src/modules/time/module.desktop diff --git a/src/modules/winlist/module.desktop.in b/src/modules/winlist/module.desktop similarity index 100% rename from src/modules/winlist/module.desktop.in rename to src/modules/winlist/module.desktop diff --git a/src/modules/wireless/module.desktop.in b/src/modules/wireless/module.desktop similarity index 100% rename from src/modules/wireless/module.desktop.in rename to src/modules/wireless/module.desktop diff --git a/src/modules/wizard/module.desktop.in b/src/modules/wizard/module.desktop similarity index 100% rename from src/modules/wizard/module.desktop.in rename to src/modules/wizard/module.desktop diff --git a/src/modules/wl_desktop_shell/module.desktop.in b/src/modules/wl_desktop_shell/module.desktop similarity index 100% rename from src/modules/wl_desktop_shell/module.desktop.in rename to src/modules/wl_desktop_shell/module.desktop diff --git a/src/modules/xkbswitch/module.desktop.in b/src/modules/xkbswitch/module.desktop similarity index 100% rename from src/modules/xkbswitch/module.desktop.in rename to src/modules/xkbswitch/module.desktop