From 270ecccfad3d3b86e2f2d027fb7674709be02fc0 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 4 Feb 2014 10:07:14 -0500 Subject: [PATCH] bugfix: building non-default modules from dist no longer fails T869 --- src/modules/Makefile.mk | 112 ------------------ src/modules/Makefile_access.mk | 4 +- src/modules/Makefile_appmenu.mk | 5 +- src/modules/Makefile_backlight.mk | 5 +- src/modules/Makefile_battery.mk | 5 +- src/modules/Makefile_bluez4.mk | 5 +- src/modules/Makefile_clock.mk | 5 +- src/modules/Makefile_conf.mk | 5 +- src/modules/Makefile_conf_applications.mk | 5 +- src/modules/Makefile_conf_bindings.mk | 4 +- src/modules/Makefile_conf_dialogs.mk | 5 +- src/modules/Makefile_conf_display.mk | 4 +- src/modules/Makefile_conf_interaction.mk | 5 +- src/modules/Makefile_conf_intl.mk | 4 +- src/modules/Makefile_conf_menus.mk | 5 +- src/modules/Makefile_conf_paths.mk | 5 +- src/modules/Makefile_conf_performance.mk | 5 +- src/modules/Makefile_conf_randr.mk | 5 +- src/modules/Makefile_conf_shelves.mk | 5 +- src/modules/Makefile_conf_theme.mk | 4 +- src/modules/Makefile_conf_wallpaper2.mk | 4 +- .../Makefile_conf_window_manipulation.mk | 5 +- src/modules/Makefile_conf_window_remembers.mk | 5 +- src/modules/Makefile_connman.mk | 5 +- src/modules/Makefile_contact.mk | 7 +- src/modules/Makefile_cpufreq.mk | 5 +- src/modules/Makefile_everything.mk | 7 +- src/modules/Makefile_fileman.mk | 5 +- src/modules/Makefile_fileman_opinfo.mk | 5 +- src/modules/Makefile_gadman.mk | 5 +- src/modules/Makefile_ibar.mk | 5 +- src/modules/Makefile_ibox.mk | 5 +- src/modules/Makefile_illume-bluetooth.mk | 3 +- src/modules/Makefile_illume-home-toggle.mk | 3 +- src/modules/Makefile_illume-home.mk | 3 +- src/modules/Makefile_illume-indicator.mk | 3 +- src/modules/Makefile_illume-kbd-toggle.mk | 3 +- src/modules/Makefile_illume-keyboard.mk | 5 +- src/modules/Makefile_illume-mode-toggle.mk | 3 +- src/modules/Makefile_illume-softkey.mk | 3 +- src/modules/Makefile_illume2.mk | 6 +- src/modules/Makefile_lokker.mk | 3 +- src/modules/Makefile_mixer.mk | 5 +- src/modules/Makefile_msgbus.mk | 5 +- src/modules/Makefile_music_control.mk | 3 +- src/modules/Makefile_notification.mk | 5 +- src/modules/Makefile_packagekit.mk | 5 +- src/modules/Makefile_pager.mk | 5 +- src/modules/Makefile_pager16.mk | 5 +- src/modules/Makefile_physics.mk | 1 - src/modules/Makefile_quickaccess.mk | 5 +- src/modules/Makefile_shot.mk | 5 +- src/modules/Makefile_start.mk | 5 +- src/modules/Makefile_syscon.mk | 5 +- src/modules/Makefile_systray.mk | 5 +- src/modules/Makefile_tasks.mk | 5 +- src/modules/Makefile_teamwork.mk | 5 +- src/modules/Makefile_temperature.mk | 5 +- src/modules/Makefile_tiling.mk | 5 +- src/modules/Makefile_winlist.mk | 5 +- src/modules/Makefile_wizard.mk | 18 ++- src/modules/Makefile_wl_desktop_shell.mk | 5 +- src/modules/Makefile_wl_fb.mk | 2 + src/modules/Makefile_wl_screenshot.mk | 5 +- src/modules/Makefile_wl_x11.mk | 2 + src/modules/Makefile_xkbswitch.mk | 5 +- 66 files changed, 236 insertions(+), 185 deletions(-) diff --git a/src/modules/Makefile.mk b/src/modules/Makefile.mk index ee82a2947..710d821f7 100644 --- a/src/modules/Makefile.mk +++ b/src/modules/Makefile.mk @@ -10,147 +10,76 @@ MOD_CPPFLAGS = -I. \ MOD_LIBS = @e_libs@ @dlopen_libs@ -if USE_MODULE_CONNMAN include src/modules/Makefile_connman.mk -endif -if USE_MODULE_BLUEZ4 include src/modules/Makefile_bluez4.mk -endif -if USE_MODULE_IBAR include src/modules/Makefile_ibar.mk -endif -if USE_MODULE_CLOCK include src/modules/Makefile_clock.mk -endif -if USE_MODULE_PAGER include src/modules/Makefile_pager.mk -endif -if USE_MODULE_PAGER16 include src/modules/Makefile_pager16.mk -endif -if USE_MODULE_BATTERY include src/modules/Makefile_battery.mk -endif -if USE_MODULE_TEMPERATURE include src/modules/Makefile_temperature.mk -endif -if USE_MODULE_NOTIFICATION include src/modules/Makefile_notification.mk -endif -if USE_MODULE_CPUFREQ include src/modules/Makefile_cpufreq.mk -endif -if USE_MODULE_IBOX include src/modules/Makefile_ibox.mk -endif -if USE_MODULE_START include src/modules/Makefile_start.mk -endif -if USE_MODULE_WINLIST include src/modules/Makefile_winlist.mk -endif -if USE_MODULE_FILEMAN include src/modules/Makefile_fileman.mk -endif -if USE_MODULE_FILEMAN_OPINFO include src/modules/Makefile_fileman_opinfo.mk -endif -if USE_MODULE_WIZARD include src/modules/Makefile_wizard.mk -endif -if USE_MODULE_CONF include src/modules/Makefile_conf.mk -endif -if USE_MODULE_CONF_WALLPAPER2 include src/modules/Makefile_conf_wallpaper2.mk -endif -if USE_MODULE_CONF_THEME include src/modules/Makefile_conf_theme.mk -endif -if USE_MODULE_CONF_INTL include src/modules/Makefile_conf_intl.mk -endif -if USE_MODULE_MSGBUS include src/modules/Makefile_msgbus.mk -endif -if USE_MODULE_CONF_APPLICATIONS include src/modules/Makefile_conf_applications.mk -endif -if USE_MODULE_CONF_DISPLAY include src/modules/Makefile_conf_display.mk -endif -if USE_MODULE_CONF_SHELVES include src/modules/Makefile_conf_shelves.mk -endif -if USE_MODULE_CONF_BINDINGS include src/modules/Makefile_conf_bindings.mk -endif -if USE_MODULE_CONF_WINDOW_REMEMBERS include src/modules/Makefile_conf_window_remembers.mk -endif -if USE_MODULE_CONF_WINDOW_MANIPULATION include src/modules/Makefile_conf_window_manipulation.mk -endif -if USE_MODULE_CONF_MENUS include src/modules/Makefile_conf_menus.mk -endif -if USE_MODULE_CONF_DIALOGS include src/modules/Makefile_conf_dialogs.mk -endif -if USE_MODULE_CONF_PERFORMANCE include src/modules/Makefile_conf_performance.mk -endif -if USE_MODULE_CONF_PATHS include src/modules/Makefile_conf_paths.mk -endif -if USE_MODULE_CONF_INTERACTION include src/modules/Makefile_conf_interaction.mk -endif -if USE_MODULE_CONF_RANDR include src/modules/Makefile_conf_randr.mk -endif -if USE_MODULE_GADMAN include src/modules/Makefile_gadman.mk -endif -if USE_MODULE_MIXER include src/modules/Makefile_mixer.mk -endif -#if USE_MODULE_ILLUME2 #include src/modules/Makefile_illume2.mk #include src/modules/Makefile_illume-home.mk #include src/modules/Makefile_illume-home-toggle.mk @@ -160,88 +89,47 @@ endif #include src/modules/Makefile_illume-kbd-toggle.mk #include src/modules/Makefile_illume-mode-toggle.mk #include src/modules/Makefile_illume-bluetooth.mk -#endif -if USE_MODULE_SYSCON include src/modules/Makefile_syscon.mk -endif -if USE_MODULE_EVERYTHING include src/modules/Makefile_everything.mk -endif -if USE_MODULE_SYSTRAY include src/modules/Makefile_systray.mk -endif -if USE_MODULE_APPMENU include src/modules/Makefile_appmenu.mk -endif -if USE_MODULE_QUICKACCESS include src/modules/Makefile_quickaccess.mk -endif -if USE_MODULE_TEAMWORK include src/modules/Makefile_teamwork.mk -endif -if USE_MODULE_LOKKER include src/modules/Makefile_lokker.mk -endif -if USE_MODULE_SHOT include src/modules/Makefile_shot.mk -endif -if USE_MODULE_BACKLIGHT include src/modules/Makefile_backlight.mk -endif -if USE_MODULE_TASKS include src/modules/Makefile_tasks.mk -endif -if USE_MODULE_XKBSWITCH include src/modules/Makefile_xkbswitch.mk -endif -if USE_MODULE_TILING include src/modules/Makefile_tiling.mk -endif -if USE_MODULE_ACCESS include src/modules/Makefile_access.mk -endif -if USE_MODULE_MUSIC_CONTROL include src/modules/Makefile_music_control.mk -endif -if USE_MODULE_PACKAGEKIT include src/modules/Makefile_packagekit.mk -endif -if USE_MODULE_CONTACT include src/modules/Makefile_contact.mk -endif #if HAVE_WAYLAND_DRM #include src/modules/Makefile_wl_drm.mk -#endif -if USE_MODULE_WL_DESKTOP_SHELL include src/modules/Makefile_wl_desktop_shell.mk -endif -if USE_MODULE_WL_X11 include src/modules/Makefile_wl_x11.mk -endif -if USE_MODULE_WL_FB include src/modules/Makefile_wl_fb.mk -endif #if HAVE_WAYLAND_SCREENSHOT #include src/modules/Makefile_wl_screenshot.mk -#endif diff --git a/src/modules/Makefile_access.mk b/src/modules/Makefile_access.mk index ee49200b3..19024f5f4 100644 --- a/src/modules/Makefile_access.mk +++ b/src/modules/Makefile_access.mk @@ -1,7 +1,8 @@ +EXTRA_DIST += src/modules/access/module.desktop.in +if USE_MODULE_ACCESS accessdir = $(MDIR)/access access_DATA = src/modules/access/module.desktop -EXTRA_DIST += $(access_DATA) accesspkgdir = $(MDIR)/access/$(MODULE_ARCH) accesspkg_LTLIBRARIES = src/modules/access/module.la @@ -16,3 +17,4 @@ src_modules_access_module_la_SOURCES = src/modules/access/e_mod_main.c \ PHONIES += access install-access access: $(accesspkg_LTLIBRARIES) $(access_DATA) install-access: install-accessDATA install-accesspkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_appmenu.mk b/src/modules/Makefile_appmenu.mk index 596b7ae6b..0796a56a8 100644 --- a/src/modules/Makefile_appmenu.mk +++ b/src/modules/Makefile_appmenu.mk @@ -1,8 +1,10 @@ +EXTRA_DIST += src/modules/appmenu/module.desktop.in \ +src/modules/appmenu/e-module-appmenu.edj +if USE_MODULE_APPMENU appmenudir = $(MDIR)/appmenu appmenu_DATA = src/modules/appmenu/module.desktop \ src/modules/appmenu/e-module-appmenu.edj -EXTRA_DIST += $(appmenu_DATA) appmenupkgdir = $(MDIR)/appmenu/$(MODULE_ARCH) appmenupkg_LTLIBRARIES = src/modules/appmenu/module.la @@ -19,3 +21,4 @@ src_modules_appmenu_module_la_SOURCES = src/modules/appmenu/e_mod_main.c \ PHONIES += appmenu install-appmenu appmenu: $(appmenupkg_LTLIBRARIES) $(appmenu_DATA) install-appmenu: install-appmenuDATA install-appmenupkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_backlight.mk b/src/modules/Makefile_backlight.mk index b6a24a154..2fbb123e4 100644 --- a/src/modules/Makefile_backlight.mk +++ b/src/modules/Makefile_backlight.mk @@ -1,8 +1,10 @@ +EXTRA_DIST += src/modules/backlight/module.desktop.in \ +src/modules/backlight/e-module-backlight.edj +if USE_MODULE_BACKLIGHT backlightdir = $(MDIR)/backlight backlight_DATA = src/modules/backlight/e-module-backlight.edj \ src/modules/backlight/module.desktop -EXTRA_DIST += $(backlight_DATA) backlightpkgdir = $(MDIR)/backlight/$(MODULE_ARCH) backlightpkg_LTLIBRARIES = src/modules/backlight/module.la @@ -15,3 +17,4 @@ src_modules_backlight_module_la_SOURCES = src/modules/backlight/e_mod_main.c PHONIES += backlight install-backlight backlight: $(backlightpkg_LTLIBRARIES) $(backlight_DATA) install-backlight: install-backlightDATA install-backlightpkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_battery.mk b/src/modules/Makefile_battery.mk index fcf1fddfc..180f948b6 100644 --- a/src/modules/Makefile_battery.mk +++ b/src/modules/Makefile_battery.mk @@ -1,8 +1,10 @@ +EXTRA_DIST += src/modules/battery/module.desktop.in \ +src/modules/battery/e-module-battery.edj +if USE_MODULE_BATTERY batterydir = $(MDIR)/battery battery_DATA = src/modules/battery/e-module-battery.edj \ src/modules/battery/module.desktop -EXTRA_DIST += $(battery_DATA) batterypkgdir = $(MDIR)/battery/$(MODULE_ARCH) batterypkg_LTLIBRARIES = src/modules/battery/module.la @@ -41,3 +43,4 @@ src_modules_battery_batget_LDFLAGS = @BATTERY_LDFLAGS@ PHONIES += battery install-battery battery: $(batterypkg_LTLIBRARIES) $(battery_DATA) $(src_modules_battery_batget_PROGRAMS) install-battery: install-batteryDATA install-batterypkgLTLIBRARIES install-src_modules_battery_batgetPROGRAMS +endif diff --git a/src/modules/Makefile_bluez4.mk b/src/modules/Makefile_bluez4.mk index 0c0c2590f..425c54d5b 100644 --- a/src/modules/Makefile_bluez4.mk +++ b/src/modules/Makefile_bluez4.mk @@ -1,8 +1,10 @@ +EXTRA_DIST += src/modules/bluez4/module.desktop.in \ +src/modules/bluez4/e-module-bluez4.edj +if USE_MODULE_BLUEZ4 bluez4dir = $(MDIR)/bluez4 bluez4_DATA = src/modules/bluez4/e-module-bluez4.edj \ src/modules/bluez4/module.desktop -EXTRA_DIST += $(bluez4_DATA) bluez4pkgdir = $(MDIR)/bluez4/$(MODULE_ARCH) bluez4pkg_LTLIBRARIES = src/modules/bluez4/module.la @@ -21,3 +23,4 @@ src_modules_bluez4_module_la_LIBADD = $(MOD_LIBS) @BLUEZ4_LIBS@ PHONIES += bluez4 install-bluez4 bluez4: $(bluez4pkg_LTLIBRARIES) $(bluez4_DATA) install-bluez4: install-bluez4DATA install-bluez4pkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_clock.mk b/src/modules/Makefile_clock.mk index e41bed623..2d30da128 100644 --- a/src/modules/Makefile_clock.mk +++ b/src/modules/Makefile_clock.mk @@ -1,8 +1,10 @@ +EXTRA_DIST += src/modules/clock/module.desktop.in \ +src/modules/clock/e-module-clock.edj +if USE_MODULE_CLOCK clockdir = $(MDIR)/clock clock_DATA = src/modules/clock/e-module-clock.edj \ src/modules/clock/module.desktop -EXTRA_DIST += $(clock_DATA) clockpkgdir = $(MDIR)/clock/$(MODULE_ARCH) clockpkg_LTLIBRARIES = src/modules/clock/module.la @@ -17,3 +19,4 @@ src_modules_clock_module_la_SOURCES = src/modules/clock/e_mod_main.h \ PHONIES += clock install-clock clock: $(clockpkg_LTLIBRARIES) $(clock_DATA) install-clock: install-clockDATA install-clockpkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_conf.mk b/src/modules/Makefile_conf.mk index fb8528d11..55eeb7613 100644 --- a/src/modules/Makefile_conf.mk +++ b/src/modules/Makefile_conf.mk @@ -1,8 +1,10 @@ +EXTRA_DIST += src/modules/conf/module.desktop.in \ +src/modules/conf/e-module-conf.edj +if USE_MODULE_CONF confdir = $(MDIR)/conf conf_DATA = src/modules/conf/e-module-conf.edj \ src/modules/conf/module.desktop -EXTRA_DIST += $(conf_DATA) confpkgdir = $(MDIR)/conf/$(MODULE_ARCH) confpkg_LTLIBRARIES = src/modules/conf/module.la @@ -18,3 +20,4 @@ src_modules_conf_module_la_SOURCES = src/modules/conf/e_mod_main.c \ PHONIES += conf install-conf conf: $(confpkg_LTLIBRARIES) $(conf_DATA) install-conf: install-confDATA install-confpkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_conf_applications.mk b/src/modules/Makefile_conf_applications.mk index 525e547dc..f565664f9 100644 --- a/src/modules/Makefile_conf_applications.mk +++ b/src/modules/Makefile_conf_applications.mk @@ -1,8 +1,10 @@ +EXTRA_DIST += src/modules/conf_applications/module.desktop.in \ +src/modules/conf_applications/e-module-conf_applications.edj +if USE_MODULE_CONF_APPLICATIONS conf_applicationsdir = $(MDIR)/conf_applications conf_applications_DATA = src/modules/conf_applications/e-module-conf_applications.edj \ src/modules/conf_applications/module.desktop -EXTRA_DIST += $(conf_applications_DATA) conf_applicationspkgdir = $(MDIR)/conf_applications/$(MODULE_ARCH) conf_applicationspkg_LTLIBRARIES = src/modules/conf_applications/module.la @@ -20,3 +22,4 @@ src_modules_conf_applications_module_la_SOURCES = src/modules/conf_applications/ PHONIES += conf_applications install-conf_applications conf_applications: $(conf_applicationspkg_LTLIBRARIES) $(conf_applications_DATA) install-conf_applications: install-conf_applicationsDATA install-conf_applicationspkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_conf_bindings.mk b/src/modules/Makefile_conf_bindings.mk index d57ff1905..a13d72570 100644 --- a/src/modules/Makefile_conf_bindings.mk +++ b/src/modules/Makefile_conf_bindings.mk @@ -1,7 +1,8 @@ +EXTRA_DIST += src/modules/conf_bindings/module.desktop.in +if USE_MODULE_CONF_BINDINGS conf_bindingsdir = $(MDIR)/conf_bindings conf_bindings_DATA = src/modules/conf_bindings/module.desktop -EXTRA_DIST += $(conf_bindings_DATA) conf_bindingspkgdir = $(MDIR)/conf_bindings/$(MODULE_ARCH) conf_bindingspkg_LTLIBRARIES = src/modules/conf_bindings/module.la @@ -20,3 +21,4 @@ src_modules_conf_bindings_module_la_SOURCES = src/modules/conf_bindings/e_mod_ma PHONIES += conf_bindings install-conf_bindings conf_bindings: $(conf_bindingspkg_LTLIBRARIES) $(conf_bindings_DATA) install-conf_bindings: install-conf_bindingsDATA install-conf_bindingspkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_conf_dialogs.mk b/src/modules/Makefile_conf_dialogs.mk index 7355d1811..b7e80ead9 100644 --- a/src/modules/Makefile_conf_dialogs.mk +++ b/src/modules/Makefile_conf_dialogs.mk @@ -1,8 +1,10 @@ +EXTRA_DIST += src/modules/conf_dialogs/module.desktop.in \ +src/modules/conf_dialogs/e-module-conf_dialogs.edj +if USE_MODULE_CONF_DIALOGS conf_dialogsdir = $(MDIR)/conf_dialogs conf_dialogs_DATA = src/modules/conf_dialogs/e-module-conf_dialogs.edj \ src/modules/conf_dialogs/module.desktop -EXTRA_DIST += $(conf_dialogs_DATA) conf_dialogspkgdir = $(MDIR)/conf_dialogs/$(MODULE_ARCH) conf_dialogspkg_LTLIBRARIES = src/modules/conf_dialogs/module.la @@ -18,3 +20,4 @@ src_modules_conf_dialogs_module_la_SOURCES = src/modules/conf_dialogs/e_mod_main PHONIES += conf_dialogs install-conf_dialogs conf_dialogs: $(conf_dialogspkg_LTLIBRARIES) $(conf_dialogs_DATA) install-conf_dialogs: install-conf_dialogsDATA install-conf_dialogspkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_conf_display.mk b/src/modules/Makefile_conf_display.mk index 30753da50..043f55f45 100644 --- a/src/modules/Makefile_conf_display.mk +++ b/src/modules/Makefile_conf_display.mk @@ -1,7 +1,8 @@ +EXTRA_DIST += src/modules/conf_display/module.desktop.in +if USE_MODULE_CONF_DISPLAY conf_displaydir = $(MDIR)/conf_display conf_display_DATA = src/modules/conf_display/module.desktop -EXTRA_DIST += $(conf_display_DATA) conf_displaypkgdir = $(MDIR)/conf_display/$(MODULE_ARCH) conf_displaypkg_LTLIBRARIES = src/modules/conf_display/module.la @@ -22,3 +23,4 @@ src_modules_conf_display_module_la_SOURCES = src/modules/conf_display/e_mod_main PHONIES += conf_display install-conf_display conf_display: $(conf_displaypkg_LTLIBRARIES) $(conf_display_DATA) install-conf_display: install-conf_displayDATA install-conf_displaypkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_conf_interaction.mk b/src/modules/Makefile_conf_interaction.mk index a1c775ad7..b8f92a5cd 100644 --- a/src/modules/Makefile_conf_interaction.mk +++ b/src/modules/Makefile_conf_interaction.mk @@ -1,8 +1,10 @@ +EXTRA_DIST += src/modules/conf_interaction/module.desktop.in \ +src/modules/conf_interaction/e-module-conf_interaction.edj +if USE_MODULE_CONF_INTERACTION conf_interactiondir = $(MDIR)/conf_interaction conf_interaction_DATA = src/modules/conf_interaction/e-module-conf_interaction.edj \ src/modules/conf_interaction/module.desktop -EXTRA_DIST += $(conf_interaction_DATA) conf_interactionpkgdir = $(MDIR)/conf_interaction/$(MODULE_ARCH) conf_interactionpkg_LTLIBRARIES = src/modules/conf_interaction/module.la @@ -18,3 +20,4 @@ src_modules_conf_interaction_module_la_SOURCES = src/modules/conf_interaction/e_ PHONIES += conf_interaction install-conf_interaction conf_interaction: $(conf_interactionpkg_LTLIBRARIES) $(conf_interaction_DATA) install-conf_interaction: install-conf_interactionDATA install-conf_interactionpkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_conf_intl.mk b/src/modules/Makefile_conf_intl.mk index 379d39d49..025e2953c 100644 --- a/src/modules/Makefile_conf_intl.mk +++ b/src/modules/Makefile_conf_intl.mk @@ -1,7 +1,8 @@ +EXTRA_DIST += src/modules/conf_intl/module.desktop.in +if USE_MODULE_CONF_INTL conf_intldir = $(MDIR)/conf_intl conf_intl_DATA = src/modules/conf_intl/module.desktop -EXTRA_DIST += $(conf_intl_DATA) conf_intlpkgdir = $(MDIR)/conf_intl/$(MODULE_ARCH) conf_intlpkg_LTLIBRARIES = src/modules/conf_intl/module.la @@ -18,3 +19,4 @@ src_modules_conf_intl_module_la_SOURCES = src/modules/conf_intl/e_mod_main.c \ PHONIES += conf_intl install-conf_intl conf_intl: $(conf_intlpkg_LTLIBRARIES) $(conf_intl_DATA) install-conf_intl: install-conf_intlDATA install-conf_intlpkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_conf_menus.mk b/src/modules/Makefile_conf_menus.mk index fb8eb577a..65bec29c8 100644 --- a/src/modules/Makefile_conf_menus.mk +++ b/src/modules/Makefile_conf_menus.mk @@ -1,8 +1,10 @@ +EXTRA_DIST += src/modules/conf_menus/module.desktop.in \ +src/modules/conf_menus/e-module-conf_menus.edj +if USE_MODULE_CONF_MENUS conf_menusdir = $(MDIR)/conf_menus conf_menus_DATA = src/modules/conf_menus/e-module-conf_menus.edj \ src/modules/conf_menus/module.desktop -EXTRA_DIST += $(conf_menus_DATA) conf_menuspkgdir = $(MDIR)/conf_menus/$(MODULE_ARCH) conf_menuspkg_LTLIBRARIES = src/modules/conf_menus/module.la @@ -17,3 +19,4 @@ src_modules_conf_menus_module_la_SOURCES = src/modules/conf_menus/e_mod_main.c \ PHONIES += conf_menus install-conf_menus conf_menus: $(conf_menuspkg_LTLIBRARIES) $(conf_menus_DATA) install-conf_menus: install-conf_menusDATA install-conf_menuspkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_conf_paths.mk b/src/modules/Makefile_conf_paths.mk index 0b0a290a1..c689aee71 100644 --- a/src/modules/Makefile_conf_paths.mk +++ b/src/modules/Makefile_conf_paths.mk @@ -1,8 +1,10 @@ +EXTRA_DIST += src/modules/conf_paths/module.desktop.in \ +src/modules/conf_paths/e-module-conf_paths.edj +if USE_MODULE_CONF_PATHS conf_pathsdir = $(MDIR)/conf_paths conf_paths_DATA = src/modules/conf_paths/e-module-conf_paths.edj \ src/modules/conf_paths/module.desktop -EXTRA_DIST += $(conf_paths_DATA) conf_pathspkgdir = $(MDIR)/conf_paths/$(MODULE_ARCH) conf_pathspkg_LTLIBRARIES = src/modules/conf_paths/module.la @@ -18,3 +20,4 @@ src_modules_conf_paths_module_la_SOURCES = src/modules/conf_paths/e_mod_main.c \ PHONIES += conf_paths install-conf_paths conf_paths: $(conf_pathspkg_LTLIBRARIES) $(conf_paths_DATA) install-conf_paths: install-conf_pathsDATA install-conf_pathspkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_conf_performance.mk b/src/modules/Makefile_conf_performance.mk index a799dff78..a7bd239e2 100644 --- a/src/modules/Makefile_conf_performance.mk +++ b/src/modules/Makefile_conf_performance.mk @@ -1,8 +1,10 @@ +EXTRA_DIST += src/modules/conf_performance/module.desktop.in \ +src/modules/conf_performance/e-module-conf_performance.edj +if USE_MODULE_CONF_PERFORMANCE conf_performancedir = $(MDIR)/conf_performance conf_performance_DATA = src/modules/conf_performance/e-module-conf_performance.edj \ src/modules/conf_performance/module.desktop -EXTRA_DIST += $(conf_performance_DATA) conf_performancepkgdir = $(MDIR)/conf_performance/$(MODULE_ARCH) conf_performancepkg_LTLIBRARIES = src/modules/conf_performance/module.la @@ -19,3 +21,4 @@ src_modules_conf_performance_module_la_SOURCES = src/modules/conf_performance/e_ PHONIES += conf_performance install-conf_performance conf_performance: $(conf_performancepkg_LTLIBRARIES) $(conf_performance_DATA) install-conf_performance: install-conf_performanceDATA install-conf_performancepkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_conf_randr.mk b/src/modules/Makefile_conf_randr.mk index b43164bd8..0a727c287 100644 --- a/src/modules/Makefile_conf_randr.mk +++ b/src/modules/Makefile_conf_randr.mk @@ -1,8 +1,10 @@ +EXTRA_DIST += src/modules/conf_randr/module.desktop.in \ +src/modules/conf_randr/e-module-conf_randr.edj +if USE_MODULE_CONF_RANDR conf_randrdir = $(MDIR)/conf_randr conf_randr_DATA = src/modules/conf_randr/e-module-conf_randr.edj \ src/modules/conf_randr/module.desktop -EXTRA_DIST += $(conf_randr_DATA) conf_randrpkgdir = $(MDIR)/conf_randr/$(MODULE_ARCH) conf_randrpkg_LTLIBRARIES = src/modules/conf_randr/module.la @@ -22,3 +24,4 @@ src_modules_conf_randr_module_la_SOURCES = src/modules/conf_randr/e_mod_main.c \ PHONIES += conf_randr install-conf_randr conf_randr: $(conf_randrpkg_LTLIBRARIES) $(conf_randr_DATA) install-conf_randr: install-conf_randrDATA install-conf_randrpkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_conf_shelves.mk b/src/modules/Makefile_conf_shelves.mk index 1f5adfbad..9ee64c5d8 100644 --- a/src/modules/Makefile_conf_shelves.mk +++ b/src/modules/Makefile_conf_shelves.mk @@ -1,8 +1,10 @@ +EXTRA_DIST += src/modules/conf_shelves/module.desktop.in \ +src/modules/conf_shelves/e-module-conf_shelves.edj +if USE_MODULE_CONF_SHELVES conf_shelvesdir = $(MDIR)/conf_shelves conf_shelves_DATA = src/modules/conf_shelves/e-module-conf_shelves.edj \ src/modules/conf_shelves/module.desktop -EXTRA_DIST += $(conf_shelves_DATA) conf_shelvespkgdir = $(MDIR)/conf_shelves/$(MODULE_ARCH) conf_shelvespkg_LTLIBRARIES = src/modules/conf_shelves/module.la @@ -18,3 +20,4 @@ src_modules_conf_shelves_module_la_SOURCES = src/modules/conf_shelves/e_mod_main PHONIES += conf_shelves install-conf_shelves conf_shelves: $(conf_shelvespkg_LTLIBRARIES) $(conf_shelves_DATA) install-conf_shelves: install-conf_shelvesDATA install-conf_shelvespkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_conf_theme.mk b/src/modules/Makefile_conf_theme.mk index 939b26693..1326ec85a 100644 --- a/src/modules/Makefile_conf_theme.mk +++ b/src/modules/Makefile_conf_theme.mk @@ -1,7 +1,8 @@ +EXTRA_DIST += src/modules/conf_theme/module.desktop.in +if USE_MODULE_CONF_THEME conf_themedir = $(MDIR)/conf_theme conf_theme_DATA = src/modules/conf_theme/module.desktop -EXTRA_DIST += $(conf_theme_DATA) conf_themepkgdir = $(MDIR)/conf_theme/$(MODULE_ARCH) conf_themepkg_LTLIBRARIES = src/modules/conf_theme/module.la @@ -24,3 +25,4 @@ src_modules_conf_theme_module_la_SOURCES = src/modules/conf_theme/e_mod_main.c \ PHONIES += conf_theme install-conf_theme conf_theme: $(conf_themepkg_LTLIBRARIES) $(conf_theme_DATA) install-conf_theme: install-conf_themeDATA install-conf_themepkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_conf_wallpaper2.mk b/src/modules/Makefile_conf_wallpaper2.mk index 437960b84..854e0e596 100644 --- a/src/modules/Makefile_conf_wallpaper2.mk +++ b/src/modules/Makefile_conf_wallpaper2.mk @@ -1,7 +1,8 @@ +EXTRA_DIST += src/modules/conf_wallpaper2/module.desktop.in +if USE_MODULE_CONF_WALLPAPER2 conf_wallpaper2dir = $(MDIR)/conf_wallpaper2 conf_wallpaper2_DATA = src/modules/conf_wallpaper2/module.desktop -EXTRA_DIST += $(conf_wallpaper2_DATA) conf_wallpaper2pkgdir = $(MDIR)/conf_wallpaper2/$(MODULE_ARCH) conf_wallpaper2pkg_LTLIBRARIES = src/modules/conf_wallpaper2/module.la @@ -16,3 +17,4 @@ src_modules_conf_wallpaper2_module_la_SOURCES = src/modules/conf_wallpaper2/e_mo PHONIES += conf_wallpaper2 install-conf_wallpaper2 conf_wallpaper2: $(conf_wallpaper2pkg_LTLIBRARIES) $(conf_wallpaper2_DATA) install-conf_wallpaper2: install-conf_wallpaper2DATA install-conf_wallpaper2pkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_conf_window_manipulation.mk b/src/modules/Makefile_conf_window_manipulation.mk index 42545ffc4..15d01d257 100644 --- a/src/modules/Makefile_conf_window_manipulation.mk +++ b/src/modules/Makefile_conf_window_manipulation.mk @@ -1,7 +1,9 @@ +EXTRA_DIST += src/modules/conf_window_manipulation/module.desktop.in \ +src/modules/conf_window_manipulation/e-module-conf_winmanip.edj +if USE_MODULE_CONF_WINDOW_MANIPULATION conf_window_manipulationdir = $(MDIR)/conf_window_manipulation conf_window_manipulation_DATA = src/modules/conf_window_manipulation/module.desktop -EXTRA_DIST += $(conf_window_manipulation_DATA) conf_window_manipulationpkgdir = $(MDIR)/conf_window_manipulation/$(MODULE_ARCH) conf_window_manipulationpkg_LTLIBRARIES = src/modules/conf_window_manipulation/module.la @@ -20,3 +22,4 @@ src_modules_conf_window_manipulation_module_la_SOURCES = src/modules/conf_window PHONIES += conf_window_manipulation install-conf_window_manipulation conf_window_manipulation: $(conf_window_manipulationpkg_LTLIBRARIES) $(conf_window_manipulation_DATA) install-conf_window_manipulation: install-conf_window_manipulationDATA install-conf_window_manipulationpkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_conf_window_remembers.mk b/src/modules/Makefile_conf_window_remembers.mk index 3a4f90fc7..a7bb47d93 100644 --- a/src/modules/Makefile_conf_window_remembers.mk +++ b/src/modules/Makefile_conf_window_remembers.mk @@ -1,8 +1,10 @@ +EXTRA_DIST += src/modules/conf_window_remembers/module.desktop.in \ +src/modules/conf_window_remembers/e-module-conf_window_remembers.edj +if USE_MODULE_CONF_WINDOW_REMEMBERS conf_window_remembersdir = $(MDIR)/conf_window_remembers conf_window_remembers_DATA = src/modules/conf_window_remembers/e-module-conf_window_remembers.edj \ src/modules/conf_window_remembers/module.desktop -EXTRA_DIST += $(conf_window_remembers_DATA) conf_window_rememberspkgdir = $(MDIR)/conf_window_remembers/$(MODULE_ARCH) conf_window_rememberspkg_LTLIBRARIES = src/modules/conf_window_remembers/module.la @@ -18,3 +20,4 @@ src/modules/conf_window_remembers/e_int_config_remembers.c PHONIES += conf_window_remembers install-conf_window_remembers conf_window_remembers: $(conf_window_rememberspkg_LTLIBRARIES) $(conf_window_remembers_DATA) install-conf_window_remembers: install-conf_window_remembersDATA install-conf_window_rememberspkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_connman.mk b/src/modules/Makefile_connman.mk index fdc47709e..59d38c53f 100644 --- a/src/modules/Makefile_connman.mk +++ b/src/modules/Makefile_connman.mk @@ -1,8 +1,10 @@ +EXTRA_DIST += src/modules/connman/module.desktop.in \ +src/modules/connman/e-module-connman.edj +if USE_MODULE_CONNMAN connmandir = $(MDIR)/connman connman_DATA = src/modules/connman/e-module-connman.edj \ src/modules/connman/module.desktop -EXTRA_DIST += $(connman_DATA) connmanpkgdir = $(MDIR)/connman/$(MODULE_ARCH) connmanpkg_LTLIBRARIES = src/modules/connman/module.la @@ -21,3 +23,4 @@ src_modules_connman_module_la_LIBADD = $(MOD_LIBS) @ECONNMAN_LIBS@ PHONIES += connman install-connman connman: $(connmanpkg_LTLIBRARIES) $(connman_DATA) install-connman: install-connmanDATA install-connmanpkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_contact.mk b/src/modules/Makefile_contact.mk index 00eff050b..ac98ffd7d 100644 --- a/src/modules/Makefile_contact.mk +++ b/src/modules/Makefile_contact.mk @@ -1,10 +1,10 @@ +EXTRA_DIST += src/modules/contact/module.desktop.in \ +src/modules/contact/e-module-contact.edj +if USE_MODULE_CONTACT contactdir = $(MDIR)/contact contact_DATA = src/modules/contact/e-module-contact.edj \ src/modules/contact/module.desktop -EXTRA_DIST += src/modules/contact/e-module-contact.edj \ - src/modules/contact/module.desktop.in - contactpkgdir = $(MDIR)/contact/$(MODULE_ARCH) contactpkg_LTLIBRARIES = src/modules/contact/module.la @@ -22,3 +22,4 @@ src_modules_contact_module_la_SOURCES = src/modules/contact/e_mod_main.c \ PHONIES += contact install-contact contact: $(contactpkg_LTLIBRARIES) $(contact_DATA) install-contact: install-contactDATA install-contactpkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_cpufreq.mk b/src/modules/Makefile_cpufreq.mk index f4cd588bc..d3a971282 100644 --- a/src/modules/Makefile_cpufreq.mk +++ b/src/modules/Makefile_cpufreq.mk @@ -1,8 +1,10 @@ +EXTRA_DIST += src/modules/cpufreq/module.desktop.in \ +src/modules/cpufreq/e-module-cpufreq.edj +if USE_MODULE_CPUFREQ cpufreqdir = $(MDIR)/cpufreq cpufreq_DATA = src/modules/cpufreq/e-module-cpufreq.edj \ src/modules/cpufreq/module.desktop -EXTRA_DIST += $(cpufreq_DATA) cpufreqpkgdir = $(MDIR)/cpufreq/$(MODULE_ARCH) cpufreqpkg_LTLIBRARIES = src/modules/cpufreq/module.la @@ -33,3 +35,4 @@ INSTALL_DATA_HOOKS += cpufreq-install-data-hook PHONIES += cpufreq install-cpufreq cpufreq: $(cpufreqpkg_LTLIBRARIES) $(cpufreq_DATA) $(src_modules_cpufreq_freqset_PROGRAMS) install-cpufreq: install-cpufreqDATA install-cpufreqpkgLTLIBRARIES install-src_modules_cpufreq_freqsetPROGRAMS +endif diff --git a/src/modules/Makefile_everything.mk b/src/modules/Makefile_everything.mk index 468ca9901..f731c863e 100644 --- a/src/modules/Makefile_everything.mk +++ b/src/modules/Makefile_everything.mk @@ -1,9 +1,12 @@ +EXTRA_DIST += src/modules/everything/module.desktop.in \ +src/modules/everything/e-module-everything.edj \ +src/modules/everything/e-module-everything-start.edj +if USE_MODULE_EVERYTHING everythingdir = $(MDIR)/everything everything_DATA = src/modules/everything/e-module-everything.edj \ src/modules/everything/e-module-everything-start.edj \ src/modules/everything/module.desktop -EXTRA_DIST += $(everything_DATA) everythingpkgdir = $(MDIR)/everything/$(MODULE_ARCH) everythingpkg_LTLIBRARIES = src/modules/everything/module.la @@ -44,9 +47,9 @@ dist_everything_headers_DATA = $(EVRYHEADERS) everything_pkgconfigdir = $(libdir)/pkgconfig everything_pkgconfig_DATA = src/modules/everything/everything.pc -EXTRA_DIST += src/modules/everything/everything.pc.in DISTCLEANFILES += src/modules/everything/everything.pc PHONIES += everything install-everything everything: $(everythingpkg_LTLIBRARIES) $(everything_DATA) install-everything: install-everythingDATA install-everythingpkgLTLIBRARIES install-everything_pkgconfig_DATA +endif diff --git a/src/modules/Makefile_fileman.mk b/src/modules/Makefile_fileman.mk index 827b167f8..d1e29dfc0 100644 --- a/src/modules/Makefile_fileman.mk +++ b/src/modules/Makefile_fileman.mk @@ -1,8 +1,10 @@ +EXTRA_DIST += src/modules/fileman/module.desktop.in \ +src/modules/fileman/e-module-fileman.edj +if USE_MODULE_FILEMAN filemandir = $(MDIR)/fileman fileman_DATA = src/modules/fileman/e-module-fileman.edj \ src/modules/fileman/module.desktop -EXTRA_DIST += $(fileman_DATA) filemanpkgdir = $(MDIR)/fileman/$(MODULE_ARCH) filemanpkg_LTLIBRARIES = src/modules/fileman/module.la @@ -23,3 +25,4 @@ src_modules_fileman_module_la_SOURCES = src/modules/fileman/e_mod_main.c \ PHONIES += fileman install-fileman fileman: $(filemanpkg_LTLIBRARIES) $(fileman_DATA) install-fileman: install-filemanDATA install-filemanpkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_fileman_opinfo.mk b/src/modules/Makefile_fileman_opinfo.mk index de9e1ace1..ddf8b4787 100644 --- a/src/modules/Makefile_fileman_opinfo.mk +++ b/src/modules/Makefile_fileman_opinfo.mk @@ -1,8 +1,10 @@ +EXTRA_DIST += src/modules/fileman_opinfo/module.desktop.in \ +src/modules/fileman_opinfo/e-module-fileman_opinfo.edj +if USE_MODULE_FILEMAN_OPINFO fileman_opinfodir = $(MDIR)/fileman_opinfo fileman_opinfo_DATA = src/modules/fileman_opinfo/e-module-fileman_opinfo.edj \ src/modules/fileman_opinfo/module.desktop -EXTRA_DIST += $(fileman_opinfo_DATA) fileman_opinfopkgdir = $(MDIR)/fileman_opinfo/$(MODULE_ARCH) fileman_opinfopkg_LTLIBRARIES = src/modules/fileman_opinfo/module.la @@ -15,3 +17,4 @@ src_modules_fileman_opinfo_module_la_SOURCES = src/modules/fileman_opinfo/e_mod_ PHONIES += fileman_opinfo install-fileman_opinfo fileman_opinfo: $(fileman_opinfopkg_LTLIBRARIES) $(fileman_opinfo_DATA) install-fileman_opinfo: install-fileman_opinfoDATA install-fileman_opinfopkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_gadman.mk b/src/modules/Makefile_gadman.mk index 1cae48382..6a0c9a4e3 100644 --- a/src/modules/Makefile_gadman.mk +++ b/src/modules/Makefile_gadman.mk @@ -1,8 +1,10 @@ +EXTRA_DIST += src/modules/gadman/module.desktop.in \ +src/modules/gadman/e-module-gadman.edj +if USE_MODULE_GADMAN gadmandir = $(MDIR)/gadman gadman_DATA = src/modules/gadman/e-module-gadman.edj \ src/modules/gadman/module.desktop -EXTRA_DIST += $(gadman_DATA) gadmanpkgdir = $(MDIR)/gadman/$(MODULE_ARCH) gadmanpkg_LTLIBRARIES = src/modules/gadman/module.la @@ -18,3 +20,4 @@ src_modules_gadman_module_la_SOURCES = src/modules/gadman/e_mod_main.c \ PHONIES += gadman install-gadman gadman: $(gadmanpkg_LTLIBRARIES) $(gadman_DATA) install-gadman: install-gadmanDATA install-gadmanpkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_ibar.mk b/src/modules/Makefile_ibar.mk index c7f54e80a..f808436e1 100644 --- a/src/modules/Makefile_ibar.mk +++ b/src/modules/Makefile_ibar.mk @@ -1,8 +1,10 @@ +EXTRA_DIST += src/modules/ibar/module.desktop.in \ +src/modules/ibar/e-module-ibar.edj +if USE_MODULE_IBAR ibardir = $(MDIR)/ibar ibar_DATA = src/modules/ibar/e-module-ibar.edj \ src/modules/ibar/module.desktop -EXTRA_DIST += $(ibar_DATA) ibarpkgdir = $(MDIR)/ibar/$(MODULE_ARCH) ibarpkg_LTLIBRARIES = src/modules/ibar/module.la @@ -17,3 +19,4 @@ src_modules_ibar_module_la_SOURCES = src/modules/ibar/e_mod_main.c \ PHONIES += ibar install-ibar ibar: $(ibarpkg_LTLIBRARIES) $(ibar_DATA) install-ibar: install-ibarDATA install-ibarpkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_ibox.mk b/src/modules/Makefile_ibox.mk index 13a05c904..750a3de45 100644 --- a/src/modules/Makefile_ibox.mk +++ b/src/modules/Makefile_ibox.mk @@ -1,8 +1,10 @@ +EXTRA_DIST += src/modules/ibox/module.desktop.in \ +src/modules/ibox/e-module-ibox.edj +if USE_MODULE_IBOX iboxdir = $(MDIR)/ibox ibox_DATA = src/modules/ibox/e-module-ibox.edj \ src/modules/ibox/module.desktop -EXTRA_DIST += $(ibox_DATA) iboxpkgdir = $(MDIR)/ibox/$(MODULE_ARCH) iboxpkg_LTLIBRARIES = src/modules/ibox/module.la @@ -17,3 +19,4 @@ src_modules_ibox_module_la_SOURCES = src/modules/ibox/e_mod_main.c \ PHONIES += ibox install-ibox ibox: $(iboxpkg_LTLIBRARIES) $(ibox_DATA) install-ibox: install-iboxDATA install-iboxpkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_illume-bluetooth.mk b/src/modules/Makefile_illume-bluetooth.mk index 293fd34f5..a8672fd70 100644 --- a/src/modules/Makefile_illume-bluetooth.mk +++ b/src/modules/Makefile_illume-bluetooth.mk @@ -1,8 +1,8 @@ +if USE_MODULE_ILLUME-BLUETOOTH illume_bluetoothdir = $(MDIR)/illume-bluetooth illume_bluetooth_DATA = src/modules/illume-bluetooth/e-module-illume-bluetooth.edj \ src/modules/illume-bluetooth/module.desktop -EXTRA_DIST += $(illume_bluetooth_DATA) illume_bluetoothpkgdir = $(MDIR)/illume-bluetooth/$(MODULE_ARCH) illume_bluetoothpkg_LTLIBRARIES = src/modules/illume-bluetooth/module.la @@ -15,3 +15,4 @@ src_modules_illume_bluetooth_module_la_SOURCES = src/modules/illume-bluetooth/e_ PHONIES += illume_bluetooth install-illume_bluetooth illume_bluetooth: $(illume_bluetoothpkg_LTLIBRARIES) $(illume_bluetooth_DATA) install-illume_bluetooth: install-illume_bluetoothDATA install-illume_bluetoothpkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_illume-home-toggle.mk b/src/modules/Makefile_illume-home-toggle.mk index 49d2e7ca9..e37aea7b3 100644 --- a/src/modules/Makefile_illume-home-toggle.mk +++ b/src/modules/Makefile_illume-home-toggle.mk @@ -1,8 +1,8 @@ +if USE_MODULE_ILLUME-HOME-TOGGLE illume_home_toggledir = $(MDIR)/illume-home-toggle illume_home_toggle_DATA = src/modules/illume-home-toggle/e-module-illume-home-toggle.edj \ src/modules/illume-home-toggle/module.desktop -EXTRA_DIST += $(illume_home_toggle_DATA) illume_home_togglepkgdir = $(MDIR)/illume-home-toggle/$(MODULE_ARCH) illume_home_togglepkg_LTLIBRARIES = src/modules/illume-home-toggle/module.la @@ -15,3 +15,4 @@ src_modules_illume_home_toggle_module_la_SOURCES = src/modules/illume-home-toggl PHONIES += illume_home_toggle install-illume_home_toggle illume_home_toggle: $(illume_home_togglepkg_LTLIBRARIES) $(illume_home_toggle_DATA) install-illume_home_toggle: install-illume_home_toggleDATA install-illume_home_togglepkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_illume-home.mk b/src/modules/Makefile_illume-home.mk index d2ad0848b..08425df91 100644 --- a/src/modules/Makefile_illume-home.mk +++ b/src/modules/Makefile_illume-home.mk @@ -1,8 +1,8 @@ +if USE_MODULE_ILLUME-HOME illume_homedir = $(MDIR)/illume-home illume_home_DATA = src/modules/illume-home/e-module-illume-home.edj \ src/modules/illume-home/module.desktop -EXTRA_DIST += $(illume_home_DATA) illume_homepkgdir = $(MDIR)/illume-home/$(MODULE_ARCH) illume_homepkg_LTLIBRARIES = src/modules/illume-home/module.la @@ -20,3 +20,4 @@ src/modules/illume-home/e_busycover.h PHONIES += illume_home install-illume_home illume_home: $(illume_homepkg_LTLIBRARIES) $(illume_home_DATA) install-illume_home: install-illume_homeDATA install-illume_homepkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_illume-indicator.mk b/src/modules/Makefile_illume-indicator.mk index 66868c61f..e7f51001f 100644 --- a/src/modules/Makefile_illume-indicator.mk +++ b/src/modules/Makefile_illume-indicator.mk @@ -1,7 +1,7 @@ +if USE_MODULE_ILLUME-INDICATOR illume_indicatordir = $(MDIR)/illume-indicator illume_indicator_DATA = src/modules/illume-indicator/e-module-illume-indicator.edj \ src/modules/illume-indicator/module.desktop -EXTRA_DIST += src/modules/illume-indicator/module.desktop.in \ src/modules/illume-indicator/e-module-illume-indicator.edj illume_indicatorpkgdir = $(MDIR)/illume-indicator/$(MODULE_ARCH) @@ -26,3 +26,4 @@ src_modules_illume_indicator_module_la_LIBADD = $(MOD_LIBS) @ENOTIFY_LIBS@ PHONIES += illume_indicator install-illume_indicator illume_indicator: $(illume_indicatorpkg_LTLIBRARIES) $(illume_indicator_DATA) install-illume_indicator: install-illume_indicatorDATA install-illume_indicatorpkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_illume-kbd-toggle.mk b/src/modules/Makefile_illume-kbd-toggle.mk index 07e94808e..09bcdf0a8 100644 --- a/src/modules/Makefile_illume-kbd-toggle.mk +++ b/src/modules/Makefile_illume-kbd-toggle.mk @@ -1,8 +1,8 @@ +if USE_MODULE_ILLUME-KBD-TOGGLE illume_kbd_toggledir = $(MDIR)/illume-kbd-toggle illume_kbd_toggle_DATA = src/modules/illume-kbd-toggle/e-module-illume-kbd-toggle.edj \ src/modules/illume-kbd-toggle/module.desktop -EXTRA_DIST += $(illume_kbd_toggle_DATA) illume_kbd_togglepkgdir = $(MDIR)/illume-kbd-toggle/$(MODULE_ARCH) illume_kbd_togglepkg_LTLIBRARIES = src/modules/illume-kbd-toggle/module.la @@ -15,3 +15,4 @@ src_modules_illume_kbd_toggle_module_la_SOURCES = src/modules/illume-kbd-toggle/ PHONIES += illume_kbd_toggle install-illume_kbd_toggle illume_kbd_toggle: $(illume_kbd_togglepkg_LTLIBRARIES) $(illume_kbd_toggle_DATA) install-illume_kbd_toggle: install-illume_kbd_toggleDATA install-illume_kbd_togglepkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_illume-keyboard.mk b/src/modules/Makefile_illume-keyboard.mk index c58bb329c..8d80f8a4f 100644 --- a/src/modules/Makefile_illume-keyboard.mk +++ b/src/modules/Makefile_illume-keyboard.mk @@ -1,8 +1,8 @@ +if USE_MODULE_ILLUME-KEYBOARD illume_keyboarddir = $(MDIR)/illume-keyboard illume_keyboard_DATA = src/modules/illume-keyboard/e-module-illume-keyboard.edj \ src/modules/illume-keyboard/module.desktop -EXTRA_DIST += src/modules/illume-keyboard/e-module-illume-keyboard.edj \ src/modules/illume-keyboard/module.desktop.in @@ -24,14 +24,12 @@ illumekeyboards_DATA = src/modules/illume-keyboard/keyboards/ignore_built_in_key src/modules/illume-keyboard/keyboards/enter.png \ src/modules/illume-keyboard/keyboards/backspace.png -EXTRA_DIST += $(illumekeyboards_DATA) # dicts illumedictsdir = $(MDIR)/illume-keyboard/dicts illumedicts_DATA = src/modules/illume-keyboard/dicts/English_US.dic \ src/modules/illume-keyboard/dicts/English_US_Small.dic -EXTRA_DIST += $(illumedicts_DATA) illume_keyboardpkgdir = $(MDIR)/illume-keyboard/$(MODULE_ARCH) @@ -57,3 +55,4 @@ src_modules_illume_keyboard_module_la_SOURCES = src/modules/illume-keyboard/e_mo PHONIES += illume_keyboard install-illume_keyboard illume_keyboard: $(illume_keyboardpkg_LTLIBRARIES) $(illume_keyboard_DATA) install-illume_keyboard: install-illume_keyboardDATA install-illume_keyboardpkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_illume-mode-toggle.mk b/src/modules/Makefile_illume-mode-toggle.mk index 1db181d12..616eb8781 100644 --- a/src/modules/Makefile_illume-mode-toggle.mk +++ b/src/modules/Makefile_illume-mode-toggle.mk @@ -1,8 +1,8 @@ +if USE_MODULE_ILLUME-MODE-TOGGLE illume_mode_toggledir = $(MDIR)/illume-mode-toggle illume_mode_toggle_DATA = src/modules/illume-mode-toggle/e-module-illume-mode-toggle.edj \ src/modules/illume-mode-toggle/module.desktop -EXTRA_DIST += $(illume_mode_toggle_DATA) illume_mode_togglepkgdir = $(MDIR)/illume-mode-toggle/$(MODULE_ARCH) illume_mode_togglepkg_LTLIBRARIES = src/modules/illume-mode-toggle/module.la @@ -15,3 +15,4 @@ src_modules_illume_mode_toggle_module_la_SOURCES = src/modules/illume-mode-toggl PHONIES += illume_mode_toggle install-illume_mode_toggle illume_mode_toggle: $(illume_mode_togglepkg_LTLIBRARIES) $(illume_mode_toggle_DATA) install-illume_mode_toggle: install-illume_mode_toggleDATA install-illume_mode_togglepkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_illume-softkey.mk b/src/modules/Makefile_illume-softkey.mk index a40f960d7..ff8fe9311 100644 --- a/src/modules/Makefile_illume-softkey.mk +++ b/src/modules/Makefile_illume-softkey.mk @@ -1,8 +1,8 @@ +if USE_MODULE_ILLUME-SOFTKEY illume_softkeydir = $(MDIR)/illume-softkey illume_softkey_DATA = src/modules/illume-softkey/e-module-illume-softkey.edj \ src/modules/illume-softkey/module.desktop -EXTRA_DIST += src/modules/illume-softkey/e-module-illume-softkey.edj \ src/modules/illume-softkey/module.desktop.in @@ -22,3 +22,4 @@ src_modules_illume_softkey_module_la_SOURCES = src/modules/illume-softkey/e_mod_ PHONIES += illume_softkey install-illume_softkey illume_softkey: $(illume_softkeypkg_LTLIBRARIES) $(illume_softkey_DATA) install-illume_softkey: install-illume_softkeyDATA install-illume_softkeypkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_illume2.mk b/src/modules/Makefile_illume2.mk index bac4dcf72..7408b9aa3 100644 --- a/src/modules/Makefile_illume2.mk +++ b/src/modules/Makefile_illume2.mk @@ -1,14 +1,15 @@ +EXTRA_DIST += src/modules/illume2/module.desktop.in \ +src/modules/illume2/e-module-illume2.edj +if USE_MODULE_ILLUME2 illume2dir = $(MDIR)/illume2 illume2_DATA = src/modules/illume2/e-module-illume2.edj \ src/modules/illume2/module.desktop -EXTRA_DIST += src/modules/illume2/e-module-illume2.edj \ src/modules/illume2/module.desktop.in # keyboards illume2keyboardsdir = $(MDIR)/illume2/keyboards illume2keyboards_DATA = src/modules/illume2/keyboards/ignore_built_in_keyboards -EXTRA_DIST += $(illume2keyboards_DATA) # policies ## illume @@ -63,3 +64,4 @@ src_modules_illume2_module_la_SOURCES = src/modules/illume2/e_mod_main.c \ PHONIES += illume2 install-illume2 illume2: $(illume2pkg_LTLIBRARIES) $(illume2_DATA) install-illume2: install-illume2DATA install-illume2pkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_lokker.mk b/src/modules/Makefile_lokker.mk index f097f0245..04dabaa6d 100644 --- a/src/modules/Makefile_lokker.mk +++ b/src/modules/Makefile_lokker.mk @@ -1,7 +1,7 @@ +if USE_MODULE_LOKKER lokkerdir = $(MDIR)/lokker ##lokker_DATA = \ ##src/modules/lokker/e-module-lokker.edj -##EXTRA_DIST += $(lokker_DATA) lokkerpkgdir = $(MDIR)/lokker/$(MODULE_ARCH) lokkerpkg_LTLIBRARIES = src/modules/lokker/module.la @@ -17,3 +17,4 @@ src/modules/lokker/e_mod_main.h PHONIES += lokker install-lokker lokker: $(lokkerpkg_LTLIBRARIES) #$(lokker_DATA) install-lokker: install-lokkerpkgLTLIBRARIES #install-lokkerDATA +endif diff --git a/src/modules/Makefile_mixer.mk b/src/modules/Makefile_mixer.mk index 7aa0bf52d..c5815d923 100644 --- a/src/modules/Makefile_mixer.mk +++ b/src/modules/Makefile_mixer.mk @@ -1,8 +1,10 @@ +EXTRA_DIST += src/modules/mixer/module.desktop.in \ +src/modules/mixer/e-module-mixer.edj +if USE_MODULE_MIXER mixerdir = $(MDIR)/mixer mixer_DATA = src/modules/mixer/e-module-mixer.edj \ src/modules/mixer/module.desktop -EXTRA_DIST += $(mixer_DATA) mixerpkgdir = $(MDIR)/mixer/$(MODULE_ARCH) mixerpkg_LTLIBRARIES = src/modules/mixer/module.la @@ -42,3 +44,4 @@ endif PHONIES += mixer install-mixer mixer: $(mixerpkg_LTLIBRARIES) $(mixer_DATA) install-mixer: install-mixerDATA install-mixerpkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_msgbus.mk b/src/modules/Makefile_msgbus.mk index c829fa30a..15f9d7281 100644 --- a/src/modules/Makefile_msgbus.mk +++ b/src/modules/Makefile_msgbus.mk @@ -1,8 +1,10 @@ +EXTRA_DIST += src/modules/msgbus/module.desktop.in \ +src/modules/msgbus/e-module-msgbus.edj +if USE_MODULE_MSGBUS msgbusdir = $(MDIR)/msgbus msgbus_DATA = src/modules/msgbus/e-module-msgbus.edj \ src/modules/msgbus/module.desktop -EXTRA_DIST += $(msgbus_DATA) msgbuspkgdir = $(MDIR)/msgbus/$(MODULE_ARCH) msgbuspkg_LTLIBRARIES = src/modules/msgbus/module.la @@ -20,3 +22,4 @@ src/modules/msgbus/msgbus_lang.c PHONIES += msgbus install-msgbus msgbus: $(msgbuspkg_LTLIBRARIES) $(msgbus_DATA) install-msgbus: install-msgbusDATA install-msgbuspkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_music_control.mk b/src/modules/Makefile_music_control.mk index b0a29d8fc..adcaa1859 100644 --- a/src/modules/Makefile_music_control.mk +++ b/src/modules/Makefile_music_control.mk @@ -1,8 +1,9 @@ +EXTRA_DIST += src/modules/music-control/module.desktop.in \ +src/modules/music-control/e-module-music-control.edj music_controldir = $(MDIR)/music-control music_control_DATA = src/modules/music-control/module.desktop \ src/modules/music-control/e-module-music-control.edj -EXTRA_DIST += $(music_control_DATA) music_controlpkgdir = $(MDIR)/music-control/$(MODULE_ARCH) music_controlpkg_LTLIBRARIES = src/modules/music-control/module.la diff --git a/src/modules/Makefile_notification.mk b/src/modules/Makefile_notification.mk index c5f2ba935..769df1358 100644 --- a/src/modules/Makefile_notification.mk +++ b/src/modules/Makefile_notification.mk @@ -1,8 +1,10 @@ +EXTRA_DIST += src/modules/notification/module.desktop.in \ +src/modules/notification/e-module-notification.edj +if USE_MODULE_NOTIFICATION notificationdir = $(MDIR)/notification notification_DATA = src/modules/notification/e-module-notification.edj \ src/modules/notification/module.desktop -EXTRA_DIST += $(notification_DATA) notificationpkgdir = $(MDIR)/notification/$(MODULE_ARCH) notificationpkg_LTLIBRARIES = src/modules/notification/module.la @@ -19,3 +21,4 @@ src_modules_notification_module_la_LIBADD = $(MOD_LIBS) @ENOTIFY_LIBS@ PHONIES += notification install-notification notification: $(notificationpkg_LTLIBRARIES) $(notification_DATA) install-notification: install-notificationDATA install-notificationpkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_packagekit.mk b/src/modules/Makefile_packagekit.mk index a902b4faa..3da129414 100644 --- a/src/modules/Makefile_packagekit.mk +++ b/src/modules/Makefile_packagekit.mk @@ -1,8 +1,10 @@ +EXTRA_DIST += src/modules/packagekit/module.desktop.in \ +src/modules/packagekit/e-module-packagekit.edj +if USE_MODULE_PACKAGEKIT packagekitdir = $(MDIR)/packagekit packagekit_DATA = src/modules/packagekit/e-module-packagekit.edj \ src/modules/packagekit/module.desktop -EXTRA_DIST += $(packagekit_DATA) packagekitpkgdir = $(MDIR)/packagekit/$(MODULE_ARCH) packagekitpkg_LTLIBRARIES = src/modules/packagekit/module.la @@ -21,3 +23,4 @@ src_modules_packagekit_module_la_SOURCES = \ PHONIES += packagekit install-packagekit packagekit: $(packagekitpkg_LTLIBRARIES) $(packagekit_DATA) install-packagekit: install-packagekitDATA install-packagekitpkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_pager.mk b/src/modules/Makefile_pager.mk index c5a153951..18ea68e16 100644 --- a/src/modules/Makefile_pager.mk +++ b/src/modules/Makefile_pager.mk @@ -1,8 +1,10 @@ +EXTRA_DIST += src/modules/pager/module.desktop.in \ +src/modules/pager/e-module-pager.edj +if USE_MODULE_PAGER pagerdir = $(MDIR)/pager pager_DATA = src/modules/pager/e-module-pager.edj \ src/modules/pager/module.desktop -EXTRA_DIST += $(pager_DATA) pagerpkgdir = $(MDIR)/pager/$(MODULE_ARCH) pagerpkg_LTLIBRARIES = src/modules/pager/module.la @@ -17,3 +19,4 @@ src_modules_pager_module_la_SOURCES = src/modules/pager/e_mod_main.h \ PHONIES += pager install-pager pager: $(pagerpkg_LTLIBRARIES) $(pager_DATA) install-pager: install-pagerDATA install-pagerpkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_pager16.mk b/src/modules/Makefile_pager16.mk index b7fcddd4d..26dc48491 100644 --- a/src/modules/Makefile_pager16.mk +++ b/src/modules/Makefile_pager16.mk @@ -1,8 +1,10 @@ +EXTRA_DIST += src/modules/pager16/module.desktop.in \ +src/modules/pager16/e-module-pager16.edj +if USE_MODULE_PAGER16 pager16dir = $(MDIR)/pager16 pager16_DATA = src/modules/pager16/e-module-pager16.edj \ src/modules/pager16/module.desktop -EXTRA_DIST += $(pager16_DATA) pager16pkgdir = $(MDIR)/pager16/$(MODULE_ARCH) pager16pkg_LTLIBRARIES = src/modules/pager16/module.la @@ -17,3 +19,4 @@ src_modules_pager16_module_la_SOURCES = src/modules/pager16/e_mod_main.h \ PHONIES += pager16 install-pager16 pager16: $(pager16pkg_LTLIBRARIES) $(pager16_DATA) install-pager16: install-pager16DATA install-pager16pkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_physics.mk b/src/modules/Makefile_physics.mk index 5814dacfe..76c66fe20 100644 --- a/src/modules/Makefile_physics.mk +++ b/src/modules/Makefile_physics.mk @@ -2,7 +2,6 @@ physicsdir = $(MDIR)/physics physics_DATA = src/modules/physics/e-module-physics.edj \ src/modules/physics/module.desktop -EXTRA_DIST += $(physics_DATA) src_modules_physics_module_la_CPPFLAGS = $(MOD_CPPFLAGS) src_modules_physics_module_la_CPPFLAGS += @EPHYSICS_CFLAGS@ diff --git a/src/modules/Makefile_quickaccess.mk b/src/modules/Makefile_quickaccess.mk index 4ed17f848..0268bdd07 100644 --- a/src/modules/Makefile_quickaccess.mk +++ b/src/modules/Makefile_quickaccess.mk @@ -1,8 +1,10 @@ +EXTRA_DIST += src/modules/quickaccess/module.desktop.in \ +src/modules/quickaccess/e-module-quickaccess.edj +if USE_MODULE_QUICKACCESS quickaccessdir = $(MDIR)/quickaccess quickaccess_DATA = src/modules/quickaccess/e-module-quickaccess.edj \ src/modules/quickaccess/module.desktop -EXTRA_DIST += $(quickaccess_DATA) quickaccesspkgdir = $(MDIR)/quickaccess/$(MODULE_ARCH) quickaccesspkg_LTLIBRARIES = src/modules/quickaccess/module.la @@ -20,3 +22,4 @@ src/modules/quickaccess/e_quickaccess_db.c PHONIES += quickaccess install-quickaccess quickaccess: $(quickaccesspkg_LTLIBRARIES) $(quickaccess_DATA) install-quickaccess: install-quickaccessDATA install-quickaccesspkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_shot.mk b/src/modules/Makefile_shot.mk index 0555704dc..c9a7eefae 100644 --- a/src/modules/Makefile_shot.mk +++ b/src/modules/Makefile_shot.mk @@ -1,8 +1,10 @@ +EXTRA_DIST += src/modules/shot/module.desktop.in \ +src/modules/shot/e-module-shot.edj +if USE_MODULE_SHOT shotdir = $(MDIR)/shot shot_DATA = src/modules/shot/e-module-shot.edj \ src/modules/shot/module.desktop -EXTRA_DIST += $(shot_DATA) shotpkgdir = $(MDIR)/shot/$(MODULE_ARCH) shotpkg_LTLIBRARIES = src/modules/shot/module.la @@ -15,3 +17,4 @@ src_modules_shot_module_la_SOURCES = src/modules/shot/e_mod_main.c PHONIES += shot install-shot shot: $(shotpkg_LTLIBRARIES) $(shot_DATA) install-shot: install-shotDATA install-shotpkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_start.mk b/src/modules/Makefile_start.mk index 067850d07..1f72bf401 100644 --- a/src/modules/Makefile_start.mk +++ b/src/modules/Makefile_start.mk @@ -1,8 +1,10 @@ +EXTRA_DIST += src/modules/start/module.desktop.in \ +src/modules/start/e-module-start.edj +if USE_MODULE_START startdir = $(MDIR)/start start_DATA = src/modules/start/e-module-start.edj \ src/modules/start/module.desktop -EXTRA_DIST += $(start_DATA) startpkgdir = $(MDIR)/start/$(MODULE_ARCH) startpkg_LTLIBRARIES = src/modules/start/module.la @@ -15,3 +17,4 @@ src_modules_start_module_la_SOURCES = src/modules/start/e_mod_main.c PHONIES += start install-start start: $(startpkg_LTLIBRARIES) $(start_DATA) install-start: install-startDATA install-startpkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_syscon.mk b/src/modules/Makefile_syscon.mk index 2f3f8e5e0..1d1d1e578 100644 --- a/src/modules/Makefile_syscon.mk +++ b/src/modules/Makefile_syscon.mk @@ -1,8 +1,10 @@ +EXTRA_DIST += src/modules/syscon/module.desktop.in \ +src/modules/syscon/e-module-syscon.edj +if USE_MODULE_SYSCON syscondir = $(MDIR)/syscon syscon_DATA = src/modules/syscon/e-module-syscon.edj \ src/modules/syscon/module.desktop -EXTRA_DIST += $(syscon_DATA) sysconpkgdir = $(MDIR)/syscon/$(MODULE_ARCH) sysconpkg_LTLIBRARIES = src/modules/syscon/module.la @@ -19,3 +21,4 @@ src_modules_syscon_module_la_SOURCES = src/modules/syscon/e_mod_main.c \ PHONIES += syscon install-syscon syscon: $(sysconpkg_LTLIBRARIES) $(syscon_DATA) install-syscon: install-sysconDATA install-sysconpkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_systray.mk b/src/modules/Makefile_systray.mk index 47fed8d7c..02b4c921f 100644 --- a/src/modules/Makefile_systray.mk +++ b/src/modules/Makefile_systray.mk @@ -1,8 +1,10 @@ +EXTRA_DIST += src/modules/systray/module.desktop.in \ +src/modules/systray/e-module-systray.edj +if USE_MODULE_SYSTRAY systraydir = $(MDIR)/systray systray_DATA = src/modules/systray/e-module-systray.edj \ src/modules/systray/module.desktop -EXTRA_DIST += $(systray_DATA) systraypkgdir = $(MDIR)/systray/$(MODULE_ARCH) systraypkg_LTLIBRARIES = src/modules/systray/module.la @@ -24,3 +26,4 @@ endif PHONIES += systray install-systray systray: $(systraypkg_LTLIBRARIES) $(systray_DATA) install-systray: install-systrayDATA install-systraypkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_tasks.mk b/src/modules/Makefile_tasks.mk index 937796e1a..75926d3cd 100644 --- a/src/modules/Makefile_tasks.mk +++ b/src/modules/Makefile_tasks.mk @@ -1,8 +1,10 @@ +EXTRA_DIST += src/modules/tasks/module.desktop.in \ +src/modules/tasks/e-module-tasks.edj +if USE_MODULE_TASKS tasksdir = $(MDIR)/tasks tasks_DATA = src/modules/tasks/e-module-tasks.edj \ src/modules/tasks/module.desktop -EXTRA_DIST += $(tasks_DATA) taskspkgdir = $(MDIR)/tasks/$(MODULE_ARCH) taskspkg_LTLIBRARIES = src/modules/tasks/module.la @@ -17,3 +19,4 @@ src_modules_tasks_module_la_SOURCES = src/modules/tasks/e_mod_main.c \ PHONIES += tasks install-tasks tasks: $(taskspkg_LTLIBRARIES) $(tasks_DATA) install-tasks: install-tasksDATA install-taskspkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_teamwork.mk b/src/modules/Makefile_teamwork.mk index 0a2d4ab0e..6bf703515 100644 --- a/src/modules/Makefile_teamwork.mk +++ b/src/modules/Makefile_teamwork.mk @@ -1,8 +1,10 @@ +EXTRA_DIST += src/modules/teamwork/module.desktop.in \ +src/modules/teamwork/e-module-teamwork.edj +if USE_MODULE_TEAMWORK teamworkdir = $(MDIR)/teamwork teamwork_DATA = src/modules/teamwork/e-module-teamwork.edj \ src/modules/teamwork/module.desktop -EXTRA_DIST += $(teamwork_DATA) teamworkpkgdir = $(MDIR)/teamwork/$(MODULE_ARCH) teamworkpkg_LTLIBRARIES = src/modules/teamwork/module.la @@ -21,3 +23,4 @@ src/modules/teamwork/sha1.h PHONIES += teamwork install-teamwork teamwork: $(teamworkpkg_LTLIBRARIES) $(teamwork_DATA) install-teamwork: install-teamworkDATA install-teamworkpkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_temperature.mk b/src/modules/Makefile_temperature.mk index 110135f37..b59e25a17 100644 --- a/src/modules/Makefile_temperature.mk +++ b/src/modules/Makefile_temperature.mk @@ -1,8 +1,10 @@ +EXTRA_DIST += src/modules/temperature/module.desktop.in \ +src/modules/temperature/e-module-temperature.edj +if USE_MODULE_TEMPERATURE temperaturedir = $(MDIR)/temperature temperature_DATA = src/modules/temperature/e-module-temperature.edj \ src/modules/temperature/module.desktop -EXTRA_DIST += $(temperature_DATA) temperaturepkgdir = $(MDIR)/temperature/$(MODULE_ARCH) temperaturepkg_LTLIBRARIES = src/modules/temperature/module.la @@ -30,3 +32,4 @@ src_modules_temperature_tempget_LDADD = @TEMPERATURE_LIBS@ PHONIES += temperature install-temperature temperature: $(temperaturepkg_LTLIBRARIES) $(temperature_DATA) $(src_modules_temperature_tempget_PROGRAMS) install-temperature: install-temperatureDATA install-temperaturepkgLTLIBRARIES install-src_modules_temperature_tempgetPROGRAMS +endif diff --git a/src/modules/Makefile_tiling.mk b/src/modules/Makefile_tiling.mk index befaa7b91..5c5138572 100644 --- a/src/modules/Makefile_tiling.mk +++ b/src/modules/Makefile_tiling.mk @@ -1,9 +1,11 @@ +EXTRA_DIST += src/modules/tiling/module.desktop.in \ +src/modules/tiling/e-module-tiling.edj +if USE_MODULE_TILING tilingdir = $(MDIR)/tiling tiling_DATA = src/modules/tiling/e-module-tiling.edj \ src/modules/tiling/module.desktop CLEANFILES += src/modules/tiling/e-module-tiling.edj -EXTRA_DIST += $(tiling_DATA) \ src/modules/tiling/e-module-tiling.edc \ src/modules/tiling/module.desktop.in \ src/modules/tiling/images/module_icon.png \ @@ -34,3 +36,4 @@ src_modules_tiling_module_la_SOURCES = src/modules/tiling/e_mod_tiling.c \ PHONIES += tiling install-tiling tiling: $(tilingpkg_LTLIBRARIES) $(tiling_DATA) install-tiling: install-tilingDATA install-tilingpkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_winlist.mk b/src/modules/Makefile_winlist.mk index 8a57b95dd..b2f59e085 100644 --- a/src/modules/Makefile_winlist.mk +++ b/src/modules/Makefile_winlist.mk @@ -1,8 +1,10 @@ +EXTRA_DIST += src/modules/winlist/module.desktop.in \ +src/modules/winlist/e-module-winlist.edj +if USE_MODULE_WINLIST winlistdir = $(MDIR)/winlist winlist_DATA = src/modules/winlist/e-module-winlist.edj \ src/modules/winlist/module.desktop -EXTRA_DIST += $(winlist_DATA) winlistpkgdir = $(MDIR)/winlist/$(MODULE_ARCH) winlistpkg_LTLIBRARIES = src/modules/winlist/module.la @@ -19,3 +21,4 @@ src_modules_winlist_module_la_SOURCES = src/modules/winlist/e_mod_main.h \ PHONIES += winlist install-winlist winlist: $(winlistpkg_LTLIBRARIES) $(winlist_DATA) install-winlist: install-winlistDATA install-winlistpkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_wizard.mk b/src/modules/Makefile_wizard.mk index 12e5d9280..d741ed9f0 100644 --- a/src/modules/Makefile_wizard.mk +++ b/src/modules/Makefile_wizard.mk @@ -1,12 +1,19 @@ +wd = src/modules/wizard/data/def-ibar.txt +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 \ +src/modules/wizard/e-module-wizard.edj \ +$(wd) \ +$(wdd) +if USE_MODULE_WIZARD wizarddir = $(MDIR)/wizard -wizard_DATA = src/modules/wizard/data/def-ibar.txt +wizard_DATA = $(wd) wizard_desktopdir = $(MDIR)/wizard/desktop -wizard_desktop_DATA = src/modules/wizard/data/desktop/home.desktop \ - src/modules/wizard/data/desktop/root.desktop \ - src/modules/wizard/data/desktop/tmp.desktop +wizard_desktop_DATA = $(wdd) -EXTRA_DIST += $(wizard_DATA) $(wizard_desktop_DATA) ### dont install these - this way e wont list the module for people to #wizard_DATA = src/modules/wizard/e-module-wizard.edj \ @@ -154,3 +161,4 @@ src_modules_wizard_page_200_la_SOURCES = src/modules/wizard/page_200.c PHONIES += wizard install-wizard wizard: $(wizardpkg_LTLIBRARIES) $(wizard_DATA) install-wizard: install-wizardDATA install-wizardpkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_wl_desktop_shell.mk b/src/modules/Makefile_wl_desktop_shell.mk index 6e25bd8cf..905abfc16 100644 --- a/src/modules/Makefile_wl_desktop_shell.mk +++ b/src/modules/Makefile_wl_desktop_shell.mk @@ -1,8 +1,10 @@ +EXTRA_DIST += src/modules/wl_desktop_shell/module.desktop.in \ +src/modules/wl_desktop_shell/e-module-wl_desktop_shell.edj +if USE_MODULE_WL_DESKTOP_SHELL wl_desktop_shelldir = $(MDIR)/wl_desktop_shell wl_desktop_shell_DATA = src/modules/wl_desktop_shell/e-module-wl_desktop_shell.edj \ src/modules/wl_desktop_shell/module.desktop -EXTRA_DIST += src/modules/wl_desktop_shell/e-module-wl_desktop_shell.edj \ src/modules/wl_desktop_shell/module.desktop.in \ src/modules/wl_desktop_shell/e-desktop-shell.xml \ src/modules/wl_desktop_shell/e_desktop_shell_protocol.h \ @@ -24,3 +26,4 @@ src_modules_wl_desktop_shell_module_la_SOURCES = src/modules/wl_desktop_shell/e_ PHONIES += wl_desktop_shell install-wl_desktop_shell wl_desktop_shell: $(wl_desktop_shellpkg_LTLIBRARIES) $(wl_desktop_shell_DATA) install-wl_desktop_shell: install-wl_desktop_shellDATA install-wl_desktop_shellpkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_wl_fb.mk b/src/modules/Makefile_wl_fb.mk index 4b3c66edb..9765dd53f 100644 --- a/src/modules/Makefile_wl_fb.mk +++ b/src/modules/Makefile_wl_fb.mk @@ -1,3 +1,4 @@ +if USE_MODULE_WL_FB wl_fbdir = $(MDIR)/wl_fb wl_fbpkgdir = $(MDIR)/wl_fb/$(MODULE_ARCH) @@ -13,3 +14,4 @@ src_modules_wl_fb_module_la_SOURCES = src/modules/wl_fb/e_mod_main.c #.PHONY: wl_fb install-wl_fb #wl_fb: $(wl_fbpkg_LTLIBRARIES) $(wl_fb_DATA) #install-wl_fb: install-wl_fbDATA install-wl_fbpkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_wl_screenshot.mk b/src/modules/Makefile_wl_screenshot.mk index cc6e19c7c..0cd325d9f 100644 --- a/src/modules/Makefile_wl_screenshot.mk +++ b/src/modules/Makefile_wl_screenshot.mk @@ -1,8 +1,10 @@ +EXTRA_DIST += src/modules/wl_screenshot/module.desktop.in \ +src/modules/wl_screenshot/e-module-wl_screenshot.edj +if USE_MODULE_WL_SCREENSHOT wl_screenshotdir = $(MDIR)/wl_screenshot wl_screenshot_DATA = src/modules/wl_screenshot/e-module-wl_screenshot.edj \ src/modules/wl_screenshot/module.desktop -EXTRA_DIST += src/modules/wl_screenshot/e-module-wl_screenshot.edj \ src/modules/wl_screenshot/module.desktop.in \ src/modules/wl_screenshot/e_screenshooter_client_protocol.h \ src/modules/wl_screenshot/e_screenshooter_client_protocol.c @@ -22,3 +24,4 @@ wl_screenshot_module_la_SOURCES = src/modules/wl_screenshot/e_mod_main.c \ PHONIES: wl_screenshot install-wl_screenshot wl_screenshot: $(wl_screenshotpkg_LTLIBRARIES) $(wl_screenshot_DATA) install-wl_screenshot: install-wl_screenshotDATA install-wl_screenshotpkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_wl_x11.mk b/src/modules/Makefile_wl_x11.mk index 88259f0d9..3c974ea11 100644 --- a/src/modules/Makefile_wl_x11.mk +++ b/src/modules/Makefile_wl_x11.mk @@ -1,3 +1,4 @@ +if USE_MODULE_WL_X11 wl_x11dir = $(MDIR)/wl_x11 wl_x11pkgdir = $(MDIR)/wl_x11/$(MODULE_ARCH) @@ -13,3 +14,4 @@ src_modules_wl_x11_module_la_SOURCES = src/modules/wl_x11/e_mod_main.c #.PHONY: wl_x11 install-wl_x11 #wl_x11: $(wl_x11pkg_LTLIBRARIES) $(wl_x11_DATA) #install-wl_x11: install-wl_x11DATA install-wl_x11pkgLTLIBRARIES +endif diff --git a/src/modules/Makefile_xkbswitch.mk b/src/modules/Makefile_xkbswitch.mk index 7a415ff12..c7a0a6343 100644 --- a/src/modules/Makefile_xkbswitch.mk +++ b/src/modules/Makefile_xkbswitch.mk @@ -1,8 +1,10 @@ +EXTRA_DIST += src/modules/xkbswitch/module.desktop.in \ +src/modules/xkbswitch/e-module-xkbswitch.edj +if USE_MODULE_XKBSWITCH xkbswitchdir = $(MDIR)/xkbswitch xkbswitch_DATA = src/modules/xkbswitch/e-module-xkbswitch.edj \ src/modules/xkbswitch/module.desktop -EXTRA_DIST += $(xkbswitch_DATA) xkbswitchpkgdir = $(MDIR)/xkbswitch/$(MODULE_ARCH) xkbswitchpkg_LTLIBRARIES = src/modules/xkbswitch/module.la @@ -19,3 +21,4 @@ src_modules_xkbswitch_module_la_SOURCES = src/modules/xkbswitch/e_mod_main.c \ PHONIES += xkbswitch install-xkbswitch xkbswitch: $(xkbswitchpkg_LTLIBRARIES) $(xkbswitch_DATA) install-xkbswitch: install-xkbswitchDATA install-xkbswitchpkgLTLIBRARIES +endif