diff options
| author | Mike Blumenkrantz <m.blumenkran@samsung.com> | 2013-07-25 09:46:14 +0100 |
|---|---|---|
| committer | Mike Blumenkrantz <zmike@samsung.com> | 2014-01-14 20:22:01 -0500 |
| commit | e3c85ec4da64ebcfb29eea0992466730e3e31995 (patch) | |
| tree | d576c1ecc20985ee46a4a4d75a347890814d80ed | |
| parent | 0bd3f7d13c64686f6aee19547d774438e82ce9d1 (diff) | |
| download | enlightenment-e3c85ec4da64ebcfb29eea0992466730e3e31995.tar.gz | |
feature: use non-recursive makefiles for entire build system
this is the correct way to write a build system. one toplevel Makefile.am with the rest of the directories having include Makefile.mk files.
additional authors:
Iván Briano <ivan.briano@intel.com>
171 files changed, 2939 insertions, 2676 deletions
diff --git a/Makefile.am b/Makefile.am index ba31f4245f..bf95f1f687 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,7 @@ -SUBDIRS = src data doc config - ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} +AUTOMAKE_OPTIONS = subdir-objects + +SUBDIRS = . if HAVE_PO @@ -8,6 +9,11 @@ SUBDIRS += po endif +CLEANFILES = +DISTCLEANFILES = +INSTALL_DATA_HOOKS = +PHONIES = + MAINTAINERCLEANFILES = \ ABOUT-NLS* \ Makefile.in \ @@ -25,52 +31,45 @@ ltmain.sh \ missing \ $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz \ $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2 \ -$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-doc.tar.bz2 \ -m4/libtool.m4 \ -m4/lt~obsolete.m4 \ -m4/ltoptions.m4 \ -m4/ltsugar.m4 \ -m4/ltversion.m4 \ -m4/codeset.m4 \ -m4/gettext.m4 \ -m4/glibc21.m4 \ -m4/iconv.m4 \ -m4/intdiv0.m4 \ -m4/inttypes_h.m4 \ -m4/inttypes.m4 \ -m4/inttypes-pri.m4 \ -m4/isc-posix.m4 \ -m4/lcmessage.m4 \ -m4/lib-ld.m4 \ -m4/lib-link.m4 \ -m4/lib-prefix.m4 \ -m4/nls.m4 \ -m4/po.m4 \ -m4/progtest.m4 \ -m4/stdint_h.m4 \ -m4/uintmax_t.m4 \ -m4/ulonglong.m4 +$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-doc.tar.bz2 + +EXTRA_DIST = \ +config.rpath \ +README \ +AUTHORS \ +COPYING \ +enlightenment.spec.in \ +enlightenment.spec \ +enlightenment.pc \ +pkgbuild/PKGBUILD \ +pkgbuild/enlightenment.install + +EDJE_CC = $(EDJE_CC_$(V)) +EDJE_CC_ = $(EDJE_CC_$(AM_DEFAULT_VERBOSITY)) +EDJE_CC_0 = @echo " EDJE_CC " $@; @edje_cc@ +EDJE_CC_1 = @edje_cc@ + +EDJE_FLAGS_VERBOSE_ = $(EDJE_FLAGS_VERBOSE_$(AM_DEFAULT_VERBOSITY)) +EDJE_FLAGS_VERBOSE_0 = +EDJE_FLAGS_VERBOSE_1 = -v +EDJE_FLAGS = $(EDJE_FLAGS_VERBOSE_$(V)) \ +@EDJE_DEF@ + +include m4/Makefile.mk if HAVE_PO -MAINTAINERCLEANFILES += \ -po/boldquot.sed \ -po/en@boldquot.header \ -po/en@quot.header \ -po/insert-header.sin \ -po/Makefile.in.in \ -po/Makevars.template \ -po/quot.sed \ -po/remove-potcdate.sin \ -po/Rules-quot +include po/Makefile.mk endif DISTCHECK_CONFIGURE_FLAGS = --disable-systemd -EXTRA_DIST = config.rpath README AUTHORS COPYING \ - enlightenment.spec.in enlightenment.spec enlightenment.pc \ - pkgbuild/PKGBUILD pkgbuild/enlightenment.install +include config/Makefile.mk + +include data/Makefile.mk + +include src/Makefile.mk filesdir = $(datadir)/enlightenment/ files_DATA = AUTHORS COPYING @@ -78,8 +77,15 @@ files_DATA = AUTHORS COPYING pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = enlightenment.pc -.PHONY: doc +include doc/Makefile.mk + +.PHONY: $(PHONIES) + +clean-local: doc-clean + rm -rf config/*.cfg config/*~ + rm -rf config/standard/*.cfg config/standard/*~ + rm -rf config/mobile/*.cfg config/mobile/*~ + rm -rf config/default/*.cfg config/default/*~ + rm -f data/themes/*.edj -doc: - @echo "entering doc/" - $(MAKE) -C doc doc +install-data-hook: $(INSTALL_DATA_HOOKS) diff --git a/config/Makefile.am b/config/Makefile.am deleted file mode 100644 index 340809bdd5..0000000000 --- a/config/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in -SUBDIRS = default standard mobile - -EET_EET = @eet_eet@ - -EXTRA_DIST = profile.src - -filesdir = $(datadir)/enlightenment/data/config - -files_DATA = profile.cfg - -SUFFIXES = .cfg - -.src.cfg: - $(EET_EET) -i \ - $(top_builddir)/config/$@ config \ - $< 0 - -clean-local: - rm -rf *.cfg *~ diff --git a/config/Makefile.mk b/config/Makefile.mk new file mode 100644 index 0000000000..34fef4822a --- /dev/null +++ b/config/Makefile.mk @@ -0,0 +1,25 @@ +EET_EET = @eet_eet@ + +EXTRA_DIST += config/profile.src + +configfilesdir = $(datadir)/enlightenment/data/config + +configfiles_DATA = config/profile.cfg + +SUFFIXES = .cfg + +.src.cfg: + $(MKDIR_P) $(@D) + $(EET_EET) -e \ + $(top_builddir)/$@ config \ + $< 0 + +include config/default/Makefile.mk +include config/standard/Makefile.mk +include config/mobile/Makefile.mk + +config/profile.cfg: config/profile.src + $(MKDIR_P) $(@D) + $(EET_EET) -i \ + $(top_builddir)/$@ config \ + $< 1 diff --git a/config/default/Makefile.am b/config/default/Makefile.am deleted file mode 100644 index 57dec3ffbc..0000000000 --- a/config/default/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in - -EET_EET = @eet_eet@ - -EXTRA_DIST = \ - profile.desktop \ - enlightenment-default.png \ - e.src \ - e_bindings.src - -filesdir = $(datadir)/enlightenment/data/config/default -files_DATA = \ - profile.desktop \ - enlightenment-default.png \ - e.cfg \ - e_bindings.cfg - -SUFFIXES = .cfg - -.src.cfg: - $(EET_EET) -e \ - $(top_builddir)/config/default/$@ config \ - $< 1 - -clean-local: - rm -rf *.cfg *~ - diff --git a/config/default/Makefile.mk b/config/default/Makefile.mk new file mode 100644 index 0000000000..3b619c782c --- /dev/null +++ b/config/default/Makefile.mk @@ -0,0 +1,12 @@ +EXTRA_DIST += \ +config/default/profile.desktop \ +config/default/enlightenment-default.png \ +config/default/e.src \ +config/default/e_bindings.src + +configdefaultfilesdir = $(datadir)/enlightenment/data/config/default +configdefaultfiles_DATA = \ +config/default/profile.desktop \ +config/default/enlightenment-default.png \ +config/default/e.cfg \ +config/default/e_bindings.cfg diff --git a/config/mobile/Makefile.am b/config/mobile/Makefile.am deleted file mode 100644 index cd59d24b2a..0000000000 --- a/config/mobile/Makefile.am +++ /dev/null @@ -1,40 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in - -EET_EET = @eet_eet@ - -EXTRA_DIST = \ - profile.desktop \ - enlightenment-mobile.png \ - e.src \ - e_bindings.src \ - module.battery.src \ - module.illume-home.src \ - module.illume-keyboard.src \ - module.illume-indicator.src \ - module.illume-softkey.src \ - module.illume2.src \ - module.conf.src - -filesdir = $(datadir)/enlightenment/data/config/mobile -files_DATA = \ - profile.desktop \ - enlightenment-mobile.png \ - e.cfg \ - e_bindings.cfg \ - module.battery.cfg \ - module.illume-home.cfg \ - module.illume-keyboard.cfg \ - module.illume-indicator.cfg \ - module.illume-softkey.cfg \ - module.illume2.cfg \ - module.conf.cfg - -SUFFIXES = .cfg - -.src.cfg: - $(EET_EET) -e \ - $(top_builddir)/config/mobile/$@ config \ - $< 1 - -clean-local: - rm -rf *.cfg *~ diff --git a/config/mobile/Makefile.mk b/config/mobile/Makefile.mk new file mode 100644 index 0000000000..b1939c2c22 --- /dev/null +++ b/config/mobile/Makefile.mk @@ -0,0 +1,26 @@ +EXTRA_DIST += \ +config/mobile/profile.desktop \ +config/mobile/enlightenment-mobile.png \ +config/mobile/e.src \ +config/mobile/e_bindings.src \ +config/mobile/module.battery.src \ +config/mobile/module.illume-home.src \ +config/mobile/module.illume-keyboard.src \ +config/mobile/module.illume-indicator.src \ +config/mobile/module.illume-softkey.src \ +config/mobile/module.illume2.src \ +config/mobile/module.conf.src + +configmobilefilesdir = $(datadir)/enlightenment/data/config/mobile +configmobilefiles_DATA = \ +config/mobile/profile.desktop \ +config/mobile/enlightenment-mobile.png \ +config/mobile/e.cfg \ +config/mobile/e_bindings.cfg \ +config/mobile/module.battery.cfg \ +config/mobile/module.illume-home.cfg \ +config/mobile/module.illume-keyboard.cfg \ +config/mobile/module.illume-indicator.cfg \ +config/mobile/module.illume-softkey.cfg \ +config/mobile/module.illume2.cfg \ +config/mobile/module.conf.cfg diff --git a/config/standard/Makefile.am b/config/standard/Makefile.am deleted file mode 100644 index 6b04039c4e..0000000000 --- a/config/standard/Makefile.am +++ /dev/null @@ -1,43 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in - -EET_EET = @eet_eet@ - -EXTRA_DIST = \ - profile.desktop \ - enlightenment-standard.png \ - e.src \ - e_bindings.src \ - module.battery.src \ - module.cpufreq.src \ - module.fileman.src \ - module.ibar.src \ - module.ibox.src \ - module.pager.src \ - module.temperature.src \ - module.conf.src - -filesdir = $(datadir)/enlightenment/data/config/standard -files_DATA = \ - profile.desktop \ - enlightenment-standard.png \ - e.cfg \ - e_bindings.cfg \ - module.battery.cfg \ - module.cpufreq.cfg \ - module.fileman.cfg \ - module.ibar.cfg \ - module.ibox.cfg \ - module.pager.cfg \ - module.temperature.cfg \ - module.conf.cfg - -SUFFIXES = .cfg - -.src.cfg: - $(EET_EET) -e \ - $(top_builddir)/config/standard/$@ config \ - $< 1 - -clean-local: - rm -rf *.cfg *~ - diff --git a/config/standard/Makefile.mk b/config/standard/Makefile.mk new file mode 100644 index 0000000000..4b3f4f2bfc --- /dev/null +++ b/config/standard/Makefile.mk @@ -0,0 +1,28 @@ +EXTRA_DIST += \ +config/standard/profile.desktop \ +config/standard/enlightenment-standard.png \ +config/standard/e.src \ +config/standard/e_bindings.src \ +config/standard/module.battery.src \ +config/standard/module.cpufreq.src \ +config/standard/module.fileman.src \ +config/standard/module.ibar.src \ +config/standard/module.ibox.src \ +config/standard/module.pager.src \ +config/standard/module.temperature.src \ +config/standard/module.conf.src + +configstandardfilesdir = $(datadir)/enlightenment/data/config/standard +configstandardfiles_DATA = \ +config/standard/profile.desktop \ +config/standard/enlightenment-standard.png \ +config/standard/e.cfg \ +config/standard/e_bindings.cfg \ +config/standard/module.battery.cfg \ +config/standard/module.cpufreq.cfg \ +config/standard/module.fileman.cfg \ +config/standard/module.ibar.cfg \ +config/standard/module.ibox.cfg \ +config/standard/module.pager.cfg \ +config/standard/module.temperature.cfg \ +config/standard/module.conf.cfg diff --git a/configure.ac b/configure.ac index 062df94ecd..cb03716a72 100644 --- a/configure.ac +++ b/configure.ac @@ -2,11 +2,11 @@ ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## m4_define([v_maj], [0]) m4_define([v_min], [18]) -m4_define([v_mic], [0]) -dnl m4_define([v_rev], m4_esyscmd([(git rev-list --count HEAD 2>/dev/null || echo 0) | tr -d '\n']))dnl +m4_define([v_mic], [99]) +m4_define([v_rev], m4_esyscmd([(git rev-list --count HEAD 2>/dev/null || echo 0) | tr -d '\n']))dnl ##-- When released, remove the dnl on the below line dnl m4_undefine([v_rev]) -m4_define([relname], [0.17.99]) +m4_define([relname], [0.18.99]) ##-- When doing snapshots - change soname. remove dnl on below line m4_define([relname], [ver-pre-01]) dnl m4_define([v_rel], [-release relname]) @@ -18,13 +18,12 @@ m4_define([lt_age], v_min) ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## -AC_INIT([enlightenment], [v_ver-rc2], [enlightenment-devel@lists.sourceforge.net]) +AC_INIT([enlightenment], [v_ver], [enlightenment-devel@lists.sourceforge.net]) AC_PREREQ([2.52]) AC_CONFIG_SRCDIR([configure.ac]) AC_CONFIG_MACRO_DIR([m4]) AC_CANONICAL_BUILD AC_CANONICAL_HOST -AC_ISC_POSIX AC_CONFIG_HEADERS([config.h]) AH_TOP([ @@ -36,14 +35,13 @@ AH_BOTTOM([ ]) AM_INIT_AUTOMAKE([1.11 dist-bzip2 -Wno-portability]) -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) +AM_SILENT_RULES([yes]) -AC_GNU_SOURCE +AC_USE_SYSTEM_EXTENSIONS AC_PROG_MKDIR_P AC_C_BIGENDIAN AC_PROG_CC_C99 AM_PROG_CC_C_O -AC_C_CONST AC_FUNC_ALLOCA AC_C___ATTRIBUTE__ @@ -59,13 +57,13 @@ AC_DEFINE_UNQUOTED(VMIC, [v_mic], [Micro version]) AC_DEFINE_UNQUOTED(VREV, [v_rev], [Revison]) version_info="lt_cur:lt_rev:lt_age" release_info="v_rel" -AC_SUBST(version_info) -AC_SUBST(release_info) +AC_SUBST([version_info]) +AC_SUBST([release_info]) ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## release=relname -AC_SUBST(release) +AC_SUBST([release]) PKG_PROG_PKG_CONFIG @@ -93,7 +91,7 @@ extern char **environ; AC_DEFINE(HAVE_ENVIRON, 1, [Have environ var]) ]) -efl_version="1.8.0" +efl_version="1.8.99" AC_SUBST(efl_version) AC_CHECK_HEADERS([sys/timerfd.h sys/ptrace.h arpa/inet.h netinet/in.h]) @@ -112,11 +110,11 @@ if test "x$res" = "xno"; then fi fi -AC_SUBST(fnmatch_libs) +AC_SUBST([fnmatch_libs]) have_pam=no AC_ARG_ENABLE(pam, - AC_HELP_STRING([--enable-pam], [enable PAM support @<:@default=detect@:>@]), + AS_HELP_STRING([--enable-pam], [enable PAM support @<:@default=detect@:>@]), [want_pam=$enableval], [want_pam=auto] ) @@ -131,11 +129,11 @@ if test "x$want_pam" != "xno" ; then fi dnl AC_E_CHECK_PKG(VALGRIND, [valgrind >= 2.4.0], [], [:]) -AC_SUBST(VALGRIND_CFLAGS) -AC_SUBST(VALGRIND_LIBS) +AC_SUBST([VALGRIND_CFLAGS]) +AC_SUBST([VALGRIND_LIBS]) MODULE_ARCH="$host_os-$host_cpu-relname" -AC_SUBST(MODULE_ARCH) +AC_SUBST([MODULE_ARCH]) AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture") if test "x${bindir}" = 'xNONE'; then @@ -147,7 +145,7 @@ if test "x${bindir}" = 'xNONE'; then else PACKAGE_BIN_DIR="${bindir}" fi -AC_SUBST(PACKAGE_BIN_DIR) +AC_SUBST([PACKAGE_BIN_DIR]) if test "x${libdir}" = 'xNONE'; then if test "x${prefix}" = "xNONE"; then @@ -158,7 +156,7 @@ if test "x${libdir}" = 'xNONE'; then else PACKAGE_LIB_DIR="${libdir}" fi -AC_SUBST(PACKAGE_LIB_DIR) +AC_SUBST([PACKAGE_LIB_DIR]) if test "x${prefix}" = "xNONE"; then PACKAGE_DATA_DIR="${ac_default_prefix}/share/${PACKAGE}" @@ -169,15 +167,15 @@ else LOCALE_DIR="${prefix}/share/locale" PACKAGE_SYSCONF_DIR="${sysconfdir}" fi -AC_SUBST(PACKAGE_DATA_DIR) -AC_SUBST(LOCALE_DIR) -AC_SUBST(PACKAGE_SYSCONF_DIR) +AC_SUBST([PACKAGE_DATA_DIR]) +AC_SUBST([LOCALE_DIR]) +AC_SUBST([PACKAGE_SYSCONF_DIR]) ####################################### ## Simple X11 build/link AC_ARG_ENABLE(simple-x11, - AC_HELP_STRING([--enable-simple-x11], [enable simple x11 linking]), + AS_HELP_STRING([--enable-simple-x11], [enable simple x11 linking]), [ want_evas_simple_x11=$enableval ] ) @@ -198,8 +196,8 @@ dnl ],[ dnl AC_MSG_ERROR([Cannot find X headers and libraries.]) dnl ] dnl ) -dnl AC_SUBST(x_cflags) -dnl AC_SUBST(x_libs) +dnl AC_SUBST([x_cflags]) +dnl AC_SUBST([x_libs]) cf_cflags="" cf_libs="" @@ -213,8 +211,8 @@ AC_CHECK_HEADERS(CFBase.h, ] ) CPPFLAGS="${PCPPFLAGS}" -AC_SUBST(cf_cflags) -AC_SUBST(cf_libs) +AC_SUBST([cf_cflags]) +AC_SUBST([cf_libs]) PKG_CHECK_MODULES([BLUEZ], [bluez], [have_bluetooth="yes"], @@ -296,7 +294,7 @@ dnl fi #ALL_LINGUAS="bg de eo es fi fr ja pt ru zh_CN hu sl it cs da sk sv nb nl zh_TW" # a lot of .po's are broken ALL_LINGUAS="bg ca cs da de el eo es fi fr fr_CH he hu it ja ko nb nl pl pt_BR ru sk sl sv tr zh_CN zh_TW" -AC_SUBST(ALL_LINGUAS) +AC_SUBST([ALL_LINGUAS]) m4_ifdef([AM_GNU_GETTEXT_VERSION], [ AM_GNU_GETTEXT_VERSION([0.17]) @@ -315,7 +313,7 @@ have_po="yes" have_po="no" ]) ]) -AC_SUBST(LTLIBINTL) +AC_SUBST([LTLIBINTL]) if test "x$LIBINTL" = "x"; then LIBINTL="$INTLLIBS" fi @@ -327,7 +325,7 @@ fi AM_CONDITIONAL([HAVE_PO], [test "x${have_po}" = "xyes"]) AC_CHECK_LIB(dl, dlopen, dlopen_libs=-ldl) -AC_SUBST(dlopen_libs) +AC_SUBST([dlopen_libs]) AC_MSG_CHECKING([whether to install sysactions.conf]) AC_ARG_ENABLE([install-sysactions], @@ -480,10 +478,7 @@ PKG_CHECK_MODULES(E_THUMB, [ PKG_CHECK_MODULES(E_GRABBER, [ eina >= ${efl_version} - ecore >= ${efl_version} eet >= ${efl_version} - efreet >= ${efl_version} - ecore-x >= ${efl_version} ]) efm_requires="\ @@ -591,10 +586,10 @@ e_libs="$E_LIBS $LIBINTL $fnmatch_libs $execinfo_libs" e_cflags="-DUSE_E_CONFIG_H $E_CFLAGS" e_configflags="-DUSE_E_CONFIG_H" -AC_SUBST(e_libs) -AC_SUBST(e_cflags) -AC_SUBST(e_configflags) -AC_SUBST(requirements_e) +AC_SUBST([e_libs]) +AC_SUBST([e_cflags]) +AC_SUBST([e_configflags]) +AC_SUBST([requirements_e]) PKG_CHECK_EXISTS([xkeyboard-config],[ xkb_base=`$PKG_CONFIG --variable=xkb_base xkeyboard-config 2>/dev/null` @@ -610,7 +605,7 @@ AC_ARG_WITH(profile, AC_MSG_NOTICE([Enlightenment build profile set to $profile]) EDJE_DEF="-DLOWRES_PDA=1 -DMEDIUMRES_PDA=2 -DHIRES_PDA=3 -DSLOW_PC=4 -DMEDIUM_PC=5 -DFAST_PC=6" EDJE_DEF=$EDJE_DEF" -DE18_PROFILE"=$profile -AC_SUBST(EDJE_DEF) +AC_SUBST([EDJE_DEF]) AC_ARG_WITH(edje-cc, [ --with-edje-cc=PATH specify a specific path to edje_cc], @@ -621,7 +616,7 @@ AC_ARG_WITH(edje-cc, ],[ edje_cc=$(pkg-config --variable=prefix edje)/bin/edje_cc ]) -AC_SUBST(edje_cc) +AC_SUBST([edje_cc]) PKG_CHECK_MODULES(EET, [eet >= ${efl_version}]) AC_ARG_WITH(eet-eet, @@ -633,7 +628,7 @@ AC_ARG_WITH(eet-eet, ],[ eet_eet=$(pkg-config --variable=prefix eet)/bin/eet ]) -AC_SUBST(eet_eet) +AC_SUBST([eet_eet]) AC_DEFINE(E_INTERNAL, 1, "This define can be used to wrap internal E stuff, as config.h isn't exported") @@ -654,7 +649,7 @@ case "$host_os" in ;; esac -AC_SUBST(BATTERY_LDFLAGS) +AC_SUBST([BATTERY_LDFLAGS]) AM_CONDITIONAL([HAVE_OPENBSD], [test "x${have_openbsd}" = "xyes"]) AM_CONDITIONAL(HAVE_TEMPERATURE, false) @@ -671,7 +666,7 @@ define([CHECK_MODULE_MUSIC_CONTROL], ##have_exchange=no ##AC_ARG_ENABLE(exchange, -## AC_HELP_STRING([--disable-exchange], [disable Exchange support @<:@default=detect@:>@]), +## AS_HELP_STRING([--disable-exchange], [disable Exchange support @<:@default=detect@:>@]), ## [want_exchange=$enableval], ## [want_exchange=auto] ##) @@ -690,7 +685,7 @@ AM_CONDITIONAL(HAVE_EXCHANGE, false) have_enotify=no AM_CONDITIONAL([HAVE_ENOTIFY], [false]) AC_ARG_ENABLE([enotify], - AC_HELP_STRING([--disable-enotify], [disable Enotify support @<:@default=detect@:>@]), + AS_HELP_STRING([--disable-enotify], [disable Enotify support @<:@default=detect@:>@]), [e_cv_want_enotify=$enableval], AC_CACHE_VAL([e_cv_want_enotify], [e_cv_want_enotify=yes]) ) @@ -718,6 +713,7 @@ define([CHECK_MODULE_NOTIFICATION], fi ]) + AM_CONDITIONAL(HAVE_ALSA, false) define([CHECK_MODULE_MIXER], [ @@ -743,8 +739,8 @@ define([CHECK_MODULE_MIXER], fi ]) -AC_SUBST(SOUND_CFLAGS) -AC_SUBST(SOUND_LIBS) +AC_SUBST([SOUND_CFLAGS]) +AC_SUBST([SOUND_LIBS]) AM_CONDITIONAL(HAVE_ECONNMAN, false) AM_CONDITIONAL(HAVE_DUMMY, false) @@ -753,8 +749,8 @@ define([CHECK_MODULE_CONNMAN], AC_E_CHECK_PKG(ECONNMAN, [ eldbus >= $efl_version ], [], [CONNMAN=false]) dnl AC_E_CHECK_PKG(DUMMY, [ connman >= 1.0 ], [], [CONNMAN=false]) ]) -AC_SUBST(ECONNMAN_CFLAGS) -AC_SUBST(ECONNMAN_LIBS) +AC_SUBST([ECONNMAN_CFLAGS]) +AC_SUBST([ECONNMAN_LIBS]) AM_CONDITIONAL(HAVE_BLUEZ4, false) AM_CONDITIONAL(HAVE_DUMMY, false) @@ -762,8 +758,8 @@ define([CHECK_MODULE_BLUEZ4], [ AC_E_CHECK_PKG(BLUEZ4, [ eldbus ],) ]) -AC_SUBST(EBLUEZ4_CFLAGS) -AC_SUBST(EBLUEZ4_LIBS) +AC_SUBST([EBLUEZ4_CFLAGS]) +AC_SUBST([EBLUEZ4_LIBS]) have_wayland_clients=no AC_ARG_ENABLE([wayland-clients], @@ -917,10 +913,10 @@ case "$host_os" in fi ;; esac -AC_SUBST(HALT) -AC_SUBST(REBOOT) -AC_SUBST(SUSPEND) -AC_SUBST(HIBERNATE) +AC_SUBST([HALT]) +AC_SUBST([REBOOT]) +AC_SUBST([SUSPEND]) +AC_SUBST([HIBERNATE]) m4_ifdef([v_mic], [ @@ -939,11 +935,7 @@ AC_OUTPUT([ Makefile enlightenment.spec enlightenment.pc -src/Makefile -src/bin/Makefile src/bin/e_fm_shared_types.h -src/bin/e_fm/Makefile -src/modules/Makefile src/modules/ibar/module.desktop src/modules/clock/module.desktop src/modules/pager/module.desktop @@ -1005,28 +997,11 @@ src/modules/music-control/module.desktop src/modules/contact/module.desktop src/modules/wl_desktop_shell/module.desktop src/modules/wl_screenshot/module.desktop -data/Makefile -data/images/Makefile -data/flags/Makefile -data/favorites/Makefile -data/desktop/Makefile -data/input_methods/Makefile -data/xsession/Makefile data/xsession/enlightenment.desktop -data/tools/Makefile -data/etc/Makefile data/etc/sysactions.conf -data/icons/Makefile -data/backgrounds/Makefile -data/units/Makefile data/units/e18.service -doc/Makefile doc/Doxyfile doc/e.dox -config/Makefile -config/default/Makefile -config/standard/Makefile -config/mobile/Makefile $po_makefile_in ]) diff --git a/data/Makefile.am b/data/Makefile.am deleted file mode 100644 index 7a7cc3986e..0000000000 --- a/data/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in -SUBDIRS = \ -images \ -tools \ -xsession \ -input_methods \ -etc \ -icons \ -backgrounds \ -flags \ -favorites \ -desktop \ -units - diff --git a/data/Makefile.mk b/data/Makefile.mk new file mode 100644 index 0000000000..783744b298 --- /dev/null +++ b/data/Makefile.mk @@ -0,0 +1,11 @@ +include data/images/Makefile.mk +include data/tools/Makefile.mk +include data/xsession/Makefile.mk +include data/input_methods/Makefile.mk +include data/etc/Makefile.mk +include data/icons/Makefile.mk +include data/backgrounds/Makefile.mk +include data/flags/Makefile.mk +include data/favorites/Makefile.mk +include data/desktop/Makefile.mk +include data/units/Makefile.mk diff --git a/data/backgrounds/Makefile.am b/data/backgrounds/Makefile.am deleted file mode 100644 index 3ad6ad8897..0000000000 --- a/data/backgrounds/Makefile.am +++ /dev/null @@ -1,42 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in -filesdir = $(datadir)/enlightenment/data/backgrounds -files_DATA = \ -Brown_Rock_Hi.edj \ -Colorful_Roses.edj \ -Darkconcrete.edj \ -Dark_Gradient.edj \ -Grassy.edj \ -Japanesemaple.edj \ -Lakegrass.edj \ -Light_Gradient.edj \ -Mossstring.edj \ -Motleyrock.edj \ -Newgrowth.edj \ -Orange_Roses.edj \ -Pattern_Radial.edj \ -Pattern_Vertical.edj \ -Pattern_Vertical_Hi.edj \ -Pine_Silhouettes.edj \ -Purple_Flower_Bunch.edj \ -Skywall.edj \ -Stringflower.edj \ -Wetgrass.edj \ -Wetleaf.edj \ -Whiterock.edj \ -Hills.edj \ -Light.edj \ -Temple.edj \ -Train.edj \ -Curly_Leaves.edj \ -Flower_Petals.edj \ -Go_Away.edj \ -Green_Stem.edj \ -Leafy_Red.edj \ -Ramen.edj \ -Shady_Leaves.edj \ -Windy_Palm.edj \ -Lantern_Cluster.edj \ -Wall_Lanterns.edj - - -EXTRA_DIST = $(files_DATA) diff --git a/data/backgrounds/Makefile.mk b/data/backgrounds/Makefile.mk new file mode 100644 index 0000000000..8be227db71 --- /dev/null +++ b/data/backgrounds/Makefile.mk @@ -0,0 +1,41 @@ +backgroundfilesdir = $(datadir)/enlightenment/data/backgrounds +backgroundfiles_DATA = \ +data/backgrounds/Brown_Rock_Hi.edj \ +data/backgrounds/Colorful_Roses.edj \ +data/backgrounds/Darkconcrete.edj \ +data/backgrounds/Dark_Gradient.edj \ +data/backgrounds/Grassy.edj \ +data/backgrounds/Japanesemaple.edj \ +data/backgrounds/Lakegrass.edj \ +data/backgrounds/Light_Gradient.edj \ +data/backgrounds/Mossstring.edj \ +data/backgrounds/Motleyrock.edj \ +data/backgrounds/Newgrowth.edj \ +data/backgrounds/Orange_Roses.edj \ +data/backgrounds/Pattern_Radial.edj \ +data/backgrounds/Pattern_Vertical.edj \ +data/backgrounds/Pattern_Vertical_Hi.edj \ +data/backgrounds/Pine_Silhouettes.edj \ +data/backgrounds/Purple_Flower_Bunch.edj \ +data/backgrounds/Skywall.edj \ +data/backgrounds/Stringflower.edj \ +data/backgrounds/Wetgrass.edj \ +data/backgrounds/Wetleaf.edj \ +data/backgrounds/Whiterock.edj \ +data/backgrounds/Hills.edj \ +data/backgrounds/Light.edj \ +data/backgrounds/Temple.edj \ +data/backgrounds/Train.edj \ +data/backgrounds/Curly_Leaves.edj \ +data/backgrounds/Flower_Petals.edj \ +data/backgrounds/Go_Away.edj \ +data/backgrounds/Green_Stem.edj \ +data/backgrounds/Leafy_Red.edj \ +data/backgrounds/Ramen.edj \ +data/backgrounds/Shady_Leaves.edj \ +data/backgrounds/Windy_Palm.edj \ +data/backgrounds/Lantern_Cluster.edj \ +data/backgrounds/Wall_Lanterns.edj + + +EXTRA_DIST += $(backgroundfiles_DATA) diff --git a/data/desktop/Makefile.am b/data/desktop/Makefile.am deleted file mode 100644 index 20a5004f48..0000000000 --- a/data/desktop/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in -filesdir = $(datadir)/applications -files_DATA = \ - enlightenment_filemanager.desktop - -EXTRA_DIST = $(files_DATA) diff --git a/data/desktop/Makefile.mk b/data/desktop/Makefile.mk new file mode 100644 index 0000000000..07730a208b --- /dev/null +++ b/data/desktop/Makefile.mk @@ -0,0 +1,5 @@ +desktopfilesdir = $(datadir)/applications +desktopfiles_DATA = \ +data/desktop/enlightenment_filemanager.desktop + +EXTRA_DIST += $(desktopfiles_DATA) diff --git a/data/etc/Makefile.am b/data/etc/Makefile.am deleted file mode 100644 index 2c50f01660..0000000000 --- a/data/etc/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in -filesdir = $(sysconfdir)/enlightenment -files_DATA = - -if INSTALL_SYSACTIONS -files_DATA += sysactions.conf -endif - -menusdir = $(sysconfdir)/xdg/menus -menus_DATA = - -if INSTALL_ENLIGHTENMENT_MENU -menus_DATA += enlightenment.menu -endif - -EXTRA_DIST = $(files_DATA) $(menus_DATA) diff --git a/data/etc/Makefile.mk b/data/etc/Makefile.mk new file mode 100644 index 0000000000..8fc86d8ee6 --- /dev/null +++ b/data/etc/Makefile.mk @@ -0,0 +1,15 @@ +etcfilesdir = $(sysconfdir)/enlightenment +etcfiles_DATA = + +if INSTALL_SYSACTIONS +etcfiles_DATA += data/etc/sysactions.conf +endif + +etcmenusdir = $(sysconfdir)/xdg/menus +etcmenus_DATA = + +if INSTALL_ENLIGHTENMENT_MENU +etcmenus_DATA += data/etc/enlightenment.menu +endif + +EXTRA_DIST += $(etcfiles_DATA) $(etcmenus_DATA) diff --git a/data/favorites/Makefile.am b/data/favorites/Makefile.am deleted file mode 100644 index 3ec05c8db8..0000000000 --- a/data/favorites/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in - -favsdir = $(datadir)/enlightenment/data/favorites -favs_DATA = \ -.order \ -desktop.desktop \ -home.desktop \ -root.desktop \ -tmp.desktop - -EXTRA_DIST = $(favs_DATA) diff --git a/data/favorites/Makefile.mk b/data/favorites/Makefile.mk new file mode 100644 index 0000000000..785754e83c --- /dev/null +++ b/data/favorites/Makefile.mk @@ -0,0 +1,9 @@ +datafavsdir = $(datadir)/enlightenment/data/favorites +datafavs_DATA = \ +data/favorites/.order \ +data/favorites/desktop.desktop \ +data/favorites/home.desktop \ +data/favorites/root.desktop \ +data/favorites/tmp.desktop + +EXTRA_DIST += $(datafavs_DATA) diff --git a/data/flags/Makefile.am b/data/flags/Makefile.am deleted file mode 100644 index ce80dd7595..0000000000 --- a/data/flags/Makefile.am +++ /dev/null @@ -1,104 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in -filesdir = $(datadir)/enlightenment/data/flags -files_DATA = \ -ad_flag.png \ -af_flag.png \ -al_flag.png \ -am_flag.png \ -ara_flag.png \ -ar_flag.png \ -at_flag.png \ -az_flag.png \ -ba_flag.png \ -bd_flag.png \ -be_flag.png \ -bg_flag.png \ -brai_flag.png \ -br_flag.png \ -bt_flag.png \ -bw_flag.png \ -by_flag.png \ -ca_flag.png \ -cat_flag.png \ -cd_flag.png \ -ch_flag.png \ -cm_flag.png \ -cn_flag.png \ -cz_flag.png \ -de_flag.png \ -dk_flag.png \ -ee_flag.png \ -epo_flag.png \ -es_flag.png \ -et_flag.png \ -fi_flag.png \ -fo_flag.png \ -fr_flag.png \ -gb_flag.png \ -ge_flag.png \ -gh_flag.png \ -gn_flag.png \ -gr_flag.png \ -hr_flag.png \ -hu_flag.png \ -ie_flag.png \ -il_flag.png \ -in_flag.png \ -iq_flag.png \ -ir_flag.png \ -is_flag.png \ -it_flag.png \ -jp_flag.png \ -ke_flag.png \ -kg_flag.png \ -kh_flag.png \ -kr_flag.png \ -ku_flag.png \ -kz_flag.png \ -la_flag.png \ -lang-system.png \ -latam_flag.png \ -lk_flag.png \ -lt_flag.png \ -lv_flag.png \ -ma_flag.png \ -mao_flag.png \ -md_flag.png \ -me_flag.png \ -mk_flag.png \ -ml_flag.png \ -mm_flag.png \ -mn_flag.png \ -mt_flag.png \ -mv_flag.png \ -my_flag.png \ -ng_flag.png \ -nl_flag.png \ -no_flag.png \ -np_flag.png \ -ph_flag.png \ -pk_flag.png \ -pl_flag.png \ -pt_flag.png \ -ro_flag.png \ -rs_flag.png \ -ru_flag.png \ -se_flag.png \ -si_flag.png \ -sk_flag.png \ -sn_flag.png \ -sy_flag.png \ -th_flag.png \ -tj_flag.png \ -tm_flag.png \ -tr_flag.png \ -tw_flag.png \ -tz_flag.png \ -ua_flag.png \ -unknown_flag.png \ -us_flag.png \ -uz_flag.png \ -vn_flag.png \ -za_flag.png - -EXTRA_DIST = $(files_DATA) diff --git a/data/flags/Makefile.mk b/data/flags/Makefile.mk new file mode 100644 index 0000000000..88efee1e28 --- /dev/null +++ b/data/flags/Makefile.mk @@ -0,0 +1,103 @@ +dataflagsfilesdir = $(datadir)/enlightenment/data/flags +dataflagsfiles_DATA = \ +data/flags/ad_flag.png \ +data/flags/af_flag.png \ +data/flags/al_flag.png \ +data/flags/am_flag.png \ +data/flags/ara_flag.png \ +data/flags/ar_flag.png \ +data/flags/at_flag.png \ +data/flags/az_flag.png \ +data/flags/ba_flag.png \ +data/flags/bd_flag.png \ +data/flags/be_flag.png \ +data/flags/bg_flag.png \ +data/flags/brai_flag.png \ +data/flags/br_flag.png \ +data/flags/bt_flag.png \ +data/flags/bw_flag.png \ +data/flags/by_flag.png \ +data/flags/ca_flag.png \ +data/flags/cat_flag.png \ +data/flags/cd_flag.png \ +data/flags/ch_flag.png \ +data/flags/cm_flag.png \ +data/flags/cn_flag.png \ +data/flags/cz_flag.png \ +data/flags/de_flag.png \ +data/flags/dk_flag.png \ +data/flags/ee_flag.png \ +data/flags/epo_flag.png \ +data/flags/es_flag.png \ +data/flags/et_flag.png \ +data/flags/fi_flag.png \ +data/flags/fo_flag.png \ +data/flags/fr_flag.png \ +data/flags/gb_flag.png \ +data/flags/ge_flag.png \ +data/flags/gh_flag.png \ +data/flags/gn_flag.png \ +data/flags/gr_flag.png \ +data/flags/hr_flag.png \ +data/flags/hu_flag.png \ +data/flags/ie_flag.png \ +data/flags/il_flag.png \ +data/flags/in_flag.png \ +data/flags/iq_flag.png \ +data/flags/ir_flag.png \ +data/flags/is_flag.png \ +data/flags/it_flag.png \ +data/flags/jp_flag.png \ +data/flags/ke_flag.png \ +data/flags/kg_flag.png \ +data/flags/kh_flag.png \ +data/flags/kr_flag.png \ +data/flags/ku_flag.png \ +data/flags/kz_flag.png \ +data/flags/la_flag.png \ +data/flags/lang-system.png \ +data/flags/latam_flag.png \ +data/flags/lk_flag.png \ +data/flags/lt_flag.png \ +data/flags/lv_flag.png \ +data/flags/ma_flag.png \ +data/flags/mao_flag.png \ +data/flags/md_flag.png \ +data/flags/me_flag.png \ +data/flags/mk_flag.png \ +data/flags/ml_flag.png \ +data/flags/mm_flag.png \ +data/flags/mn_flag.png \ +data/flags/mt_flag.png \ +data/flags/mv_flag.png \ +data/flags/my_flag.png \ +data/flags/ng_flag.png \ +data/flags/nl_flag.png \ +data/flags/no_flag.png \ +data/flags/np_flag.png \ +data/flags/ph_flag.png \ +data/flags/pk_flag.png \ +data/flags/pl_flag.png \ +data/flags/pt_flag.png \ +data/flags/ro_flag.png \ +data/flags/rs_flag.png \ +data/flags/ru_flag.png \ +data/flags/se_flag.png \ +data/flags/si_flag.png \ +data/flags/sk_flag.png \ +data/flags/sn_flag.png \ +data/flags/sy_flag.png \ +data/flags/th_flag.png \ +data/flags/tj_flag.png \ +data/flags/tm_flag.png \ +data/flags/tr_flag.png \ +data/flags/tw_flag.png \ +data/flags/tz_flag.png \ +data/flags/ua_flag.png \ +data/flags/unknown_flag.png \ +data/flags/us_flag.png \ +data/flags/uz_flag.png \ +data/flags/vn_flag.png \ +data/flags/za_flag.png + +EXTRA_DIST += $(dataflagsfiles_DATA) diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am deleted file mode 100644 index 37e708ba4e..0000000000 --- a/data/icons/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in -filesdir = $(datadir)/enlightenment/data/icons -files_DATA = \ -xterm.png \ -web_browser.png \ -audio_player.png \ -mail_client.png \ -video_player.png \ -text_editor.png \ -image_viewer.png \ -audio_player2.png - -EXTRA_DIST = $(files_DATA) diff --git a/data/icons/Makefile.mk b/data/icons/Makefile.mk new file mode 100644 index 0000000000..84951de109 --- /dev/null +++ b/data/icons/Makefile.mk @@ -0,0 +1,12 @@ +iconsfilesdir = $(datadir)/enlightenment/data/icons +iconsfiles_DATA = \ +data/icons/xterm.png \ +data/icons/web_browser.png \ +data/icons/audio_player.png \ +data/icons/mail_client.png \ +data/icons/video_player.png \ +data/icons/text_editor.png \ +data/icons/image_viewer.png \ +data/icons/audio_player2.png + +EXTRA_DIST += $(iconsfiles_DATA) diff --git a/data/images/Makefile.am b/data/images/Makefile.am deleted file mode 100644 index 7a340b01c3..0000000000 --- a/data/images/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in -filesdir = $(datadir)/enlightenment/data/images -files_DATA = \ -enlightenment.png \ -test.png \ -test.jpg \ -test.edj \ -test.svg - -EXTRA_DIST = $(files_DATA) diff --git a/data/images/Makefile.mk b/data/images/Makefile.mk new file mode 100644 index 0000000000..0dfe56d920 --- /dev/null +++ b/data/images/Makefile.mk @@ -0,0 +1,9 @@ +imagesfilesdir = $(datadir)/enlightenment/data/images +imagesfiles_DATA = \ +data/images/enlightenment.png \ +data/images/test.png \ +data/images/test.jpg \ +data/images/test.edj \ +data/images/test.svg + +EXTRA_DIST += $(imagesfiles_DATA) diff --git a/data/input_methods/Makefile.am b/data/input_methods/Makefile.am deleted file mode 100644 index 8b7832b8cf..0000000000 --- a/data/input_methods/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in -filesdir = $(datadir)/enlightenment/data/input_methods -files_DATA = \ -scim.imc \ -uim.imc \ -iiimf.imc \ -ibus.imc \ -gcin.imc \ -hime.imc \ -fcitx.imc - -EXTRA_DIST = $(files_DATA) diff --git a/data/input_methods/Makefile.mk b/data/input_methods/Makefile.mk new file mode 100644 index 0000000000..16955c4c05 --- /dev/null +++ b/data/input_methods/Makefile.mk @@ -0,0 +1,11 @@ +imcfilesdir = $(datadir)/enlightenment/data/input_methods +imcfiles_DATA = \ +data/input_methods/scim.imc \ +data/input_methods/uim.imc \ +data/input_methods/iiimf.imc \ +data/input_methods/ibus.imc \ +data/input_methods/gcin.imc \ +data/input_methods/hime.imc \ +data/input_methods/fcitx.imc + +EXTRA_DIST += $(imcfiles_DATA) diff --git a/data/tools/Makefile.am b/data/tools/Makefile.am deleted file mode 100644 index c3d733f288..0000000000 --- a/data/tools/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in - -enlightenment_remotedir = $(bindir) - -enlightenment_remote_SCRIPTS = enlightenment_remote - -EXTRA_DIST = enlightenment_remote - diff --git a/data/tools/Makefile.mk b/data/tools/Makefile.mk new file mode 100644 index 0000000000..60394caf57 --- /dev/null +++ b/data/tools/Makefile.mk @@ -0,0 +1,6 @@ +enlightenment_remotedir = $(bindir) + +enlightenment_remote_SCRIPTS = data/tools/enlightenment_remote + +EXTRA_DIST += data/tools/enlightenment_remote + diff --git a/data/units/Makefile.am b/data/units/Makefile.am deleted file mode 100644 index 04ed87fb40..0000000000 --- a/data/units/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -AUTOMAKE_OPTIONS = 1.4 foreign -MAINTAINERCLEANFILES = Makefile.in - -if HAVE_SYSTEMD_USER_SESSION -unitsdir = $(USER_SESSION_DIR) -units_DATA = e18.service -endif - -EXTRA_DIST = $(units_DATA) diff --git a/data/units/Makefile.mk b/data/units/Makefile.mk new file mode 100644 index 0000000000..4387289929 --- /dev/null +++ b/data/units/Makefile.mk @@ -0,0 +1,6 @@ +if HAVE_SYSTEMD_USER_SESSION +unitsdir = $(USER_SESSION_DIR) +units_DATA = data/units/e18.service +endif + +EXTRA_DIST += $(units_DATA) diff --git a/data/xsession/Makefile.am b/data/xsession/Makefile.am deleted file mode 100644 index 27b57b210b..0000000000 --- a/data/xsession/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in -filesdir = $(datadir)/xsessions -files_DATA = enlightenment.desktop -EXTRA_DIST = enlightenment.desktop.in diff --git a/data/xsession/Makefile.mk b/data/xsession/Makefile.mk new file mode 100644 index 0000000000..c428580392 --- /dev/null +++ b/data/xsession/Makefile.mk @@ -0,0 +1,3 @@ +xsessionfilesdir = $(datadir)/xsessions +xsessionfiles_DATA = data/xsession/enlightenment.desktop +EXTRA_DIST += data/xsession/enlightenment.desktop.in diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in index 20d2d3e810..11359d033b 100644 --- a/doc/Doxyfile.in +++ b/doc/Doxyfile.in @@ -1,15 +1,15 @@ PROJECT_NAME = Enlightenment PROJECT_NUMBER = -OUTPUT_DIRECTORY = . -INPUT = @builddir@/e.dox @top_srcdir@/src -IMAGE_PATH = @srcdir@/img +OUTPUT_DIRECTORY = @builddir@/doc +INPUT = @builddir@/doc/e.dox @top_srcdir@/src +IMAGE_PATH = @srcdir@/doc/img OUTPUT_LANGUAGE = English GENERATE_HTML = YES HTML_OUTPUT = html HTML_FILE_EXTENSION = .html -HTML_HEADER = @srcdir@/head.html -HTML_FOOTER = @srcdir@/foot.html -HTML_STYLESHEET = @srcdir@/e.css +HTML_HEADER = @srcdir@/doc/head.html +HTML_FOOTER = @srcdir@/doc/foot.html +HTML_STYLESHEET = @srcdir@/doc/e.css ENUM_VALUES_PER_LINE = 1 GENERATE_HTMLHELP = NO CHM_FILE = diff --git a/doc/Makefile.am b/doc/Makefile.am deleted file mode 100644 index 9c8631ea96..0000000000 --- a/doc/Makefile.am +++ /dev/null @@ -1,42 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in e.dox - -.PHONY: doc - -PACKAGE_DOCNAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-doc - -if EFL_BUILD_DOC - -doc-clean: - rm -rf html/ latex/ man/ xml/ $(top_builddir)/$(PACKAGE_DOCNAME).tar* - -doc: all doc-clean - $(efl_doxygen) - cp $(srcdir)/img/* html/ - rm -rf $(PACKAGE_DOCNAME).tar* - $(MKDIR_P) $(PACKAGE_DOCNAME)/doc - cp -R html/ latex/ man/ $(PACKAGE_DOCNAME)/doc - tar cf $(PACKAGE_DOCNAME).tar $(PACKAGE_DOCNAME)/ - bzip2 -9 $(PACKAGE_DOCNAME).tar - rm -rf $(PACKAGE_DOCNAME)/ - mv $(PACKAGE_DOCNAME).tar.bz2 $(top_builddir) - @echo "Documentation Package: $(top_builddir)/$(PACKAGE_DOCNAME).tar.bz2" - -clean-local: doc-clean - -else - -doc: - @echo "Documentation not built. Run ./configure --help" - -endif - -filesdir = $(datadir)/enlightenment/doc -files_DATA = \ -documentation.html \ -illume2.html \ -FDO.txt \ -cache.txt \ -enlightenment.png \ -illume2.png - -EXTRA_DIST = $(files_DATA) Doxyfile.in $(wildcard img/*.*) e.css head.html foot.html e.dox.in diff --git a/doc/Makefile.mk b/doc/Makefile.mk new file mode 100644 index 0000000000..fd49b872ef --- /dev/null +++ b/doc/Makefile.mk @@ -0,0 +1,47 @@ +MAINTAINERCLEANFILES += doc/e.dox + +PHONIES += doc doc-clean + +PACKAGE_DOCNAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-doc + +if EFL_BUILD_DOC + +doc-clean: + rm -rf doc/html/ doc/latex/ doc/man/ doc/xml/ $(top_builddir)/$(PACKAGE_DOCNAME).tar* + +doc: all doc-clean + @echo "entering doc/" + $(efl_doxygen) doc/Doxyfile + cp $(top_srcdir)/doc/img/* doc/html/ + rm -rf $(PACKAGE_DOCNAME).tar* + $(MKDIR_P) $(PACKAGE_DOCNAME)/doc + cp -R doc/html/ doc/latex/ doc/man/ $(PACKAGE_DOCNAME)/doc + tar cf $(PACKAGE_DOCNAME).tar $(PACKAGE_DOCNAME)/ + bzip2 -9 $(PACKAGE_DOCNAME).tar + rm -rf $(PACKAGE_DOCNAME)/ + @echo "Documentation Package: $(top_builddir)/$(PACKAGE_DOCNAME).tar.bz2" + +else + +doc: + @echo "Documentation not built. Run ./configure --help" + +endif + +docfilesdir = $(datadir)/enlightenment/doc +docfiles_DATA = \ +doc/documentation.html \ +doc/illume2.html \ +doc/FDO.txt \ +doc/cache.txt \ +doc/enlightenment.png \ +doc/illume2.png + +EXTRA_DIST += \ +$(docfiles_DATA) \ +doc/Doxyfile.in \ +$(wildcard doc/img/*.*) \ +doc/e.css \ +doc/head.html \ +doc/foot.html \ +doc/e.dox.in diff --git a/m4/Makefile.mk b/m4/Makefile.mk new file mode 100644 index 0000000000..745d21c033 --- /dev/null +++ b/m4/Makefile.mk @@ -0,0 +1,26 @@ +MAINTAINERCLEANFILES += \ +m4/libtool.m4 \ +m4/lt~obsolete.m4 \ +m4/ltoptions.m4 \ +m4/ltsugar.m4 \ +m4/ltversion.m4 \ +m4/codeset.m4 \ +m4/gettext.m4 \ +m4/glibc21.m4 \ +m4/iconv.m4 \ +m4/intdiv0.m4 \ +m4/inttypes_h.m4 \ +m4/inttypes.m4 \ +m4/inttypes-pri.m4 \ +m4/isc-posix.m4 \ +m4/lcmessage.m4 \ +m4/lib-ld.m4 \ +m4/lib-link.m4 \ +m4/lib-prefix.m4 \ +m4/nls.m4 \ +m4/po.m4 \ +m4/progtest.m4 \ +m4/stdint_h.m4 \ +m4/uintmax_t.m4 \ +m4/ulonglong.m4 + diff --git a/po/Makefile.mk b/po/Makefile.mk new file mode 100644 index 0000000000..3ce95bf196 --- /dev/null +++ b/po/Makefile.mk @@ -0,0 +1,10 @@ +MAINTAINERCLEANFILES += \ +po/boldquot.sed \ +po/en@boldquot.header \ +po/en@quot.header \ +po/insert-header.sin \ +po/Makefile.in.in \ +po/Makevars.template \ +po/quot.sed \ +po/remove-potcdate.sin \ +po/Rules-quot diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index c3625499ba..0000000000 --- a/src/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in -SUBDIRS = bin modules diff --git a/src/Makefile.mk b/src/Makefile.mk new file mode 100644 index 0000000000..5bd68cd42d --- /dev/null +++ b/src/Makefile.mk @@ -0,0 +1,2 @@ +include src/bin/Makefile.mk +include src/modules/Makefile.mk diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am deleted file mode 100644 index 273af05919..0000000000 --- a/src/bin/Makefile.am +++ /dev/null @@ -1,457 +0,0 @@ -SUBDIRS = e_fm - -MAINTAINERCLEANFILES = Makefile.in -DISTCLEANFILES = e_fm_shared_types.h - -AM_CPPFLAGS = \ --I$(top_builddir) \ --I$(top_builddir)/src/bin \ --I$(top_srcdir) \ --I$(top_srcdir)/src/bin \ -@e_cflags@ \ -@cf_cflags@ \ -@VALGRIND_CFLAGS@ \ -@EDJE_DEF@ \ -@WAYLAND_CFLAGS@ \ -@WAYLAND_EGL_CFLAGS@ \ --DE_BINDIR=\"$(bindir)\" \ --DPACKAGE_BIN_DIR=\"@PACKAGE_BIN_DIR@\" \ --DPACKAGE_LIB_DIR=\"@PACKAGE_LIB_DIR@\" \ --DPACKAGE_DATA_DIR=\"@PACKAGE_DATA_DIR@\" \ --DLOCALE_DIR=\"@LOCALE_DIR@\" \ --DPACKAGE_SYSCONF_DIR=\"@PACKAGE_SYSCONF_DIR@\" - -bin_PROGRAMS = \ -enlightenment \ -enlightenment_imc \ -enlightenment_start \ -enlightenment_filemanager \ -enlightenment_open - -internal_bindir = $(libdir)/enlightenment/utils -internal_bin_PROGRAMS = \ -enlightenment_fm_op \ -enlightenment_sys \ -enlightenment_thumb \ -enlightenment_alert \ -enlightenment_static_grabber - -if HAVE_EEZE -internal_bin_PROGRAMS += enlightenment_backlight -endif - -ENLIGHTENMENTHEADERS = \ -e_about.h \ -e_acpi.h \ -e_actions.h \ -e_alert.h \ -e_atoms.h \ -e_backlight.h \ -e_bg.h \ -e_bindings.h \ -e_border.h \ -e_box.h \ -e_canvas.h \ -e_color_class.h \ -e_color_dialog.h \ -e_color.h \ -e_comp.h \ -e_comp_cfdata.h \ -e_comp_render_update.h \ -e_config_data.h \ -e_config_dialog.h \ -e_config.h \ -e_configure.h \ -e_confirm_dialog.h \ -e_container.h \ -e_datastore.h \ -e_dbusmenu.h \ -e_desk.h \ -e_deskenv.h \ -e_desklock.h \ -e_deskmirror.h \ -e_dialog.h \ -e_dnd.h \ -e_dpms.h \ -e_desktop_editor.h \ -e_entry.h \ -e_entry_dialog.h \ -e_env.h \ -e_error.h \ -e_exec.h \ -e_exehist.h \ -e_filereg.h \ -e_flowlayout.h \ -e_fm_custom.h \ -e_fm_device.h \ -e_fm.h \ -e_fm_mime.h \ -e_fm_op.h \ -e_fm_op_registry.h \ -e_fm_prop.h \ -e_fm_shared_codec.h \ -e_fm_shared_device.h \ -e_fm_shared_types.h \ -e_focus.h \ -e_font.h \ -e_gadcon.h \ -e_gadcon_popup.h \ -e_grabinput.h \ -e_grab_dialog.h \ -e.h \ -e_hints.h \ -e_icon.h \ -e_ilist.h \ -e_import_config_dialog.h \ -e_import_dialog.h \ -e_includes.h \ -e_init.h \ -e_int_border_locks.h \ -e_int_border_menu.h \ -e_int_border_prop.h \ -e_int_border_remember.h \ -e_int_config_modules.h \ -e_int_gadcon_config.h \ -e_intl_data.h \ -e_intl.h \ -e_int_menus.h \ -e_int_shelf_config.h \ -e_int_toolbar_config.h \ -e_ipc_codec.h \ -e_ipc.h \ -e_layout.h \ -e_livethumb.h \ -e_log.h \ -e_manager.h \ -e_maximize.h \ -e_menu.h \ -e_mmx.h \ -e_module.h \ -e_mouse.h \ -e_moveresize.h \ -e_msgbus.h \ -e_notification.h \ -e_msg.h \ -e_obj_dialog.h \ -e_object.h \ -e_order.h \ -e_pan.h \ -e_path.h \ -e_place.h \ -e_pointer.h \ -e_popup.h \ -e_powersave.h \ -e_prefix.h \ -e_randr.h \ -e_remember.h \ -e_resist.h \ -e_scale.h \ -e_screensaver.h \ -e_scrollframe.h \ -e_sha1.h \ -e_shelf.h \ -e_signals.h \ -e_slidecore.h \ -e_slider.h \ -e_slidesel.h \ -e_spectrum.h \ -e_startup.h \ -e_stolen.h \ -e_sys.h \ -e_table.h \ -e_test.h \ -e_theme_about.h \ -e_theme.h \ -e_thumb.h \ -e_toolbar.h \ -e_update.h \ -e_user.h \ -e_utils.h \ -e_widget_aspect.h \ -e_widget_button.h \ -e_widget_check.h \ -e_widget_color_well.h \ -e_widget_config_list.h \ -e_widget_csel.h \ -e_widget_cslider.h \ -e_widget_bgpreview.h \ -e_widget_entry.h \ -e_widget_filepreview.h \ -e_widget_flist.h \ -e_widget_font_preview.h \ -e_widget_framelist.h \ -e_widget_frametable.h \ -e_widget_fsel.h \ -e_widget.h \ -e_widget_ilist.h \ -e_widget_image.h \ -e_widget_label.h \ -e_widget_list.h \ -e_widget_preview.h \ -e_widget_radio.h \ -e_widget_scrollframe.h \ -e_widget_slider.h \ -e_widget_spectrum.h \ -e_widget_table.h \ -e_widget_textblock.h \ -e_widget_toolbar.h \ -e_widget_toolbook.h \ -e_win.h \ -e_xinerama.h \ -e_xkb.h \ -e_xsettings.h \ -e_zoomap.h \ -e_zone.h - -if HAVE_WAYLAND_CLIENTS -ENLIGHTENMENTHEADERS += \ -e_comp_wl.h \ -e_surface.h -endif - - -enlightenment_src = \ -e_about.c \ -e_acpi.c \ -e_alert.c \ -e_actions.c \ -e_atoms.c \ -e_backlight.c \ -e_bg.c \ -e_bindings.c \ -e_border.c \ -e_box.c \ -e_canvas.c \ -e_color.c \ -e_color_class.c \ -e_color_dialog.c \ -e_comp.c \ -e_comp_cfdata.c \ -e_comp_render_update.c \ -e_config.c \ -e_config_data.c \ -e_config_dialog.c \ -e_configure.c \ -e_confirm_dialog.c \ -e_container.c \ -e_datastore.c \ -e_dbusmenu.c \ -e_desk.c \ -e_deskenv.c \ -e_desklock.c \ -e_deskmirror.c \ -e_dialog.c \ -e_dnd.c \ -e_dpms.c \ -e_desktop_editor.c \ -e_entry.c \ -e_entry_dialog.c \ -e_env.c \ -e_error.c \ -e_exec.c \ -e_exehist.c \ -e_filereg.c \ -e_flowlayout.c \ -e_fm.c \ -e_fm_custom.c \ -e_fm_device.c \ -e_fm_mime.c \ -e_fm_op_registry.c \ -e_fm_prop.c \ -e_fm_shared_codec.c \ -e_fm_shared_device.c \ -e_focus.c \ -e_font.c \ -e_gadcon.c \ -e_gadcon_popup.c \ -e_grabinput.c \ -e_grab_dialog.c \ -e_hints.c \ -e_icon.c \ -e_ilist.c \ -e_import_config_dialog.c \ -e_import_dialog.c \ -e_init.c \ -e_int_border_locks.c \ -e_int_border_menu.c \ -e_int_border_prop.c \ -e_int_border_remember.c \ -e_int_config_modules.c \ -e_int_gadcon_config.c \ -e_intl.c \ -e_intl_data.c \ -e_int_menus.c \ -e_int_shelf_config.c \ -e_int_toolbar_config.c \ -e_ipc.c \ -e_ipc_codec.c \ -e_layout.c \ -e_livethumb.c \ -e_log.c \ -e_manager.c \ -e_maximize.c \ -e_menu.c \ -e_module.c \ -e_mouse.c \ -e_moveresize.c \ -e_msgbus.c \ -e_notification.c \ -e_msg.c \ -e_obj_dialog.c \ -e_object.c \ -e_order.c \ -e_pan.c \ -e_path.c \ -e_place.c \ -e_pointer.c \ -e_popup.c \ -e_powersave.c \ -e_prefix.c \ -e_randr.c \ -e_remember.c \ -e_resist.c \ -e_scale.c \ -e_screensaver.c \ -e_scrollframe.c \ -e_sha1.c \ -e_shelf.c \ -e_signals.c \ -e_slidecore.c \ -e_slider.c \ -e_slidesel.c \ -e_spectrum.c \ -e_startup.c \ -e_stolen.c \ -e_sys.c \ -e_table.c \ -e_test.c \ -e_theme_about.c \ -e_theme.c \ -e_thumb.c \ -e_toolbar.c \ -e_update.c \ -e_user.c \ -e_utils.c \ -e_widget_aspect.c \ -e_widget_button.c \ -e_widget.c \ -e_widget_check.c \ -e_widget_color_well.c \ -e_widget_config_list.c \ -e_widget_csel.c \ -e_widget_cslider.c \ -e_widget_bgpreview.c \ -e_widget_entry.c \ -e_widget_filepreview.c \ -e_widget_flist.c \ -e_widget_font_preview.c \ -e_widget_framelist.c \ -e_widget_frametable.c \ -e_widget_fsel.c \ -e_widget_ilist.c \ -e_widget_image.c \ -e_widget_label.c \ -e_widget_list.c \ -e_widget_preview.c \ -e_widget_radio.c \ -e_widget_scrollframe.c \ -e_widget_slider.c \ -e_widget_spectrum.c \ -e_widget_table.c \ -e_widget_textblock.c \ -e_widget_toolbar.c \ -e_widget_toolbook.c \ -e_win.c \ -e_xinerama.c \ -e_xkb.c \ -e_xsettings.c \ -e_zoomap.c \ -e_zone.c \ -$(ENLIGHTENMENTHEADERS) - -if HAVE_WAYLAND_CLIENTS -enlightenment_src += \ -e_comp_wl.c \ -e_surface.c -endif - -enlightenment_CFLAGS = $(AM_CPPFLAGS) @WAYLAND_CFLAGS@ @WAYLAND_EGL_CFLAGS@ -enlightenment_CPPFLAGS = $(AM_CPPFLAGS) -DE_LOGGING=1 -enlightenment_SOURCES = \ -e_main.c \ -$(enlightenment_src) - -enlightenment_LDFLAGS = -export-dynamic -enlightenment_LDADD = @e_libs@ @dlopen_libs@ @cf_libs@ @VALGRIND_LIBS@ @WAYLAND_LIBS@ @WAYLAND_EGL_LIBS@ -lm - -enlightenment_imc_SOURCES = \ -e.h \ -e_config_data.c \ -e_imc_main.c \ -e_intl_data.c - -enlightenment_imc_LDADD = @E_IMC_LIBS@ - -enlightenment_start_SOURCES = \ -e_start_main.c -enlightenment_start_CFLAGS = $(AM_CPPFLAGS) @E_START_CFLAGS@ -enlightenment_start_LDADD = @dlopen_libs@ @E_START_LIBS@ - -enlightenment_thumb_SOURCES = \ -e_sha1.c \ -e_thumb_main.c \ -e_user.c - -enlightenment_thumb_LDADD = @E_THUMB_LIBS@ - -enlightenment_fm_op_SOURCES = \ -e_fm_op.c - -enlightenment_fm_op_LDADD = @E_FM_OP_LIBS@ -lm - -enlightenment_sys_SOURCES = \ -e_sys_main.c e_sys_l2ping.c - -enlightenment_sys_LDADD = @SUID_LDFLAGS@ @E_SYS_LIBS@ @BLUEZ_LIBS@ -enlightenment_sys_CFLAGS = @SUID_CFLAGS@ @E_SYS_CFLAGS@ @BLUEZ_CFLAGS@ - -if HAVE_EEZE -enlightenment_backlight_SOURCES = \ -e_backlight_main.c - -enlightenment_backlight_CFLAGS = @SUID_CFLAGS@ @EEZE_CFLAGS@ -enlightenment_backlight_LDADD = @SUID_LDFLAGS@ @EEZE_LIBS@ -endif - -enlightenment_alert_SOURCES = \ -e_alert_main.c - -enlightenment_alert_LDADD = @E_ALERT_LIBS@ -enlightenment_alert_CFLAGS = @E_ALERT_CFLAGS@ - -enlightenment_filemanager_SOURCES = e_fm_cmdline.c -enlightenment_filemanager_LDADD = @E_FM_CMDLINE_LIBS@ -enlightenment_filemanager_CFLAGS = @E_FM_CMDLINE_CFLAGS@ - -enlightenment_open_SOURCES = e_open.c -enlightenment_open_LDADD = @E_OPEN_LIBS@ -enlightenment_open_CFLAGS = @E_OPEN_CFLAGS@ - -enlightenment_static_grabber_SOURCES = e_static_grab.c -enlightenment_static_grabber_LDADD = @E_GRABBER_LIBS@ -enlightenment_static_grabber_CFLAGS = @E_GRABBER_CFLAGS@ - -# HACK! why install-data-hook? install-exec-hook is run after bin_PROGRAMS -# and before internal_bin_PROGRAMS are installed. install-data-hook is -# run after both -setuid_root_mode = a=rx,u+xs -if HAVE_EEZE -install-data-hook: - @chmod $(setuid_root_mode) $(DESTDIR)$(libdir)/enlightenment/utils/enlightenment_sys$(EXEEXT) || true - @chmod $(setuid_root_mode) $(DESTDIR)$(libdir)/enlightenment/utils/enlightenment_backlight$(EXEEXT) || true -else -install-data-hook: - @chmod $(setuid_root_mode) $(DESTDIR)$(libdir)/enlightenment/utils/enlightenment_sys$(EXEEXT) || true -endif -installed_headersdir = $(prefix)/include/enlightenment -installed_headers_DATA = $(ENLIGHTENMENTHEADERS) diff --git a/src/bin/Makefile.mk b/src/bin/Makefile.mk new file mode 100644 index 0000000000..0e58521fa8 --- /dev/null +++ b/src/bin/Makefile.mk @@ -0,0 +1,470 @@ +DISTCLEANFILES += src/bin/e_fm_shared_types.h + +E_CPPFLAGS = \ +-I$(top_builddir) \ +-I$(top_builddir)/src/bin \ +-I$(top_srcdir) \ +-I$(top_srcdir)/src/bin \ +@e_cflags@ \ +@cf_cflags@ \ +@VALGRIND_CFLAGS@ \ +@EDJE_DEF@ \ +@WAYLAND_CFLAGS@ \ +@WAYLAND_EGL_CFLAGS@ \ +-DE_BINDIR=\"$(bindir)\" \ +-DPACKAGE_BIN_DIR=\"@PACKAGE_BIN_DIR@\" \ +-DPACKAGE_LIB_DIR=\"@PACKAGE_LIB_DIR@\" \ +-DPACKAGE_DATA_DIR=\"@PACKAGE_DATA_DIR@\" \ +-DLOCALE_DIR=\"@LOCALE_DIR@\" \ +-DPACKAGE_SYSCONF_DIR=\"@PACKAGE_SYSCONF_DIR@\" + +bin_PROGRAMS = \ +src/bin/enlightenment \ +src/bin/enlightenment_imc \ +src/bin/enlightenment_start \ +src/bin/enlightenment_filemanager \ +src/bin/enlightenment_open + +internal_bindir = $(libdir)/enlightenment/utils +internal_bin_PROGRAMS = \ +src/bin/enlightenment_fm_op \ +src/bin/enlightenment_sys \ +src/bin/enlightenment_thumb \ +src/bin/enlightenment_alert \ +src/bin/enlightenment_static_grabber + +if HAVE_EEZE +internal_bin_PROGRAMS += src/bin/enlightenment_backlight +endif + +ENLIGHTENMENTHEADERS = \ +src/bin/e_about.h \ +src/bin/e_acpi.h \ +src/bin/e_actions.h \ +src/bin/e_alert.h \ +src/bin/e_atoms.h \ +src/bin/e_backlight.h \ +src/bin/e_bg.h \ +src/bin/e_bindings.h \ +src/bin/e_border.h \ +src/bin/e_box.h \ +src/bin/e_canvas.h \ +src/bin/e_color_class.h \ +src/bin/e_color_dialog.h \ +src/bin/e_color.h \ +src/bin/e_comp.h \ +src/bin/e_comp_cfdata.h \ +src/bin/e_comp_render_update.h \ +src/bin/e_config_data.h \ +src/bin/e_config_dialog.h \ +src/bin/e_config.h \ +src/bin/e_configure.h \ +src/bin/e_confirm_dialog.h \ +src/bin/e_container.h \ +src/bin/e_datastore.h \ +src/bin/e_dbusmenu.h \ +src/bin/e_desk.h \ +src/bin/e_deskenv.h \ +src/bin/e_desklock.h \ +src/bin/e_deskmirror.h \ +src/bin/e_dialog.h \ +src/bin/e_dnd.h \ +src/bin/e_dpms.h \ +src/bin/e_desktop_editor.h \ +src/bin/e_entry.h \ +src/bin/e_entry_dialog.h \ +src/bin/e_env.h \ +src/bin/e_error.h \ +src/bin/e_exec.h \ +src/bin/e_exehist.h \ +src/bin/e_filereg.h \ +src/bin/e_flowlayout.h \ +src/bin/e_fm_custom.h \ +src/bin/e_fm_device.h \ +src/bin/e_fm.h \ +src/bin/e_fm_mime.h \ +src/bin/e_fm_op.h \ +src/bin/e_fm_op_registry.h \ +src/bin/e_fm_prop.h \ +src/bin/e_fm_shared_codec.h \ +src/bin/e_fm_shared_device.h \ +src/bin/e_fm_shared_types.h \ +src/bin/e_focus.h \ +src/bin/e_font.h \ +src/bin/e_gadcon.h \ +src/bin/e_gadcon_popup.h \ +src/bin/e_grabinput.h \ +src/bin/e_grab_dialog.h \ +src/bin/e.h \ +src/bin/e_hints.h \ +src/bin/e_icon.h \ +src/bin/e_ilist.h \ +src/bin/e_import_config_dialog.h \ +src/bin/e_import_dialog.h \ +src/bin/e_includes.h \ +src/bin/e_init.h \ +src/bin/e_int_border_locks.h \ +src/bin/e_int_border_menu.h \ +src/bin/e_int_border_prop.h \ +src/bin/e_int_border_remember.h \ +src/bin/e_int_config_modules.h \ +src/bin/e_int_gadcon_config.h \ +src/bin/e_intl_data.h \ +src/bin/e_intl.h \ +src/bin/e_int_menus.h \ +src/bin/e_int_shelf_config.h \ +src/bin/e_int_toolbar_config.h \ +src/bin/e_ipc_codec.h \ +src/bin/e_ipc.h \ +src/bin/e_layout.h \ +src/bin/e_livethumb.h \ +src/bin/e_log.h \ +src/bin/e_manager.h \ +src/bin/e_maximize.h \ +src/bin/e_menu.h \ +src/bin/e_mmx.h \ +src/bin/e_module.h \ +src/bin/e_mouse.h \ +src/bin/e_moveresize.h \ +src/bin/e_msgbus.h \ +src/bin/e_notification.h \ +src/bin/e_msg.h \ +src/bin/e_obj_dialog.h \ +src/bin/e_object.h \ +src/bin/e_order.h \ +src/bin/e_pan.h \ +src/bin/e_path.h \ +src/bin/e_place.h \ +src/bin/e_pointer.h \ +src/bin/e_popup.h \ +src/bin/e_powersave.h \ +src/bin/e_prefix.h \ +src/bin/e_randr.h \ +src/bin/e_remember.h \ +src/bin/e_resist.h \ +src/bin/e_scale.h \ +src/bin/e_screensaver.h \ +src/bin/e_scrollframe.h \ +src/bin/e_sha1.h \ +src/bin/e_shelf.h \ +src/bin/e_signals.h \ +src/bin/e_slidecore.h \ +src/bin/e_slider.h \ +src/bin/e_slidesel.h \ +src/bin/e_spectrum.h \ +src/bin/e_startup.h \ +src/bin/e_stolen.h \ +src/bin/e_sys.h \ +src/bin/e_table.h \ +src/bin/e_test.h \ +src/bin/e_theme_about.h \ +src/bin/e_theme.h \ +src/bin/e_thumb.h \ +src/bin/e_toolbar.h \ +src/bin/e_update.h \ +src/bin/e_user.h \ +src/bin/e_utils.h \ +src/bin/e_widget_aspect.h \ +src/bin/e_widget_button.h \ +src/bin/e_widget_check.h \ +src/bin/e_widget_color_well.h \ +src/bin/e_widget_config_list.h \ +src/bin/e_widget_csel.h \ +src/bin/e_widget_cslider.h \ +src/bin/e_widget_bgpreview.h \ +src/bin/e_widget_entry.h \ +src/bin/e_widget_filepreview.h \ +src/bin/e_widget_flist.h \ +src/bin/e_widget_font_preview.h \ +src/bin/e_widget_framelist.h \ +src/bin/e_widget_frametable.h \ +src/bin/e_widget_fsel.h \ +src/bin/e_widget.h \ +src/bin/e_widget_ilist.h \ +src/bin/e_widget_image.h \ +src/bin/e_widget_label.h \ +src/bin/e_widget_list.h \ +src/bin/e_widget_preview.h \ +src/bin/e_widget_radio.h \ +src/bin/e_widget_scrollframe.h \ +src/bin/e_widget_slider.h \ +src/bin/e_widget_spectrum.h \ +src/bin/e_widget_table.h \ +src/bin/e_widget_textblock.h \ +src/bin/e_widget_toolbar.h \ +src/bin/e_widget_toolbook.h \ +src/bin/e_win.h \ +src/bin/e_xinerama.h \ +src/bin/e_xkb.h \ +src/bin/e_xsettings.h \ +src/bin/e_zoomap.h \ +src/bin/e_zone.h + +if HAVE_WAYLAND_CLIENTS +ENLIGHTENMENTHEADERS += \ +src/bin/e_comp_wl.h \ +src/bin/e_surface.h +endif + + +enlightenment_src = \ +src/bin/e_about.c \ +src/bin/e_acpi.c \ +src/bin/e_alert.c \ +src/bin/e_actions.c \ +src/bin/e_atoms.c \ +src/bin/e_backlight.c \ +src/bin/e_bg.c \ +src/bin/e_bindings.c \ +src/bin/e_border.c \ +src/bin/e_box.c \ +src/bin/e_canvas.c \ +src/bin/e_color.c \ +src/bin/e_color_class.c \ +src/bin/e_color_dialog.c \ +src/bin/e_comp.c \ +src/bin/e_comp_cfdata.c \ +src/bin/e_comp_render_update.c \ +src/bin/e_config.c \ +src/bin/e_config_data.c \ +src/bin/e_config_dialog.c \ +src/bin/e_configure.c \ +src/bin/e_confirm_dialog.c \ +src/bin/e_container.c \ +src/bin/e_datastore.c \ +src/bin/e_dbusmenu.c \ +src/bin/e_desk.c \ +src/bin/e_deskenv.c \ +src/bin/e_desklock.c \ +src/bin/e_deskmirror.c \ +src/bin/e_dialog.c \ +src/bin/e_dnd.c \ +src/bin/e_dpms.c \ +src/bin/e_desktop_editor.c \ +src/bin/e_entry.c \ +src/bin/e_entry_dialog.c \ +src/bin/e_env.c \ +src/bin/e_error.c \ +src/bin/e_exec.c \ +src/bin/e_exehist.c \ +src/bin/e_filereg.c \ +src/bin/e_flowlayout.c \ +src/bin/e_fm.c \ +src/bin/e_fm_custom.c \ +src/bin/e_fm_device.c \ +src/bin/e_fm_mime.c \ +src/bin/e_fm_op_registry.c \ +src/bin/e_fm_prop.c \ +src/bin/e_fm_shared_codec.c \ +src/bin/e_fm_shared_device.c \ +src/bin/e_focus.c \ +src/bin/e_font.c \ +src/bin/e_gadcon.c \ +src/bin/e_gadcon_popup.c \ +src/bin/e_grabinput.c \ +src/bin/e_grab_dialog.c \ +src/bin/e_hints.c \ +src/bin/e_icon.c \ +src/bin/e_ilist.c \ +src/bin/e_import_config_dialog.c \ +src/bin/e_import_dialog.c \ +src/bin/e_init.c \ +src/bin/e_int_border_locks.c \ +src/bin/e_int_border_menu.c \ +src/bin/e_int_border_prop.c \ +src/bin/e_int_border_remember.c \ +src/bin/e_int_config_modules.c \ +src/bin/e_int_gadcon_config.c \ +src/bin/e_intl.c \ +src/bin/e_intl_data.c \ +src/bin/e_int_menus.c \ +src/bin/e_int_shelf_config.c \ +src/bin/e_int_toolbar_config.c \ +src/bin/e_ipc.c \ +src/bin/e_ipc_codec.c \ +src/bin/e_layout.c \ +src/bin/e_livethumb.c \ +src/bin/e_log.c \ +src/bin/e_manager.c \ +src/bin/e_maximize.c \ +src/bin/e_menu.c \ +src/bin/e_module.c \ +src/bin/e_mouse.c \ +src/bin/e_moveresize.c \ +src/bin/e_msgbus.c \ +src/bin/e_notification.c \ +src/bin/e_msg.c \ +src/bin/e_obj_dialog.c \ +src/bin/e_object.c \ +src/bin/e_order.c \ +src/bin/e_pan.c \ +src/bin/e_path.c \ +src/bin/e_place.c \ +src/bin/e_pointer.c \ +src/bin/e_popup.c \ +src/bin/e_powersave.c \ +src/bin/e_prefix.c \ +src/bin/e_randr.c \ +src/bin/e_remember.c \ +src/bin/e_resist.c \ +src/bin/e_scale.c \ +src/bin/e_screensaver.c \ +src/bin/e_scrollframe.c \ +src/bin/e_sha1.c \ +src/bin/e_shelf.c \ +src/bin/e_signals.c \ +src/bin/e_slidecore.c \ +src/bin/e_slider.c \ +src/bin/e_slidesel.c \ +src/bin/e_spectrum.c \ +src/bin/e_startup.c \ +src/bin/e_stolen.c \ +src/bin/e_sys.c \ +src/bin/e_table.c \ +src/bin/e_test.c \ +src/bin/e_theme_about.c \ +src/bin/e_theme.c \ +src/bin/e_thumb.c \ +src/bin/e_toolbar.c \ +src/bin/e_update.c \ +src/bin/e_user.c \ +src/bin/e_utils.c \ +src/bin/e_widget_aspect.c \ +src/bin/e_widget_button.c \ +src/bin/e_widget.c \ +src/bin/e_widget_check.c \ +src/bin/e_widget_color_well.c \ +src/bin/e_widget_config_list.c \ +src/bin/e_widget_csel.c \ +src/bin/e_widget_cslider.c \ +src/bin/e_widget_bgpreview.c \ +src/bin/e_widget_entry.c \ +src/bin/e_widget_filepreview.c \ +src/bin/e_widget_flist.c \ +src/bin/e_widget_font_preview.c \ +src/bin/e_widget_framelist.c \ +src/bin/e_widget_frametable.c \ +src/bin/e_widget_fsel.c \ +src/bin/e_widget_ilist.c \ +src/bin/e_widget_image.c \ +src/bin/e_widget_label.c \ +src/bin/e_widget_list.c \ +src/bin/e_widget_preview.c \ +src/bin/e_widget_radio.c \ +src/bin/e_widget_scrollframe.c \ +src/bin/e_widget_slider.c \ +src/bin/e_widget_spectrum.c \ +src/bin/e_widget_table.c \ +src/bin/e_widget_textblock.c \ +src/bin/e_widget_toolbar.c \ +src/bin/e_widget_toolbook.c \ +src/bin/e_win.c \ +src/bin/e_xinerama.c \ +src/bin/e_xkb.c \ +src/bin/e_xsettings.c \ +src/bin/e_zoomap.c \ +src/bin/e_zone.c \ +$(ENLIGHTENMENTHEADERS) + +if HAVE_WAYLAND_CLIENTS +enlightenment_src += \ +src/bin/e_comp_wl.c \ +src/bin/e_surface.c +endif + +src_bin_enlightenment_CFLAGS = $(AM_CPPFLAGS) @WAYLAND_CFLAGS@ @WAYLAND_EGL_CFLAGS@ +src_bin_enlightenment_CPPFLAGS = $(E_CPPFLAGS) -DE_LOGGING=1 +src_bin_enlightenment_SOURCES = \ +src/bin/e_main.c \ +$(enlightenment_src) + +src_bin_enlightenment_LDFLAGS = -export-dynamic +src_bin_enlightenment_LDADD = @e_libs@ @dlopen_libs@ @cf_libs@ @VALGRIND_LIBS@ @WAYLAND_LIBS@ @WAYLAND_EGL_LIBS@ -lm + +src_bin_enlightenment_imc_SOURCES = \ +src/bin/e.h \ +src/bin/e_config_data.c \ +src/bin/e_imc_main.c \ +src/bin/e_intl_data.c + +src_bin_enlightenment_imc_LDADD = @E_IMC_LIBS@ +src_bin_enlightenment_imc_CPPFLAGS = $(E_CPPFLAGS) + +src_bin_enlightenment_start_SOURCES = \ +src/bin/e_start_main.c +src_bin_enlightenment_start_CPPFLAGS = $(E_CPPFLAGS) @E_START_CFLAGS@ +src_bin_enlightenment_start_LDADD = @dlopen_libs@ @E_START_LIBS@ + +src_bin_enlightenment_thumb_SOURCES = \ +src/bin/e_sha1.c \ +src/bin/e_thumb_main.c \ +src/bin/e_user.c + +src_bin_enlightenment_thumb_LDADD = @E_THUMB_LIBS@ +src_bin_enlightenment_thumb_CPPFLAGS = $(E_CPPFLAGS) + +src_bin_enlightenment_fm_op_SOURCES = \ +src/bin/e_fm_op.c + +src_bin_enlightenment_fm_op_LDADD = @E_FM_OP_LIBS@ -lm +src_bin_enlightenment_fm_op_CPPFLAGS = $(E_CPPFLAGS) + +src_bin_enlightenment_sys_SOURCES = \ +src/bin/e_sys_main.c \ +src/bin/e_sys_l2ping.c + +src_bin_enlightenment_sys_LDADD = @SUID_LDFLAGS@ @E_SYS_LIBS@ @BLUEZ_LIBS@ +src_bin_enlightenment_sys_CPPFLAGS = @SUID_CFLAGS@ @E_SYS_CFLAGS@ @BLUEZ_CFLAGS@ -DPACKAGE_SYSCONF_DIR=\"@PACKAGE_SYSCONF_DIR@\" + +if HAVE_EEZE +src_bin_enlightenment_backlight_SOURCES = \ +src/bin/e_backlight_main.c + +src_bin_enlightenment_backlight_CPPFLAGS = @SUID_CFLAGS@ @EEZE_CFLAGS@ +src_bin_enlightenment_backlight_LDADD = @SUID_LDFLAGS@ @EEZE_LIBS@ +endif + +src_bin_enlightenment_alert_SOURCES = \ +src/bin/e_alert_main.c + +src_bin_enlightenment_alert_LDADD = @E_ALERT_LIBS@ +src_bin_enlightenment_alert_CPPFLAGS = @E_ALERT_CFLAGS@ + +src_bin_enlightenment_filemanager_SOURCES = \ +src/bin/e_fm_cmdline.c +src_bin_enlightenment_filemanager_LDADD = @E_FM_CMDLINE_LIBS@ +src_bin_enlightenment_filemanager_CPPFLAGS = @E_FM_CMDLINE_CFLAGS@ + +src_bin_enlightenment_open_SOURCES = \ +src/bin/e_open.c +src_bin_enlightenment_open_LDADD = @E_OPEN_LIBS@ +src_bin_enlightenment_open_CPPFLAGS = @E_OPEN_CFLAGS@ + +src_bin_enlightenment_static_grabber_SOURCES = \ +src/bin/e_static_grab.c +src_bin_enlightenment_static_grabber_LDADD = @E_GRABBER_LIBS@ +src_bin_enlightenment_static_grabber_CPPFLAGS = @E_GRABBER_CFLAGS@ + +include src/bin/e_fm/Makefile.mk + +# HACK! why install-data-hook? install-exec-hook is run after bin_PROGRAMS +# and before internal_bin_PROGRAMS are installed. install-data-hook is +# run after both +setuid_root_mode = a=rx,u+xs +if HAVE_EEZE +enlightenment-sys-install-data-hook: + @chmod $(setuid_root_mode) $(DESTDIR)$(libdir)/enlightenment/utils/enlightenment_sys$(EXEEXT) || true + @chmod $(setuid_root_mode) $(DESTDIR)$(libdir)/enlightenment/utils/enlightenment_backlight$(EXEEXT) || true +else +enlightenment-sys-install-data-hook: + @chmod $(setuid_root_mode) $(DESTDIR)$(libdir)/enlightenment/utils/enlightenment_sys$(EXEEXT) || true +endif +installed_headersdir = $(prefix)/include/enlightenment +installed_headers_DATA = $(ENLIGHTENMENTHEADERS) +INSTALL_DATA_HOOKS += enlightenment-sys-install-data-hook + +PHONIES += e enlightenment install-e install-enlightenment +e: $(bin_PROGRAMS) +enlightenment: e +install-e: install-binPROGRAMS +install-enlightenment: install-e diff --git a/src/bin/e_fm/Makefile.am b/src/bin/e_fm/Makefile.am deleted file mode 100644 index dba628a971..0000000000 --- a/src/bin/e_fm/Makefile.am +++ /dev/null @@ -1,62 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in -AUTOMAKE_OPTIONS = subdir-objects - -AM_CFLAGS = \ --I$(top_builddir) \ --I$(top_builddir)/src/bin \ --I$(top_srcdir) \ --I$(top_srcdir)/src/bin \ -@e_cflags@ \ -@cf_cflags@ \ -@VALGRIND_CFLAGS@ \ -@EDJE_DEF@ \ --DPACKAGE_BIN_DIR=\"@PACKAGE_BIN_DIR@\" \ --DPACKAGE_LIB_DIR=\"@PACKAGE_LIB_DIR@\" \ --DPACKAGE_DATA_DIR=\"@PACKAGE_DATA_DIR@\" \ --DLOCALE_DIR=\"@LOCALE_DIR@\" \ --DPACKAGE_SYSCONF_DIR=\"@PACKAGE_SYSCONF_DIR@\" - -internal_bindir = $(libdir)/enlightenment/utils -internal_bin_PROGRAMS = \ -enlightenment_fm - -if HAVE_UDISKS_MOUNT -udisks_s = \ -e_fm_main_udisks.h \ -e_fm_main_udisks.c \ -e_fm_main_udisks2.h \ -e_fm_main_udisks2.c -else -udisks_s = -endif - -if HAVE_EEZE_MOUNT -AM_CFLAGS += @EEZE_CFLAGS@ @EET_CFLAGS@ -LIBS += @EEZE_LIBS@ @EET_LIBS@ -eeze_s = \ -e_fm_main_eeze.h \ -e_fm_main_eeze.c -else -eeze_s = -endif - -shared_sources = \ -e_fm_shared_codec.c \ -e_fm_shared_device.c \ -e_user.c - -enlightenment_fm_SOURCES = \ -e_fm_main.h \ -e_fm_ipc.h \ -e_fm_main.c \ -e_fm_ipc.c \ -$(udisks_s) \ -$(eeze_s) \ -$(shared_sources) - -$(shared_sources): %.c: $(abs_top_srcdir)/src/bin/%.c - $(AM_V_GEN) $(LN_S) -f $< $@ - -CLEANFILES = $(shared_sources) - -enlightenment_fm_LDADD = @E_FM_LIBS@ diff --git a/src/bin/e_fm/Makefile.mk b/src/bin/e_fm/Makefile.mk new file mode 100644 index 0000000000..1ab59a4f4f --- /dev/null +++ b/src/bin/e_fm/Makefile.mk @@ -0,0 +1,56 @@ +EFM_CPPFLAGS = \ +-I$(top_builddir) \ +-I$(top_builddir)/src/bin \ +-I$(top_srcdir) \ +-I$(top_srcdir)/src/bin \ +@e_cflags@ \ +@cf_cflags@ \ +@VALGRIND_CFLAGS@ \ +@EDJE_DEF@ \ +-DPACKAGE_BIN_DIR=\"@PACKAGE_BIN_DIR@\" \ +-DPACKAGE_LIB_DIR=\"@PACKAGE_LIB_DIR@\" \ +-DPACKAGE_DATA_DIR=\"@PACKAGE_DATA_DIR@\" \ +-DLOCALE_DIR=\"@LOCALE_DIR@\" \ +-DPACKAGE_SYSCONF_DIR=\"@PACKAGE_SYSCONF_DIR@\" + +EFM_LIBS = + +efm_bindir = $(libdir)/enlightenment/utils +efm_bin_PROGRAMS = \ +src/bin/e_fm/enlightenment_fm + +if HAVE_UDISKS_MOUNT +udisks_s = \ +src/bin/e_fm/e_fm_main_udisks.h \ +src/bin/e_fm/e_fm_main_udisks.c \ +src/bin/e_fm/e_fm_main_udisks2.h \ +src/bin/e_fm/e_fm_main_udisks2.c +else +udisks_s = +endif + +if HAVE_EEZE_MOUNT +EFM_CPPFLAGS += @EEZE_CFLAGS@ @EET_CFLAGS@ +EFM_LIBS += @EEZE_LIBS@ @EET_LIBS@ +eeze_s = \ +src/bin/e_prefix.c \ +src/bin/e_fm/e_fm_main_eeze.h \ +src/bin/e_fm/e_fm_main_eeze.c +else +eeze_s = +endif + +src_bin_e_fm_enlightenment_fm_SOURCES = \ +src/bin/e_fm/e_fm_main.h \ +src/bin/e_fm/e_fm_ipc.h \ +src/bin/e_fm/e_fm_main.c \ +src/bin/e_fm/e_fm_ipc.c \ +$(udisks_s) \ +$(eeze_s) \ +src/bin/e_fm_shared_codec.c \ +src/bin/e_fm_shared_device.c \ +src/bin/e_user.c \ +src/bin/e_sha1.c + +src_bin_e_fm_enlightenment_fm_LDADD = @E_FM_LIBS@ $(EFM_LIBS) +src_bin_e_fm_enlightenment_fm_CPPFLAGS = $(EFM_CPPFLAGS) diff --git a/src/bin/e_fm_cmdline.c b/src/bin/e_fm_cmdline.c index 11f498c4bc..f2c77f0e7b 100644 --- a/src/bin/e_fm_cmdline.c +++ b/src/bin/e_fm_cmdline.c @@ -2,7 +2,15 @@ # include "config.h" # endif -#include "e.h" +#ifdef __linux__ +# include <features.h> +#endif +#include <unistd.h> +#include <Ecore.h> +#include <Ecore_Getopt.h> +#include <Ecore_File.h> +#include <Efreet.h> +#include <Eldbus.h> static Eldbus_Connection *conn = NULL; static int retval = EXIT_SUCCESS; @@ -16,7 +24,7 @@ fm_open_reply(void *data __UNUSED__, const Eldbus_Message *msg, if (eldbus_message_error_get(msg, &name, &txt)) { retval = EXIT_FAILURE; - ERR("%s: %s", name, txt); + EINA_LOG_ERR("%s: %s", name, txt); } pending--; @@ -44,7 +52,7 @@ fm_open(const char *path) Efreet_Uri *uri = efreet_uri_decode(path); if ((!uri) || (!uri->protocol) || (strcmp(uri->protocol, "file") != 0)) { - ERR("Invalid URI '%s'", path); + EINA_LOG_ERR("Invalid URI '%s'", path); ecore_idler_add(fm_error_quit_last, NULL); if (uri) efreet_uri_free(uri); @@ -59,7 +67,7 @@ fm_open(const char *path) char buf[PATH_MAX]; if (!getcwd(buf, sizeof(buf))) { - ERR("Could not get current working directory: %s", strerror(errno)); + EINA_LOG_ERR("Could not get current working directory: %s", strerror(errno)); ecore_idler_add(fm_error_quit_last, NULL); return; } @@ -73,10 +81,10 @@ fm_open(const char *path) } } - DBG("'%s' -> '%s'", path, p); + EINA_LOG_DBG("'%s' -> '%s'", path, p); if ((!p) || (p[0] == '\0')) { - ERR("Could not get path '%s'", path); + EINA_LOG_ERR("Could not get path '%s'", path); ecore_idler_add(fm_error_quit_last, NULL); free(p); return; @@ -93,7 +101,7 @@ fm_open(const char *path) method); if (!msg) { - ERR("Could not create DBus Message"); + EINA_LOG_ERR("Could not create DBus Message"); ecore_idler_add(fm_error_quit_last, NULL); free(p); return; @@ -103,7 +111,7 @@ fm_open(const char *path) if (!eldbus_connection_send(conn, msg, fm_open_reply, NULL, -1)) { - ERR("Could not send DBus Message"); + EINA_LOG_ERR("Could not send DBus Message"); eldbus_message_unref(msg); ecore_idler_add(fm_error_quit_last, NULL); } @@ -144,7 +152,7 @@ main(int argc, char *argv[]) args = ecore_getopt_parse(&options, values, argc, argv); if (args < 0) { - ERR("Could not parse command line options."); + EINA_LOG_ERR("Could not parse command line options."); return EXIT_FAILURE; } @@ -157,7 +165,7 @@ main(int argc, char *argv[]) conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SESSION); if (!conn) { - ERR("Could not DBus SESSION bus."); + EINA_LOG_ERR("Could not DBus SESSION bus."); retval = EXIT_FAILURE; goto end; } diff --git a/src/bin/e_static_grab.c b/src/bin/e_static_grab.c index d1940fef26..8fb7a3e359 100644 --- a/src/bin/e_static_grab.c +++ b/src/bin/e_static_grab.c @@ -1,4 +1,8 @@ -#include "e.h" +# ifdef HAVE_CONFIG_H +# include "config.h" +# endif + +#include <Eet.h> typedef struct _E_Static_Grab E_Static_Grab; typedef struct _E_Static_Grab_Module E_Static_Grab_Module; diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am deleted file mode 100644 index 464144e47d..0000000000 --- a/src/modules/Makefile.am +++ /dev/null @@ -1,250 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in -AUTOMAKE_OPTIONS = subdir-objects - -SUBDIRS = -CLEANFILES = -EXTRA_DIST = -INSTALL_DATA_HOOKS = - -MDIR = $(libdir)/enlightenment/modules -AM_LDFLAGS = -module -avoid-version -AM_CPPFLAGS = -I. \ - -I$(top_srcdir) \ - -I$(top_srcdir)/src/bin \ - -I$(top_builddir)/src/bin \ - -I$(top_srcdir)/src/modules \ - -DE_BINDIR=\"$(bindir)\" -AM_CFLAGS = @e_cflags@ -LIBS += @e_libs@ @dlopen_libs@ - -EDJE_CC = $(EDJE_CC_$(V)) -EDJE_CC_ = $(EDJE_CC_$(AM_DEFAULT_VERBOSITY)) -EDJE_CC_0 = @echo " EDJE_CC " $@; @edje_cc@ -EDJE_CC_1 = @edje_cc@ - -EDJE_FLAGS_VERBOSE_ = $(EDJE_FLAGS_VERBOSE_$(AM_DEFAULT_VERBOSITY)) -EDJE_FLAGS_VERBOSE_0 = -EDJE_FLAGS_VERBOSE_1 = -v -EDJE_FLAGS = $(EDJE_FLAGS_VERBOSE_$(V)) @EDJE_DEF@ - -if USE_MODULE_CONNMAN -include Makefile_connman.am -endif - -if USE_MODULE_BLUEZ4 -include Makefile_bluez4.am -endif - -if USE_MODULE_IBAR -include Makefile_ibar.am -endif - -if USE_MODULE_CLOCK -include Makefile_clock.am -endif - -if USE_MODULE_PAGER -include Makefile_pager.am -endif - -if USE_MODULE_BATTERY -include Makefile_battery.am -endif - -if USE_MODULE_TEMPERATURE -include Makefile_temperature.am -endif - -if USE_MODULE_NOTIFICATION -include Makefile_notification.am -endif - -if USE_MODULE_CPUFREQ -include Makefile_cpufreq.am -endif - -if USE_MODULE_IBOX -include Makefile_ibox.am -endif - -if USE_MODULE_START -include Makefile_start.am -endif - -if USE_MODULE_WINLIST -include Makefile_winlist.am -endif - -if USE_MODULE_FILEMAN -include Makefile_fileman.am -endif - -if USE_MODULE_FILEMAN_OPINFO -include Makefile_fileman_opinfo.am -endif - -if USE_MODULE_WIZARD -include Makefile_wizard.am -endif - -if USE_MODULE_CONF -include Makefile_conf.am -endif - -if USE_MODULE_CONF_COMP -include Makefile_conf_comp.am -endif - -if USE_MODULE_CONF_WALLPAPER2 -include Makefile_conf_wallpaper2.am -endif - -if USE_MODULE_CONF_THEME -include Makefile_conf_theme.am -endif - -if USE_MODULE_CONF_INTL -include Makefile_conf_intl.am -endif - -if USE_MODULE_MSGBUS -include Makefile_msgbus.am -endif - -if USE_MODULE_CONF_APPLICATIONS -include Makefile_conf_applications.am -endif - -if USE_MODULE_CONF_DISPLAY -include Makefile_conf_display.am -endif - -if USE_MODULE_CONF_SHELVES -include Makefile_conf_shelves.am -endif - -if USE_MODULE_CONF_BINDINGS -include Makefile_conf_bindings.am -endif - -if USE_MODULE_CONF_WINDOW_REMEMBERS -include Makefile_conf_window_remembers.am -endif - -if USE_MODULE_CONF_WINDOW_MANIPULATION -include Makefile_conf_window_manipulation.am -endif - -if USE_MODULE_CONF_MENUS -include Makefile_conf_menus.am -endif - -if USE_MODULE_CONF_DIALOGS -include Makefile_conf_dialogs.am -endif - -if USE_MODULE_CONF_PERFORMANCE -include Makefile_conf_performance.am -endif - -if USE_MODULE_CONF_PATHS -include Makefile_conf_paths.am -endif - -if USE_MODULE_CONF_INTERACTION -include Makefile_conf_interaction.am -endif - -if USE_MODULE_CONF_RANDR -include Makefile_conf_randr.am -endif - -if USE_MODULE_GADMAN -include Makefile_gadman.am -endif - -if USE_MODULE_MIXER -include Makefile_mixer.am -endif - -if USE_MODULE_ILLUME2 -include Makefile_illume2.am -include Makefile_illume-home.am -include Makefile_illume-home-toggle.am -include Makefile_illume-softkey.am -include Makefile_illume-keyboard.am -include Makefile_illume-indicator.am -include Makefile_illume-kbd-toggle.am -include Makefile_illume-mode-toggle.am -include Makefile_illume-bluetooth.am -endif - -if USE_MODULE_SYSCON -include Makefile_syscon.am -endif - -if USE_MODULE_EVERYTHING -include Makefile_everything.am -endif - -if USE_MODULE_SYSTRAY -include Makefile_systray.am -endif - -if USE_MODULE_APPMENU -include Makefile_appmenu.am -endif - -if USE_MODULE_QUICKACCESS -include Makefile_quickaccess.am -endif - -if USE_MODULE_TEAMWORK -include Makefile_teamwork.am -endif - -if USE_MODULE_SHOT -include Makefile_shot.am -endif - -if USE_MODULE_BACKLIGHT -include Makefile_backlight.am -endif - -if USE_MODULE_TASKS -include Makefile_tasks.am -endif - -if USE_MODULE_XKBSWITCH -include Makefile_xkbswitch.am -endif - -if USE_MODULE_TILING -include Makefile_tiling.am -endif - -if USE_MODULE_ACCESS -include Makefile_access.am -endif - -if USE_MODULE_MUSIC_CONTROL -include Makefile_music_control.am -endif - -if USE_MODULE_CONTACT -include Makefile_contact.am -endif - -#if HAVE_WAYLAND_DRM -#include Makefile_wl_drm.am -#endif - -if USE_MODULE_WL_DESKTOP_SHELL -include Makefile_wl_desktop_shell.am -endif - -if USE_MODULE_WL_SCREENSHOT -include Makefile_wl_screenshot.am -endif - -install-data-hook: $(INSTALL_DATA_HOOKS) diff --git a/src/modules/Makefile.mk b/src/modules/Makefile.mk new file mode 100644 index 0000000000..598eb978da --- /dev/null +++ b/src/modules/Makefile.mk @@ -0,0 +1,231 @@ +MDIR = $(libdir)/enlightenment/modules +MOD_LDFLAGS = -module -avoid-version +MOD_CPPFLAGS = -I. \ +-I$(top_srcdir) \ +-I$(top_srcdir)/src/bin \ +-I$(top_builddir)/src/bin \ +-I$(top_srcdir)/src/modules \ +@e_cflags@ \ +-DE_BINDIR=\"$(bindir)\" + +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_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_COMP +include src/modules/Makefile_conf_comp.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 +include src/modules/Makefile_illume-softkey.mk +include src/modules/Makefile_illume-keyboard.mk +include src/modules/Makefile_illume-indicator.mk +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_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_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 HAVE_WAYLAND_SCREENSHOT +#include src/modules/Makefile_wl_screenshot.mk +#endif diff --git a/src/modules/Makefile_access.am b/src/modules/Makefile_access.am deleted file mode 100644 index 2243ba7acc..0000000000 --- a/src/modules/Makefile_access.am +++ /dev/null @@ -1,15 +0,0 @@ -accessdir = $(MDIR)/access -access_DATA = access/module.desktop - -EXTRA_DIST += $(access_DATA) - -accesspkgdir = $(MDIR)/access/$(MODULE_ARCH) -accesspkg_LTLIBRARIES = access/module.la - -access_module_la_SOURCES = access/e_mod_main.c \ - access/e_mod_main.h \ - access/e_mod_config.c - -.PHONY: access install-access -access: $(accesspkg_LTLIBRARIES) $(access_DATA) -install-access: install-accessDATA install-accesspkgLTLIBRARIES diff --git a/src/modules/Makefile_access.mk b/src/modules/Makefile_access.mk new file mode 100644 index 0000000000..ee49200b33 --- /dev/null +++ b/src/modules/Makefile_access.mk @@ -0,0 +1,18 @@ +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 + +src_modules_access_module_la_LIBADD = $(MOD_LIBS) +src_modules_access_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_access_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_access_module_la_SOURCES = src/modules/access/e_mod_main.c \ + src/modules/access/e_mod_main.h \ + src/modules/access/e_mod_config.c + +PHONIES += access install-access +access: $(accesspkg_LTLIBRARIES) $(access_DATA) +install-access: install-accessDATA install-accesspkgLTLIBRARIES diff --git a/src/modules/Makefile_appmenu.am b/src/modules/Makefile_appmenu.am deleted file mode 100644 index f680a74403..0000000000 --- a/src/modules/Makefile_appmenu.am +++ /dev/null @@ -1,18 +0,0 @@ -appmenudir = $(MDIR)/appmenu -appmenu_DATA = appmenu/module.desktop \ - appmenu/e-module-appmenu.edj - -EXTRA_DIST += $(appmenu_DATA) - -appmenupkgdir = $(MDIR)/appmenu/$(MODULE_ARCH) -appmenupkg_LTLIBRARIES = appmenu/module.la - -appmenu_module_la_SOURCES = appmenu/e_mod_main.c \ - appmenu/e_mod_dbus_registrar_server.c \ - appmenu/e_mod_appmenu_render.c \ - appmenu/e_mod_appmenu_private.h - - -.PHONY: appmenu install-appmenu -appmenu: $(appmenupkg_LTLIBRARIES) $(appmenu_DATA) -install-appmenu: install-appmenuDATA install-appmenupkgLTLIBRARIES diff --git a/src/modules/Makefile_appmenu.mk b/src/modules/Makefile_appmenu.mk new file mode 100644 index 0000000000..596b7ae6bc --- /dev/null +++ b/src/modules/Makefile_appmenu.mk @@ -0,0 +1,21 @@ +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 + +src_modules_appmenu_module_la_LIBADD = $(MOD_LIBS) +src_modules_appmenu_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_appmenu_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_appmenu_module_la_SOURCES = src/modules/appmenu/e_mod_main.c \ + src/modules/appmenu/e_mod_dbus_registrar_server.c \ + src/modules/appmenu/e_mod_appmenu_render.c \ + src/modules/appmenu/e_mod_appmenu_private.h + + +PHONIES += appmenu install-appmenu +appmenu: $(appmenupkg_LTLIBRARIES) $(appmenu_DATA) +install-appmenu: install-appmenuDATA install-appmenupkgLTLIBRARIES diff --git a/src/modules/Makefile_backlight.am b/src/modules/Makefile_backlight.am deleted file mode 100644 index 443fc5dc55..0000000000 --- a/src/modules/Makefile_backlight.am +++ /dev/null @@ -1,14 +0,0 @@ -backlightdir = $(MDIR)/backlight -backlight_DATA = backlight/e-module-backlight.edj \ - backlight/module.desktop - -EXTRA_DIST += $(backlight_DATA) - -backlightpkgdir = $(MDIR)/backlight/$(MODULE_ARCH) -backlightpkg_LTLIBRARIES = backlight/module.la - -backlight_module_la_SOURCES = backlight/e_mod_main.c - -.PHONY: backlight install-backlight -backlight: $(backlightpkg_LTLIBRARIES) $(backlight_DATA) -install-backlight: install-backlightDATA install-backlightpkgLTLIBRARIES diff --git a/src/modules/Makefile_backlight.mk b/src/modules/Makefile_backlight.mk new file mode 100644 index 0000000000..b6a24a1543 --- /dev/null +++ b/src/modules/Makefile_backlight.mk @@ -0,0 +1,17 @@ +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 + +src_modules_backlight_module_la_LIBADD = $(MOD_LIBS) +src_modules_backlight_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_backlight_module_la_LDFLAGS = $(MOD_LDFLAGS) +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 diff --git a/src/modules/Makefile_battery.am b/src/modules/Makefile_battery.am deleted file mode 100644 index d3b39dc14d..0000000000 --- a/src/modules/Makefile_battery.am +++ /dev/null @@ -1,39 +0,0 @@ -batterydir = $(MDIR)/battery -battery_DATA = battery/e-module-battery.edj \ - battery/module.desktop - -EXTRA_DIST += $(battery_DATA) - -batterypkgdir = $(MDIR)/battery/$(MODULE_ARCH) -batterypkg_LTLIBRARIES = battery/module.la - -battery_module_la_CFLAGS = $(AM_CFLAGS) -battery_module_la_SOURCES = battery/e_mod_main.h \ - battery/e_mod_main.c \ - battery/e_mod_config.c - -if HAVE_EEZE -battery_module_la_SOURCES += battery/e_mod_udev.c -else -if HAVE_OPENBSD -battery_module_la_SOURCES += battery/e_mod_openbsd.c -else -battery_module_la_SOURCES += battery/e_mod_upower.c -endif -endif - -if HAVE_ENOTIFY -battery_module_la_CFLAGS += @ENOTIFY_CFLAGS@ -battery_module_la_LIBADD = @ENOTIFY_LIBS@ -endif - -batgetdir = $(batterypkgdir) -batget_PROGRAMS = battery/batget - -battery_batget_SOURCES = battery/batget.c -battery_batget_LDADD = @BATTERY_LIBS@ -battery_batget_LDFLAGS = @BATTERY_LDFLAGS@ - -.PHONY: battery install-battery -battery: $(batterypkg_LTLIBRARIES) $(battery_DATA) $(batget_PROGRAMS) -install-battery: install-batteryDATA install-batterypkgLTLIBRARIES install-batgetPROGRAMS diff --git a/src/modules/Makefile_battery.mk b/src/modules/Makefile_battery.mk new file mode 100644 index 0000000000..fcf1fddfcf --- /dev/null +++ b/src/modules/Makefile_battery.mk @@ -0,0 +1,43 @@ +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 + +src_modules_battery_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_battery_module_la_SOURCES = src/modules/battery/e_mod_main.h \ + src/modules/battery/e_mod_main.c \ + src/modules/battery/e_mod_config.c + +if HAVE_EEZE +src_modules_battery_module_la_SOURCES += src/modules/battery/e_mod_udev.c +else +if HAVE_OPENBSD +src_modules_battery_module_la_SOURCES += src/modules/battery/e_mod_openbsd.c +else +src_modules_battery_module_la_SOURCES += src/modules/battery/e_mod_upower.c +endif +endif + +src_modules_battery_module_la_LIBADD = $(MOD_LIBS) +src_modules_battery_module_la_LDFLAGS = $(MOD_LDFLAGS) + +if HAVE_ENOTIFY +src_modules_battery_module_la_CPPFLAGS += @ENOTIFY_CFLAGS@ +src_modules_battery_module_la_LIBADD += @ENOTIFY_LIBS@ +endif + +src_modules_battery_batgetdir = $(batterypkgdir) +src_modules_battery_batget_PROGRAMS = src/modules/battery/batget + +src_modules_battery_batget_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_battery_batget_SOURCES = src/modules/battery/batget.c +src_modules_battery_batget_LDADD = @BATTERY_LIBS@ +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 diff --git a/src/modules/Makefile_bluez4.am b/src/modules/Makefile_bluez4.am deleted file mode 100644 index 6216c882d1..0000000000 --- a/src/modules/Makefile_bluez4.am +++ /dev/null @@ -1,22 +0,0 @@ -bluez4dir = $(MDIR)/bluez4 -bluez4_DATA = bluez4/e-module-bluez4.edj \ - bluez4/module.desktop - -EXTRA_DIST += $(bluez4_DATA) - -bluez4pkgdir = $(MDIR)/bluez4/$(MODULE_ARCH) -bluez4pkg_LTLIBRARIES = bluez4/module.la - -bluez4_module_la_SOURCES = bluez4/e_mod_main.h \ - bluez4/e_mod_main.c \ - bluez4/ebluez4.h \ - bluez4/ebluez4.c \ - bluez4/agent.h \ - bluez4/agent.c - -bluez4_module_la_CFLAGS = $(AM_CFLAGS) -Wno-unused-parameter -bluez4_module_la_LIBADD = @BLUEZ4_LIBS@ - -.PHONY: bluez4 install-bluez4 -bluez4: $(bluez4pkg_LTLIBRARIES) $(bluez4_DATA) -install-bluez4: install-bluez4DATA install-bluez4pkgLTLIBRARIES diff --git a/src/modules/Makefile_bluez4.mk b/src/modules/Makefile_bluez4.mk new file mode 100644 index 0000000000..0c0c2590fa --- /dev/null +++ b/src/modules/Makefile_bluez4.mk @@ -0,0 +1,23 @@ +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 + +src_modules_bluez4_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_bluez4_module_la_SOURCES = src/modules/bluez4/e_mod_main.h \ + src/modules/bluez4/e_mod_main.c \ + src/modules/bluez4/ebluez4.h \ + src/modules/bluez4/ebluez4.c \ + src/modules/bluez4/agent.h \ + src/modules/bluez4/agent.c + +src_modules_bluez4_module_la_CPPFLAGS = $(MOD_CPPFLAGS) -Wno-unused-parameter +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 diff --git a/src/modules/Makefile_clock.am b/src/modules/Makefile_clock.am deleted file mode 100644 index b79363d58f..0000000000 --- a/src/modules/Makefile_clock.am +++ /dev/null @@ -1,16 +0,0 @@ -clockdir = $(MDIR)/clock -clock_DATA = clock/e-module-clock.edj \ - clock/module.desktop - -EXTRA_DIST += $(clock_DATA) - -clockpkgdir = $(MDIR)/clock/$(MODULE_ARCH) -clockpkg_LTLIBRARIES = clock/module.la - -clock_module_la_SOURCES = clock/e_mod_main.h \ - clock/e_mod_main.c \ - clock/e_mod_config.c - -.PHONY: clock install-clock -clock: $(clockpkg_LTLIBRARIES) $(clock_DATA) -install-clock: install-clockDATA install-clockpkgLTLIBRARIES diff --git a/src/modules/Makefile_clock.mk b/src/modules/Makefile_clock.mk new file mode 100644 index 0000000000..e41bed6237 --- /dev/null +++ b/src/modules/Makefile_clock.mk @@ -0,0 +1,19 @@ +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 + +src_modules_clock_module_la_LIBADD = $(MOD_LIBS) +src_modules_clock_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_clock_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_clock_module_la_SOURCES = src/modules/clock/e_mod_main.h \ + src/modules/clock/e_mod_main.c \ + src/modules/clock/e_mod_config.c + +PHONIES += clock install-clock +clock: $(clockpkg_LTLIBRARIES) $(clock_DATA) +install-clock: install-clockDATA install-clockpkgLTLIBRARIES diff --git a/src/modules/Makefile_conf.am b/src/modules/Makefile_conf.am deleted file mode 100644 index e514802189..0000000000 --- a/src/modules/Makefile_conf.am +++ /dev/null @@ -1,17 +0,0 @@ -confdir = $(MDIR)/conf -conf_DATA = conf/e-module-conf.edj \ - conf/module.desktop - -EXTRA_DIST += $(conf_DATA) - -confpkgdir = $(MDIR)/conf/$(MODULE_ARCH) -confpkg_LTLIBRARIES = conf/module.la - -conf_module_la_SOURCES = conf/e_mod_main.c \ - conf/e_mod_main.h \ - conf/e_conf.c \ - conf/e_mod_config.c - -.PHONY: conf install-conf -conf: $(confpkg_LTLIBRARIES) $(conf_DATA) -install-conf: install-confDATA install-confpkgLTLIBRARIES diff --git a/src/modules/Makefile_conf.mk b/src/modules/Makefile_conf.mk new file mode 100644 index 0000000000..fb8528d111 --- /dev/null +++ b/src/modules/Makefile_conf.mk @@ -0,0 +1,20 @@ +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 + +src_modules_conf_module_la_LIBADD = $(MOD_LIBS) +src_modules_conf_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_conf_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_conf_module_la_SOURCES = src/modules/conf/e_mod_main.c \ + src/modules/conf/e_mod_main.h \ + src/modules/conf/e_conf.c \ + src/modules/conf/e_mod_config.c + +PHONIES += conf install-conf +conf: $(confpkg_LTLIBRARIES) $(conf_DATA) +install-conf: install-confDATA install-confpkgLTLIBRARIES diff --git a/src/modules/Makefile_conf2.mk b/src/modules/Makefile_conf2.mk new file mode 100644 index 0000000000..c520aa34f2 --- /dev/null +++ b/src/modules/Makefile_conf2.mk @@ -0,0 +1,32 @@ +conf2dir = $(MDIR)/conf2 +conf2_DATA = src/modules/conf2/e-module-conf2.edj \ + src/modules/conf2/module.desktop +CLEANFILES += src/modules/conf2/e-module-conf2.edj +EXTRA_DIST += $(conf2_DATA) \ +src/modules/conf2/e-module-conf2.edc \ +src/modules/conf2/module.desktop.in \ +src/modules/conf2/images/volume_knob_ledsoff.png \ +src/modules/conf2/images/volume_knob_move.png \ +src/modules/conf2/images/volume_knob.png \ +src/modules/conf2/images/volume_led_01.png + +conf2pkgdir = $(MDIR)/conf2/$(MODULE_ARCH) +conf2pkg_LTLIBRARIES = src/modules/conf2/module.la + +src_modules_conf2_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_conf2_module_la_SOURCES = src/modules/conf2/e_mod_main.c \ + src/modules/conf2/e_mod_main.h \ + src/modules/conf2/e_conf2.c + +src_modules_conf2_module_la_CPPFLAGS = $(MOD_CPPFLAGS) @ELM_CFLAGS@ +src_modules_conf2_module_la_LIBADD = $(MOD_LIBS) @ELM_LIBS@ + +CONF2_EDJE_FLAGS = $(EDJE_FLAGS) -id $(top_srcdir)/src/modules/conf2/images -id $(top_srcdir)/data/themes/img + +src/modules/conf2/%.edj: $(top_srcdir)/src/modules/conf2/%.edc Makefile + $(EDJE_CC) $(CONF2_EDJE_FLAGS) $< $@ + +PHONIES += conf2 install-conf2 +conf2: $(conf2pkg_LTLIBRARIES) $(conf2_DATA) +install-conf2: install-conf2DATA install-conf2pkgLTLIBRARIES + diff --git a/src/modules/Makefile_conf_applications.am b/src/modules/Makefile_conf_applications.am deleted file mode 100644 index 3c5f38093b..0000000000 --- a/src/modules/Makefile_conf_applications.am +++ /dev/null @@ -1,19 +0,0 @@ -conf_applicationsdir = $(MDIR)/conf_applications -conf_applications_DATA = conf_applications/e-module-conf_applications.edj \ - conf_applications/module.desktop - -EXTRA_DIST += $(conf_applications_DATA) - -conf_applicationspkgdir = $(MDIR)/conf_applications/$(MODULE_ARCH) -conf_applicationspkg_LTLIBRARIES = conf_applications/module.la - -conf_applications_module_la_SOURCES = conf_applications/e_mod_main.c \ - conf_applications/e_mod_main.h \ - conf_applications/e_int_config_apps.c \ - conf_applications/e_int_config_defapps.c \ - conf_applications/e_int_config_deskenv.c \ - conf_applications/e_int_config_apps_personal.c - -.PHONY: conf_applications install-conf_applications -conf_applications: $(conf_applicationspkg_LTLIBRARIES) $(conf_applications_DATA) -install-conf_applications: install-conf_applicationsDATA install-conf_applicationspkgLTLIBRARIES diff --git a/src/modules/Makefile_conf_applications.mk b/src/modules/Makefile_conf_applications.mk new file mode 100644 index 0000000000..525e547dcb --- /dev/null +++ b/src/modules/Makefile_conf_applications.mk @@ -0,0 +1,22 @@ +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 + +src_modules_conf_applications_module_la_LIBADD = $(MOD_LIBS) +src_modules_conf_applications_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_conf_applications_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_conf_applications_module_la_SOURCES = src/modules/conf_applications/e_mod_main.c \ + src/modules/conf_applications/e_mod_main.h \ + src/modules/conf_applications/e_int_config_apps.c \ + src/modules/conf_applications/e_int_config_defapps.c \ + src/modules/conf_applications/e_int_config_deskenv.c \ + src/modules/conf_applications/e_int_config_apps_personal.c + +PHONIES += conf_applications install-conf_applications +conf_applications: $(conf_applicationspkg_LTLIBRARIES) $(conf_applications_DATA) +install-conf_applications: install-conf_applicationsDATA install-conf_applicationspkgLTLIBRARIES diff --git a/src/modules/Makefile_conf_bindings.am b/src/modules/Makefile_conf_bindings.am deleted file mode 100644 index 78084e40a7..0000000000 --- a/src/modules/Makefile_conf_bindings.am +++ /dev/null @@ -1,19 +0,0 @@ -conf_bindingsdir = $(MDIR)/conf_bindings -conf_bindings_DATA = conf_bindings/module.desktop - -EXTRA_DIST += $(conf_bindings_DATA) - -conf_bindingspkgdir = $(MDIR)/conf_bindings/$(MODULE_ARCH) -conf_bindingspkg_LTLIBRARIES = conf_bindings/module.la - -conf_bindings_module_la_SOURCES = conf_bindings/e_mod_main.c \ - conf_bindings/e_mod_main.h \ - conf_bindings/e_int_config_keybindings.c \ - conf_bindings/e_int_config_mousebindings.c \ - conf_bindings/e_int_config_edgebindings.c \ - conf_bindings/e_int_config_signalbindings.c \ - conf_bindings/e_int_config_acpibindings.c - -.PHONY: conf_bindings install-conf_bindings -conf_bindings: $(conf_bindingspkg_LTLIBRARIES) $(conf_bindings_DATA) -install-conf_bindings: install-conf_bindingsDATA install-conf_bindingspkgLTLIBRARIES diff --git a/src/modules/Makefile_conf_bindings.mk b/src/modules/Makefile_conf_bindings.mk new file mode 100644 index 0000000000..b04a929d6b --- /dev/null +++ b/src/modules/Makefile_conf_bindings.mk @@ -0,0 +1,22 @@ +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 + +src_modules_conf_bindings_module_la_LIBADD = $(MOD_LIBS) +src_modules_conf_bindings_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_conf_bindings_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_conf_bindings_module_la_SOURCES = src/modules/conf_bindings/e_mod_main.c \ + src/modules/conf_bindings/e_mod_main.h \ + src/modules/conf_bindings/e_int_config_keybindings.c \ + src/modules/conf_bindings/e_int_config_mousebindings.c \ + src/modules/conf_bindings/e_int_config_edgebindings.c \ + src/modules/conf_bindings/e_int_config_signalbindings.c \ + src/modules/conf_bindings/e_int_config_acpibindings.c + +PHONIES += conf_bindings install-conf_bindings +conf_bindings: $(conf_bindingspkg_LTLIBRARIES) $(conf_bindings_DATA) +install-conf_bindings: install-conf_bindingsDATA install-conf_bindingspkgLTLIBRARIES diff --git a/src/modules/Makefile_conf_comp.am b/src/modules/Makefile_conf_comp.am deleted file mode 100644 index 9cd84b4389..0000000000 --- a/src/modules/Makefile_conf_comp.am +++ /dev/null @@ -1,16 +0,0 @@ -conf_compdir = $(MDIR)/conf_comp -conf_comp_DATA = conf_comp/module.desktop - -EXTRA_DIST += $(comp_DATA) - -conf_comppkgdir = $(MDIR)/conf_comp/$(MODULE_ARCH) -conf_comppkg_LTLIBRARIES = conf_comp/module.la - -conf_comp_module_la_SOURCES = conf_comp/e_mod_main.h \ - conf_comp/e_mod_main.c \ - conf_comp/e_mod_config.c \ - conf_comp/e_mod_config_match.c - -.PHONY: conf_comp install-conf_comp -conf_comp: $(conf_mppkg_LTLIBRARIES) $(conf_comp_DATA) -install-conf_comp: install-conf_compDATA install-conf_comppkgLTLIBRARIES diff --git a/src/modules/Makefile_conf_comp.mk b/src/modules/Makefile_conf_comp.mk new file mode 100644 index 0000000000..785b163a7b --- /dev/null +++ b/src/modules/Makefile_conf_comp.mk @@ -0,0 +1,19 @@ +conf_compdir = $(MDIR)/conf_comp +conf_comp_DATA = src/modules/conf_comp/module.desktop + +EXTRA_DIST += $(comp_DATA) + +conf_comppkgdir = $(MDIR)/conf_comp/$(MODULE_ARCH) +conf_comppkg_LTLIBRARIES = src/modules/conf_comp/module.la + +src_modules_conf_comp_module_la_LIBADD = $(MOD_LIBS) +src_modules_conf_comp_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_conf_comp_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_conf_comp_module_la_SOURCES = src/modules/conf_comp/e_mod_main.h \ + src/modules/conf_comp/e_mod_main.c \ + src/modules/conf_comp/e_mod_config.c \ + src/modules/conf_comp/e_mod_config_match.c + +PHONIES += conf_comp install-conf_comp +conf_comp: $(conf_mppkg_LTLIBRARIES) $(conf_comp_DATA) +install-conf_comp: install-conf_compDATA install-conf_comppkgLTLIBRARIES diff --git a/src/modules/Makefile_conf_dialogs.am b/src/modules/Makefile_conf_dialogs.am deleted file mode 100644 index 61f5e11ec2..0000000000 --- a/src/modules/Makefile_conf_dialogs.am +++ /dev/null @@ -1,17 +0,0 @@ -conf_dialogsdir = $(MDIR)/conf_dialogs -conf_dialogs_DATA = conf_dialogs/e-module-conf_dialogs.edj \ - conf_dialogs/module.desktop - -EXTRA_DIST += $(conf_dialogs_DATA) - -conf_dialogspkgdir = $(MDIR)/conf_dialogs/$(MODULE_ARCH) -conf_dialogspkg_LTLIBRARIES = conf_dialogs/module.la - -conf_dialogs_module_la_SOURCES = conf_dialogs/e_mod_main.c \ - conf_dialogs/e_mod_main.h \ - conf_dialogs/e_int_config_dialogs.c \ - conf_dialogs/e_int_config_profiles.c - -.PHONY: conf_dialogs install-conf_dialogs -conf_dialogs: $(conf_dialogspkg_LTLIBRARIES) $(conf_dialogs_DATA) -install-conf_dialogs: install-conf_dialogsDATA install-conf_dialogspkgLTLIBRARIES diff --git a/src/modules/Makefile_conf_dialogs.mk b/src/modules/Makefile_conf_dialogs.mk new file mode 100644 index 0000000000..7355d18119 --- /dev/null +++ b/src/modules/Makefile_conf_dialogs.mk @@ -0,0 +1,20 @@ +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 + +src_modules_conf_dialogs_module_la_LIBADD = $(MOD_LIBS) +src_modules_conf_dialogs_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_conf_dialogs_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_conf_dialogs_module_la_SOURCES = src/modules/conf_dialogs/e_mod_main.c \ + src/modules/conf_dialogs/e_mod_main.h \ + src/modules/conf_dialogs/e_int_config_dialogs.c \ + src/modules/conf_dialogs/e_int_config_profiles.c + +PHONIES += conf_dialogs install-conf_dialogs +conf_dialogs: $(conf_dialogspkg_LTLIBRARIES) $(conf_dialogs_DATA) +install-conf_dialogs: install-conf_dialogsDATA install-conf_dialogspkgLTLIBRARIES diff --git a/src/modules/Makefile_conf_display.am b/src/modules/Makefile_conf_display.am deleted file mode 100644 index 24db929b6e..0000000000 --- a/src/modules/Makefile_conf_display.am +++ /dev/null @@ -1,21 +0,0 @@ -conf_displaydir = $(MDIR)/conf_display -conf_display_DATA = conf_display/module.desktop - -EXTRA_DIST += $(conf_display_DATA) - -conf_displaypkgdir = $(MDIR)/conf_display/$(MODULE_ARCH) -conf_displaypkg_LTLIBRARIES = conf_display/module.la - -conf_display_module_la_SOURCES = conf_display/e_mod_main.c \ - conf_display/e_mod_main.h \ - conf_display/e_int_config_display.c \ - conf_display/e_int_config_screensaver.c \ - conf_display/e_int_config_dpms.c \ - conf_display/e_int_config_desklock.c \ - conf_display/e_int_config_desklock_fsel.c \ - conf_display/e_int_config_desks.c \ - conf_display/e_int_config_desk.c - -.PHONY: conf_display install-conf_display -conf_display: $(conf_displaypkg_LTLIBRARIES) $(conf_display_DATA) -install-conf_display: install-conf_displayDATA install-conf_displaypkgLTLIBRARIES diff --git a/src/modules/Makefile_conf_display.mk b/src/modules/Makefile_conf_display.mk new file mode 100644 index 0000000000..ff509273a2 --- /dev/null +++ b/src/modules/Makefile_conf_display.mk @@ -0,0 +1,24 @@ +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 + +src_modules_conf_display_module_la_LIBADD = $(MOD_LIBS) +src_modules_conf_display_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_conf_display_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_conf_display_module_la_SOURCES = src/modules/conf_display/e_mod_main.c \ + src/modules/conf_display/e_mod_main.h \ + src/modules/conf_display/e_int_config_display.c \ + src/modules/conf_display/e_int_config_screensaver.c \ + src/modules/conf_display/e_int_config_dpms.c \ + src/modules/conf_display/e_int_config_desklock.c \ + src/modules/conf_display/e_int_config_desklock_fsel.c \ + src/modules/conf_display/e_int_config_desks.c \ + src/modules/conf_display/e_int_config_desk.c + +PHONIES += conf_display install-conf_display +conf_display: $(conf_displaypkg_LTLIBRARIES) $(conf_display_DATA) +install-conf_display: install-conf_displayDATA install-conf_displaypkgLTLIBRARIES diff --git a/src/modules/Makefile_conf_interaction.am b/src/modules/Makefile_conf_interaction.am deleted file mode 100644 index 120a7205c2..0000000000 --- a/src/modules/Makefile_conf_interaction.am +++ /dev/null @@ -1,17 +0,0 @@ -conf_interactiondir = $(MDIR)/conf_interaction -conf_interaction_DATA = conf_interaction/e-module-conf_interaction.edj \ - conf_interaction/module.desktop - -EXTRA_DIST += $(conf_interaction_DATA) - -conf_interactionpkgdir = $(MDIR)/conf_interaction/$(MODULE_ARCH) -conf_interactionpkg_LTLIBRARIES = conf_interaction/module.la - -conf_interaction_module_la_SOURCES = conf_interaction/e_mod_main.c \ - conf_interaction/e_mod_main.h \ - conf_interaction/e_int_config_interaction.c \ - conf_interaction/e_int_config_mouse.c - -.PHONY: conf_interaction install-conf_interaction -conf_interaction: $(conf_interactionpkg_LTLIBRARIES) $(conf_interaction_DATA) -install-conf_interaction: install-conf_interactionDATA install-conf_interactionpkgLTLIBRARIES diff --git a/src/modules/Makefile_conf_interaction.mk b/src/modules/Makefile_conf_interaction.mk new file mode 100644 index 0000000000..a1c775ad75 --- /dev/null +++ b/src/modules/Makefile_conf_interaction.mk @@ -0,0 +1,20 @@ +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 + +src_modules_conf_interaction_module_la_LIBADD = $(MOD_LIBS) +src_modules_conf_interaction_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_conf_interaction_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_conf_interaction_module_la_SOURCES = src/modules/conf_interaction/e_mod_main.c \ + src/modules/conf_interaction/e_mod_main.h \ + src/modules/conf_interaction/e_int_config_interaction.c \ + src/modules/conf_interaction/e_int_config_mouse.c + +PHONIES += conf_interaction install-conf_interaction +conf_interaction: $(conf_interactionpkg_LTLIBRARIES) $(conf_interaction_DATA) +install-conf_interaction: install-conf_interactionDATA install-conf_interactionpkgLTLIBRARIES diff --git a/src/modules/Makefile_conf_intl.am b/src/modules/Makefile_conf_intl.am deleted file mode 100644 index d260a2b3b2..0000000000 --- a/src/modules/Makefile_conf_intl.am +++ /dev/null @@ -1,17 +0,0 @@ -conf_intldir = $(MDIR)/conf_intl -conf_intl_DATA = conf_intl/module.desktop - -EXTRA_DIST += $(conf_intl_DATA) - -conf_intlpkgdir = $(MDIR)/conf_intl/$(MODULE_ARCH) -conf_intlpkg_LTLIBRARIES = conf_intl/module.la - -conf_intl_module_la_SOURCES = conf_intl/e_mod_main.c \ - conf_intl/e_mod_main.h \ - conf_intl/e_int_config_intl.c \ - conf_intl/e_int_config_imc_import.c \ - conf_intl/e_int_config_imc.c - -.PHONY: conf_intl install-conf_intl -conf_intl: $(conf_intlpkg_LTLIBRARIES) $(conf_intl_DATA) -install-conf_intl: install-conf_intlDATA install-conf_intlpkgLTLIBRARIES diff --git a/src/modules/Makefile_conf_intl.mk b/src/modules/Makefile_conf_intl.mk new file mode 100644 index 0000000000..379d39d49c --- /dev/null +++ b/src/modules/Makefile_conf_intl.mk @@ -0,0 +1,20 @@ +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 + +src_modules_conf_intl_module_la_LIBADD = $(MOD_LIBS) +src_modules_conf_intl_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_conf_intl_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_conf_intl_module_la_SOURCES = src/modules/conf_intl/e_mod_main.c \ + src/modules/conf_intl/e_mod_main.h \ + src/modules/conf_intl/e_int_config_intl.c \ + src/modules/conf_intl/e_int_config_imc_import.c \ + src/modules/conf_intl/e_int_config_imc.c + +PHONIES += conf_intl install-conf_intl +conf_intl: $(conf_intlpkg_LTLIBRARIES) $(conf_intl_DATA) +install-conf_intl: install-conf_intlDATA install-conf_intlpkgLTLIBRARIES diff --git a/src/modules/Makefile_conf_menus.am b/src/modules/Makefile_conf_menus.am deleted file mode 100644 index 2f41c6a309..0000000000 --- a/src/modules/Makefile_conf_menus.am +++ /dev/null @@ -1,16 +0,0 @@ -conf_menusdir = $(MDIR)/conf_menus -conf_menus_DATA = conf_menus/e-module-conf_menus.edj \ - conf_menus/module.desktop - -EXTRA_DIST += $(conf_menus_DATA) - -conf_menuspkgdir = $(MDIR)/conf_menus/$(MODULE_ARCH) -conf_menuspkg_LTLIBRARIES = conf_menus/module.la - -conf_menus_module_la_SOURCES = conf_menus/e_mod_main.c \ - conf_menus/e_mod_main.h \ - conf_menus/e_int_config_menus.c - -.PHONY: conf_menus install-conf_menus -conf_menus: $(conf_menuspkg_LTLIBRARIES) $(conf_menus_DATA) -install-conf_menus: install-conf_menusDATA install-conf_menuspkgLTLIBRARIES diff --git a/src/modules/Makefile_conf_menus.mk b/src/modules/Makefile_conf_menus.mk new file mode 100644 index 0000000000..fb8eb577a8 --- /dev/null +++ b/src/modules/Makefile_conf_menus.mk @@ -0,0 +1,19 @@ +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 + +src_modules_conf_menus_module_la_LIBADD = $(MOD_LIBS) +src_modules_conf_menus_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_conf_menus_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_conf_menus_module_la_SOURCES = src/modules/conf_menus/e_mod_main.c \ + src/modules/conf_menus/e_mod_main.h \ + src/modules/conf_menus/e_int_config_menus.c + +PHONIES += conf_menus install-conf_menus +conf_menus: $(conf_menuspkg_LTLIBRARIES) $(conf_menus_DATA) +install-conf_menus: install-conf_menusDATA install-conf_menuspkgLTLIBRARIES diff --git a/src/modules/Makefile_conf_paths.am b/src/modules/Makefile_conf_paths.am deleted file mode 100644 index 47bd3ae61e..0000000000 --- a/src/modules/Makefile_conf_paths.am +++ /dev/null @@ -1,17 +0,0 @@ -conf_pathsdir = $(MDIR)/conf_paths -conf_paths_DATA = conf_paths/e-module-conf_paths.edj \ - conf_paths/module.desktop - -EXTRA_DIST += $(conf_paths_DATA) - -conf_pathspkgdir = $(MDIR)/conf_paths/$(MODULE_ARCH) -conf_pathspkg_LTLIBRARIES = conf_paths/module.la - -conf_paths_module_la_SOURCES = conf_paths/e_mod_main.c \ - conf_paths/e_mod_main.h \ - conf_paths/e_int_config_paths.c \ - conf_paths/e_int_config_env.c - -.PHONY: conf_paths install-conf_paths -conf_paths: $(conf_pathspkg_LTLIBRARIES) $(conf_paths_DATA) -install-conf_paths: install-conf_pathsDATA install-conf_pathspkgLTLIBRARIES diff --git a/src/modules/Makefile_conf_paths.mk b/src/modules/Makefile_conf_paths.mk new file mode 100644 index 0000000000..0b0a290a16 --- /dev/null +++ b/src/modules/Makefile_conf_paths.mk @@ -0,0 +1,20 @@ +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 + +src_modules_conf_paths_module_la_LIBADD = $(MOD_LIBS) +src_modules_conf_paths_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_conf_paths_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_conf_paths_module_la_SOURCES = src/modules/conf_paths/e_mod_main.c \ + src/modules/conf_paths/e_mod_main.h \ + src/modules/conf_paths/e_int_config_paths.c \ + src/modules/conf_paths/e_int_config_env.c + +PHONIES += conf_paths install-conf_paths +conf_paths: $(conf_pathspkg_LTLIBRARIES) $(conf_paths_DATA) +install-conf_paths: install-conf_pathsDATA install-conf_pathspkgLTLIBRARIES diff --git a/src/modules/Makefile_conf_performance.am b/src/modules/Makefile_conf_performance.am deleted file mode 100644 index e9e09c1fa2..0000000000 --- a/src/modules/Makefile_conf_performance.am +++ /dev/null @@ -1,18 +0,0 @@ -conf_performancedir = $(MDIR)/conf_performance -conf_performance_DATA = conf_performance/e-module-conf_performance.edj \ - conf_performance/module.desktop - -EXTRA_DIST += $(conf_performance_DATA) - -conf_performancepkgdir = $(MDIR)/conf_performance/$(MODULE_ARCH) -conf_performancepkg_LTLIBRARIES = conf_performance/module.la - -conf_performance_module_la_SOURCES = conf_performance/e_mod_main.c \ - conf_performance/e_mod_main.h \ - conf_performance/e_int_config_performance.c \ - conf_performance/e_int_config_engine.c \ - conf_performance/e_int_config_powermanagement.c - -.PHONY: conf_performance install-conf_performance -conf_performance: $(conf_performancepkg_LTLIBRARIES) $(conf_performance_DATA) -install-conf_performance: install-conf_performanceDATA install-conf_performancepkgLTLIBRARIES diff --git a/src/modules/Makefile_conf_performance.mk b/src/modules/Makefile_conf_performance.mk new file mode 100644 index 0000000000..a799dff781 --- /dev/null +++ b/src/modules/Makefile_conf_performance.mk @@ -0,0 +1,21 @@ +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 + +src_modules_conf_performance_module_la_LIBADD = $(MOD_LIBS) +src_modules_conf_performance_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_conf_performance_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_conf_performance_module_la_SOURCES = src/modules/conf_performance/e_mod_main.c \ + src/modules/conf_performance/e_mod_main.h \ + src/modules/conf_performance/e_int_config_performance.c \ + src/modules/conf_performance/e_int_config_engine.c \ + src/modules/conf_performance/e_int_config_powermanagement.c + +PHONIES += conf_performance install-conf_performance +conf_performance: $(conf_performancepkg_LTLIBRARIES) $(conf_performance_DATA) +install-conf_performance: install-conf_performanceDATA install-conf_performancepkgLTLIBRARIES diff --git a/src/modules/Makefile_conf_randr.am b/src/modules/Makefile_conf_randr.am deleted file mode 100644 index 48bae4fb13..0000000000 --- a/src/modules/Makefile_conf_randr.am +++ /dev/null @@ -1,21 +0,0 @@ -conf_randrdir = $(MDIR)/conf_randr -conf_randr_DATA = conf_randr/e-module-conf_randr.edj \ - conf_randr/module.desktop - -EXTRA_DIST += $(conf_randr_DATA) - -conf_randrpkgdir = $(MDIR)/conf_randr/$(MODULE_ARCH) -conf_randrpkg_LTLIBRARIES = conf_randr/module.la - -conf_randr_module_la_SOURCES = conf_randr/e_mod_main.c \ - conf_randr/e_mod_main.h \ - conf_randr/e_int_config_randr.c \ - conf_randr/e_int_config_randr.h \ - conf_randr/e_smart_randr.c \ - conf_randr/e_smart_randr.h \ - conf_randr/e_smart_monitor.c \ - conf_randr/e_smart_monitor.h - -.PHONY: conf_randr install-conf_randr -conf_randr: $(conf_randrpkg_LTLIBRARIES) $(conf_randr_DATA) -install-conf_randr: install-conf_randrDATA install-conf_randrpkgLTLIBRARIES diff --git a/src/modules/Makefile_conf_randr.mk b/src/modules/Makefile_conf_randr.mk new file mode 100644 index 0000000000..fbad3c7acf --- /dev/null +++ b/src/modules/Makefile_conf_randr.mk @@ -0,0 +1,24 @@ +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 + +src_modules_conf_randr_module_la_LIBADD = $(MOD_LIBS) +src_modules_conf_randr_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_conf_randr_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_conf_randr_module_la_SOURCES = src/modules/conf_randr/e_mod_main.c \ + src/modules/conf_randr/e_mod_main.h \ + src/modules/conf_randr/e_int_config_randr.c \ + src/modules/conf_randr/e_int_config_randr.h \ + src/modules/conf_randr/e_smart_randr.c \ + src/modules/conf_randr/e_smart_randr.h \ + src/modules/conf_randr/e_smart_monitor.c \ + src/modules/conf_randr/e_smart_monitor.h + +PHONIES += conf_randr install-conf_randr +conf_randr: $(conf_randrpkg_LTLIBRARIES) $(conf_randr_DATA) +install-conf_randr: install-conf_randrDATA install-conf_randrpkgLTLIBRARIES diff --git a/src/modules/Makefile_conf_shelves.am b/src/modules/Makefile_conf_shelves.am deleted file mode 100644 index 017db33970..0000000000 --- a/src/modules/Makefile_conf_shelves.am +++ /dev/null @@ -1,17 +0,0 @@ -conf_shelvesdir = $(MDIR)/conf_shelves -conf_shelves_DATA = conf_shelves/e-module-conf_shelves.edj \ - conf_shelves/module.desktop - -EXTRA_DIST += $(conf_shelves_DATA) - -conf_shelvespkgdir = $(MDIR)/conf_shelves/$(MODULE_ARCH) -conf_shelvespkg_LTLIBRARIES = conf_shelves/module.la - -conf_shelves_module_la_SOURCES = conf_shelves/e_mod_main.c \ - conf_shelves/e_mod_main.h \ - conf_shelves/e_int_config_shelf.c \ - conf_shelves/e_int_config_shelf.h - -.PHONY: conf_shelves install-conf_shelves -conf_shelves: $(conf_shelvespkg_LTLIBRARIES) $(conf_shelves_DATA) -install-conf_shelves: install-conf_shelvesDATA install-conf_shelvespkgLTLIBRARIES diff --git a/src/modules/Makefile_conf_shelves.mk b/src/modules/Makefile_conf_shelves.mk new file mode 100644 index 0000000000..1f5adfbad2 --- /dev/null +++ b/src/modules/Makefile_conf_shelves.mk @@ -0,0 +1,20 @@ +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 + +src_modules_conf_shelves_module_la_LIBADD = $(MOD_LIBS) +src_modules_conf_shelves_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_conf_shelves_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_conf_shelves_module_la_SOURCES = src/modules/conf_shelves/e_mod_main.c \ + src/modules/conf_shelves/e_mod_main.h \ + src/modules/conf_shelves/e_int_config_shelf.c \ + src/modules/conf_shelves/e_int_config_shelf.h + +PHONIES += conf_shelves install-conf_shelves +conf_shelves: $(conf_shelvespkg_LTLIBRARIES) $(conf_shelves_DATA) +install-conf_shelves: install-conf_shelvesDATA install-conf_shelvespkgLTLIBRARIES diff --git a/src/modules/Makefile_conf_theme.am b/src/modules/Makefile_conf_theme.am deleted file mode 100644 index 8b704fc5ad..0000000000 --- a/src/modules/Makefile_conf_theme.am +++ /dev/null @@ -1,23 +0,0 @@ -conf_themedir = $(MDIR)/conf_theme -conf_theme_DATA = conf_theme/module.desktop - -EXTRA_DIST += $(conf_theme_DATA) - -conf_themepkgdir = $(MDIR)/conf_theme/$(MODULE_ARCH) -conf_themepkg_LTLIBRARIES = conf_theme/module.la - -conf_theme_module_la_SOURCES = conf_theme/e_mod_main.c \ - conf_theme/e_mod_main.h \ - conf_theme/e_int_config_borders.c \ - conf_theme/e_int_config_color_classes.c \ - conf_theme/e_int_config_fonts.c \ - conf_theme/e_int_config_scale.c \ - conf_theme/e_int_config_theme.c \ - conf_theme/e_int_config_theme_import.c \ - conf_theme/e_int_config_transitions.c \ - conf_theme/e_int_config_wallpaper.c \ - conf_theme/e_int_config_xsettings.c - -.PHONY: conf_theme install-conf_theme -conf_theme: $(conf_themepkg_LTLIBRARIES) $(conf_theme_DATA) -install-conf_theme: install-conf_themeDATA install-conf_themepkgLTLIBRARIES diff --git a/src/modules/Makefile_conf_theme.mk b/src/modules/Makefile_conf_theme.mk new file mode 100644 index 0000000000..466593efc9 --- /dev/null +++ b/src/modules/Makefile_conf_theme.mk @@ -0,0 +1,26 @@ +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 + +src_modules_conf_theme_module_la_LIBADD = $(MOD_LIBS) +src_modules_conf_theme_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_conf_theme_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_conf_theme_module_la_SOURCES = src/modules/conf_theme/e_mod_main.c \ + src/modules/conf_theme/e_mod_main.h \ + src/modules/conf_theme/e_int_config_borders.c \ + src/modules/conf_theme/e_int_config_color_classes.c \ + src/modules/conf_theme/e_int_config_fonts.c \ + src/modules/conf_theme/e_int_config_scale.c \ + src/modules/conf_theme/e_int_config_theme.c \ + src/modules/conf_theme/e_int_config_theme_import.c \ + src/modules/conf_theme/e_int_config_transitions.c \ + src/modules/conf_theme/e_int_config_wallpaper.c \ + src/modules/conf_theme/e_int_config_xsettings.c + +PHONIES += conf_theme install-conf_theme +conf_theme: $(conf_themepkg_LTLIBRARIES) $(conf_theme_DATA) +install-conf_theme: install-conf_themeDATA install-conf_themepkgLTLIBRARIES diff --git a/src/modules/Makefile_conf_wallpaper2.am b/src/modules/Makefile_conf_wallpaper2.am deleted file mode 100644 index 03fc2fbf7d..0000000000 --- a/src/modules/Makefile_conf_wallpaper2.am +++ /dev/null @@ -1,15 +0,0 @@ -conf_wallpaper2dir = $(MDIR)/conf_wallpaper2 -conf_wallpaper2_DATA = conf_wallpaper2/module.desktop - -EXTRA_DIST += $(conf_wallpaper2_DATA) - -conf_wallpaper2pkgdir = $(MDIR)/conf_wallpaper2/$(MODULE_ARCH) -conf_wallpaper2pkg_LTLIBRARIES = conf_wallpaper2/module.la - -conf_wallpaper2_module_la_SOURCES = conf_wallpaper2/e_mod_main.c \ - conf_wallpaper2/e_mod_main.h \ - conf_wallpaper2/e_int_config_wallpaper.c - -.PHONY: conf_wallpaper2 install-conf_wallpaper2 -conf_wallpaper2: $(conf_wallpaper2pkg_LTLIBRARIES) $(conf_wallpaper2_DATA) -install-conf_wallpaper2: install-conf_wallpaper2DATA install-conf_wallpaper2pkgLTLIBRARIES diff --git a/src/modules/Makefile_conf_wallpaper2.mk b/src/modules/Makefile_conf_wallpaper2.mk new file mode 100644 index 0000000000..437960b843 --- /dev/null +++ b/src/modules/Makefile_conf_wallpaper2.mk @@ -0,0 +1,18 @@ +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 + +src_modules_conf_wallpaper2_module_la_LIBADD = $(MOD_LIBS) +src_modules_conf_wallpaper2_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_conf_wallpaper2_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_conf_wallpaper2_module_la_SOURCES = src/modules/conf_wallpaper2/e_mod_main.c \ + src/modules/conf_wallpaper2/e_mod_main.h \ + src/modules/conf_wallpaper2/e_int_config_wallpaper.c + +PHONIES += conf_wallpaper2 install-conf_wallpaper2 +conf_wallpaper2: $(conf_wallpaper2pkg_LTLIBRARIES) $(conf_wallpaper2_DATA) +install-conf_wallpaper2: install-conf_wallpaper2DATA install-conf_wallpaper2pkgLTLIBRARIES diff --git a/src/modules/Makefile_conf_window_manipulation.am b/src/modules/Makefile_conf_window_manipulation.am deleted file mode 100644 index 4af0864c09..0000000000 --- a/src/modules/Makefile_conf_window_manipulation.am +++ /dev/null @@ -1,19 +0,0 @@ -conf_window_manipulationdir = $(MDIR)/conf_window_manipulation -conf_window_manipulation_DATA = conf_window_manipulation/module.desktop - -EXTRA_DIST += $(conf_window_manipulation_DATA) - -conf_window_manipulationpkgdir = $(MDIR)/conf_window_manipulation/$(MODULE_ARCH) -conf_window_manipulationpkg_LTLIBRARIES = conf_window_manipulation/module.la - -conf_window_manipulation_module_la_SOURCES = conf_window_manipulation/e_mod_main.c \ - conf_window_manipulation/e_mod_main.h \ - conf_window_manipulation/e_int_config_window_geometry.c \ - conf_window_manipulation/e_int_config_window_process.c \ - conf_window_manipulation/e_int_config_window_display.c \ - conf_window_manipulation/e_int_config_focus.c \ - conf_window_manipulation/e_int_config_clientlist.c - -.PHONY: 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 diff --git a/src/modules/Makefile_conf_window_manipulation.mk b/src/modules/Makefile_conf_window_manipulation.mk new file mode 100644 index 0000000000..42545ffc4d --- /dev/null +++ b/src/modules/Makefile_conf_window_manipulation.mk @@ -0,0 +1,22 @@ +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 + +src_modules_conf_window_manipulation_module_la_LIBADD = $(MOD_LIBS) +src_modules_conf_window_manipulation_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_conf_window_manipulation_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_conf_window_manipulation_module_la_SOURCES = src/modules/conf_window_manipulation/e_mod_main.c \ + src/modules/conf_window_manipulation/e_mod_main.h \ + src/modules/conf_window_manipulation/e_int_config_window_geometry.c \ + src/modules/conf_window_manipulation/e_int_config_window_process.c \ + src/modules/conf_window_manipulation/e_int_config_window_display.c \ + src/modules/conf_window_manipulation/e_int_config_focus.c \ + src/modules/conf_window_manipulation/e_int_config_clientlist.c + +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 diff --git a/src/modules/Makefile_conf_window_remembers.am b/src/modules/Makefile_conf_window_remembers.am deleted file mode 100644 index a6ce6775b7..0000000000 --- a/src/modules/Makefile_conf_window_remembers.am +++ /dev/null @@ -1,17 +0,0 @@ -conf_window_remembersdir = $(MDIR)/conf_window_remembers -conf_window_remembers_DATA = \ -conf_window_remembers/e-module-conf_window_remembers.edj \ -conf_window_remembers/module.desktop - -EXTRA_DIST += $(conf_window_remembers_DATA) - -conf_window_rememberspkgdir = $(MDIR)/conf_window_remembers/$(MODULE_ARCH) -conf_window_rememberspkg_LTLIBRARIES = conf_window_remembers/module.la - -conf_window_remembers_module_la_SOURCES = conf_window_remembers/e_mod_main.c \ - conf_window_remembers/e_mod_main.h \ - conf_window_remembers/e_int_config_remembers.c - -.PHONY: 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 diff --git a/src/modules/Makefile_conf_window_remembers.mk b/src/modules/Makefile_conf_window_remembers.mk new file mode 100644 index 0000000000..3a4f90fc73 --- /dev/null +++ b/src/modules/Makefile_conf_window_remembers.mk @@ -0,0 +1,20 @@ +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 + +src_modules_conf_window_remembers_module_la_LIBADD = $(MOD_LIBS) +src_modules_conf_window_remembers_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_conf_window_remembers_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_conf_window_remembers_module_la_SOURCES = \ +src/modules/conf_window_remembers/e_mod_main.c \ +src/modules/conf_window_remembers/e_mod_main.h \ +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 diff --git a/src/modules/Makefile_connman.am b/src/modules/Makefile_connman.am deleted file mode 100644 index 8ea73265d3..0000000000 --- a/src/modules/Makefile_connman.am +++ /dev/null @@ -1,22 +0,0 @@ -connmandir = $(MDIR)/connman -connman_DATA = connman/e-module-connman.edj \ - connman/module.desktop - -EXTRA_DIST += $(connman_DATA) - -connmanpkgdir = $(MDIR)/connman/$(MODULE_ARCH) -connmanpkg_LTLIBRARIES = connman/module.la - -connman_module_la_SOURCES = connman/e_mod_main.h \ - connman/e_mod_main.c \ - connman/e_mod_config.c \ - connman/e_connman.c \ - connman/agent.c \ - connman/E_Connman.h - -connman_module_la_CFLAGS = $(AM_CFLAGS) -Wno-unused-parameter -connman_module_la_LIBADD = @ECONNMAN_LIBS@ - -.PHONY: connman install-connman -connman: $(connmanpkg_LTLIBRARIES) $(connman_DATA) -install-connman: install-connmanDATA install-connmanpkgLTLIBRARIES diff --git a/src/modules/Makefile_connman.mk b/src/modules/Makefile_connman.mk new file mode 100644 index 0000000000..fdc47709ee --- /dev/null +++ b/src/modules/Makefile_connman.mk @@ -0,0 +1,23 @@ +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 + +src_modules_connman_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_connman_module_la_SOURCES = src/modules/connman/e_mod_main.h \ + src/modules/connman/e_mod_main.c \ + src/modules/connman/e_mod_config.c \ + src/modules/connman/e_connman.c \ + src/modules/connman/agent.c \ + src/modules/connman/E_Connman.h + +src_modules_connman_module_la_CPPFLAGS = $(MOD_CPPFLAGS) -Wno-unused-parameter +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 diff --git a/src/modules/Makefile_contact.am b/src/modules/Makefile_contact.am deleted file mode 100644 index 8b8300fc01..0000000000 --- a/src/modules/Makefile_contact.am +++ /dev/null @@ -1,21 +0,0 @@ -contactdir = $(MDIR)/contact -contact_DATA = contact/e-module-contact.edj \ - contact/module.desktop - -EXTRA_DIST += contact/e-module-contact.edj \ - contact/module.desktop.in - -contactpkgdir = $(MDIR)/contact/$(MODULE_ARCH) -contactpkg_LTLIBRARIES = contact/module.la - -contact_module_la_SOURCES = contact/e_mod_main.c \ - contact/e_mod_main.h \ - contact/e_policy.c \ - contact/e_policy.h \ - contact/e_edges.c \ - contact/e_edges.h - -# TODO: incomplete -.PHONY: contact install-contact -contact: $(contactpkg_LTLIBRARIES) $(contact_DATA) -install-contact: install-contactDATA install-contactpkgLTLIBRARIES diff --git a/src/modules/Makefile_contact.mk b/src/modules/Makefile_contact.mk new file mode 100644 index 0000000000..00eff050bd --- /dev/null +++ b/src/modules/Makefile_contact.mk @@ -0,0 +1,24 @@ +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 + +src_modules_contact_module_la_LIBADD = $(MOD_LIBS) +src_modules_contact_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_contact_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_contact_module_la_SOURCES = src/modules/contact/e_mod_main.c \ + src/modules/contact/e_mod_main.h \ + src/modules/contact/e_policy.c \ + src/modules/contact/e_policy.h \ + src/modules/contact/e_edges.c \ + src/modules/contact/e_edges.h + +# TODO: incomplete +PHONIES += contact install-contact +contact: $(contactpkg_LTLIBRARIES) $(contact_DATA) +install-contact: install-contactDATA install-contactpkgLTLIBRARIES diff --git a/src/modules/Makefile_cpufreq.am b/src/modules/Makefile_cpufreq.am deleted file mode 100644 index bee9e152cb..0000000000 --- a/src/modules/Makefile_cpufreq.am +++ /dev/null @@ -1,32 +0,0 @@ -cpufreqdir = $(MDIR)/cpufreq -cpufreq_DATA = cpufreq/e-module-cpufreq.edj \ - cpufreq/module.desktop - -EXTRA_DIST += $(cpufreq_DATA) - -cpufreqpkgdir = $(MDIR)/cpufreq/$(MODULE_ARCH) -cpufreqpkg_LTLIBRARIES = cpufreq/module.la - -cpufreq_module_la_SOURCES = cpufreq/e_mod_main.h \ - cpufreq/e_mod_main.c \ - cpufreq/e_mod_config.c - -freqsetdir = $(cpufreqpkgdir) -freqset_PROGRAMS = cpufreq/freqset - -cpufreq_freqset_SOURCES = cpufreq/freqset.c -cpufreq_freqset_CFLAGS = @e_cflags@ @SUID_CFLAGS@ -cpufreq_freqset_LDFLAGS = @SUID_LDFLAGS@ - -cpufreq_setuid_root_mode = a=rx,u+xs -cpufreq_setuid_root_user = root - -cpufreq-install-data-hook: - @chown $(cpufreq_setuid_root_user) $(DESTDIR)$(freqsetdir)/freqset$(EXEEXT) || true - @chmod $(cpufreq_setuid_root_mode) $(DESTDIR)$(freqsetdir)/freqset$(EXEEXT) || true - -INSTALL_DATA_HOOKS += cpufreq-install-data-hook - -.PHONY: cpufreq install-cpufreq -cpufreq: $(cpufreqpkg_LTLIBRARIES) $(cpufreq_DATA) $(freqset_PROGRAMS) -install-cpufreq: install-cpufreqDATA install-cpufreqpkgLTLIBRARIES install-freqsetPROGRAMS diff --git a/src/modules/Makefile_cpufreq.mk b/src/modules/Makefile_cpufreq.mk new file mode 100644 index 0000000000..f4cd588bcb --- /dev/null +++ b/src/modules/Makefile_cpufreq.mk @@ -0,0 +1,35 @@ +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 + +src_modules_cpufreq_module_la_LIBADD = $(MOD_LIBS) +src_modules_cpufreq_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_cpufreq_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_cpufreq_module_la_SOURCES = src/modules/cpufreq/e_mod_main.h \ + src/modules/cpufreq/e_mod_main.c \ + src/modules/cpufreq/e_mod_config.c + +src_modules_cpufreq_freqsetdir = $(cpufreqpkgdir) +src_modules_cpufreq_freqset_PROGRAMS = src/modules/cpufreq/freqset + +src_modules_cpufreq_freqset_SOURCES = src/modules/cpufreq/freqset.c +src_modules_cpufreq_freqset_CPPFLAGS = $(MOD_CPPFLAGS) @e_cflags@ @SUID_CFLAGS@ +src_modules_cpufreq_freqset_LDFLAGS = @SUID_LDFLAGS@ + +cpufreq_setuid_root_mode = a=rx,u+xs +cpufreq_setuid_root_user = root + +cpufreq-install-data-hook: + @chown $(cpufreq_setuid_root_user) $(DESTDIR)$(src_modules_cpufreq_freqsetdir)/freqset$(EXEEXT) || true + @chmod $(cpufreq_setuid_root_mode) $(DESTDIR)$(src_modules_cpufreq_freqsetdir)/freqset$(EXEEXT) || true + +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 diff --git a/src/modules/Makefile_everything.am b/src/modules/Makefile_everything.am deleted file mode 100644 index c608ea9f61..0000000000 --- a/src/modules/Makefile_everything.am +++ /dev/null @@ -1,49 +0,0 @@ -everythingdir = $(MDIR)/everything -everything_DATA = everything/e-module-everything.edj \ - everything/e-module-everything-start.edj \ - everything/module.desktop - -EXTRA_DIST += $(everything_DATA) - -everythingpkgdir = $(MDIR)/everything/$(MODULE_ARCH) -everythingpkg_LTLIBRARIES = everything/module.la - -EVRYHEADERS = everything/evry_api.h \ - everything/evry_types.h - -everything_module_la_SOURCES = $(EVRYHEADERS) \ - everything/e_mod_main.c \ - everything/e_mod_main.h \ - everything/evry.c \ - everything/evry_config.c \ - everything/evry_util.c \ - everything/evry_history.c \ - everything/evry_plugin.c \ - everything/evry_plug_aggregator.c \ - everything/evry_plug_actions.c \ - everything/evry_view.c \ - everything/evry_view_tabs.c \ - everything/evry_view_help.c \ - everything/evry_plug_clipboard.c \ - everything/evry_plug_text.c \ - everything/evry_plug_collection.c \ - everything/evry_gadget.c \ - everything/md5.c \ - everything/md5.h \ - everything/evry_plug_apps.c \ - everything/evry_plug_files.c \ - everything/evry_plug_windows.c \ - everything/evry_plug_settings.c \ - everything/evry_plug_calc.c - -everything_headersdir = $(pkgincludedir) -dist_everything_headers_DATA = $(EVRYHEADERS) - -everything_pkgconfigdir = $(libdir)/pkgconfig -everything_pkgconfig_DATA = everything/everything.pc -EXTRA_DIST += everything/everything.pc.in -DISTCLEANFILES = everything/everything.pc - -.PHONY: everything install-everything -everything: $(everythingpkg_LTLIBRARIES) $(everything_DATA) -install-everything: install-everythingDATA install-everythingpkgLTLIBRARIES install-everything_pkgconfig_DATA diff --git a/src/modules/Makefile_everything.mk b/src/modules/Makefile_everything.mk new file mode 100644 index 0000000000..3ead867dc1 --- /dev/null +++ b/src/modules/Makefile_everything.mk @@ -0,0 +1,52 @@ +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 + +EVRYHEADERS = src/modules/everything/evry_api.h \ + src/modules/everything/evry_types.h + +src_modules_everything_module_la_LIBADD = $(MOD_LIBS) +src_modules_everything_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_everything_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_everything_module_la_SOURCES = $(EVRYHEADERS) \ + src/modules/everything/e_mod_main.c \ + src/modules/everything/e_mod_main.h \ + src/modules/everything/evry.c \ + src/modules/everything/evry_config.c \ + src/modules/everything/evry_util.c \ + src/modules/everything/evry_history.c \ + src/modules/everything/evry_plugin.c \ + src/modules/everything/evry_plug_aggregator.c \ + src/modules/everything/evry_plug_actions.c \ + src/modules/everything/evry_view.c \ + src/modules/everything/evry_view_tabs.c \ + src/modules/everything/evry_view_help.c \ + src/modules/everything/evry_plug_clipboard.c \ + src/modules/everything/evry_plug_text.c \ + src/modules/everything/evry_plug_collection.c \ + src/modules/everything/evry_gadget.c \ + src/modules/everything/md5.c \ + src/modules/everything/md5.h \ + src/modules/everything/evry_plug_apps.c \ + src/modules/everything/evry_plug_files.c \ + src/modules/everything/evry_plug_windows.c \ + src/modules/everything/evry_plug_settings.c \ + src/modules/everything/evry_plug_calc.c + +everything_headersdir = $(pkgincludedir) +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 diff --git a/src/modules/Makefile_fileman.am b/src/modules/Makefile_fileman.am deleted file mode 100644 index 445acaf3e7..0000000000 --- a/src/modules/Makefile_fileman.am +++ /dev/null @@ -1,22 +0,0 @@ -filemandir = $(MDIR)/fileman -fileman_DATA = fileman/e-module-fileman.edj \ - fileman/module.desktop - -EXTRA_DIST += $(fileman_DATA) - -filemanpkgdir = $(MDIR)/fileman/$(MODULE_ARCH) -filemanpkg_LTLIBRARIES = fileman/module.la - -fileman_module_la_SOURCES = fileman/e_mod_main.c \ - fileman/e_mod_main.h \ - fileman/e_fwin.c \ - fileman/e_fwin_nav.c \ - fileman/e_mod_config.c \ - fileman/e_int_config_mime.c \ - fileman/e_int_config_mime_edit.c \ - fileman/e_mod_dbus.c \ - fileman/e_mod_menu.c - -.PHONY: fileman install-fileman -fileman: $(filemanpkg_LTLIBRARIES) $(fileman_DATA) -install-fileman: install-filemanDATA install-filemanpkgLTLIBRARIES diff --git a/src/modules/Makefile_fileman.mk b/src/modules/Makefile_fileman.mk new file mode 100644 index 0000000000..405dd60a56 --- /dev/null +++ b/src/modules/Makefile_fileman.mk @@ -0,0 +1,25 @@ +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 + +src_modules_fileman_module_la_LIBADD = $(MOD_LIBS) +src_modules_fileman_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_fileman_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_fileman_module_la_SOURCES = src/modules/fileman/e_mod_main.c \ + src/modules/fileman/e_mod_main.h \ + src/modules/fileman/e_fwin.c \ + src/modules/fileman/e_fwin_nav.c \ + src/modules/fileman/e_mod_config.c \ + src/modules/fileman/e_int_config_mime.c \ + src/modules/fileman/e_int_config_mime_edit.c \ + src/modules/fileman/e_mod_dbus.c \ + src/modules/fileman/e_mod_menu.c + +PHONIES += fileman install-fileman +fileman: $(filemanpkg_LTLIBRARIES) $(fileman_DATA) +install-fileman: install-filemanDATA install-filemanpkgLTLIBRARIES diff --git a/src/modules/Makefile_fileman_opinfo.am b/src/modules/Makefile_fileman_opinfo.am deleted file mode 100644 index edc3335282..0000000000 --- a/src/modules/Makefile_fileman_opinfo.am +++ /dev/null @@ -1,14 +0,0 @@ -fileman_opinfodir = $(MDIR)/fileman_opinfo -fileman_opinfo_DATA = fileman_opinfo/e-module-fileman_opinfo.edj \ - fileman_opinfo/module.desktop - -EXTRA_DIST += $(fileman_opinfo_DATA) - -fileman_opinfopkgdir = $(MDIR)/fileman_opinfo/$(MODULE_ARCH) -fileman_opinfopkg_LTLIBRARIES = fileman_opinfo/module.la - -fileman_opinfo_module_la_SOURCES = fileman_opinfo/e_mod_main.c - -.PHONY: fileman_opinfo install-fileman_opinfo -fileman_opinfo: $(fileman_opinfopkg_LTLIBRARIES) $(fileman_opinfo_DATA) -install-fileman_opinfo: install-fileman_opinfoDATA install-fileman_opinfopkgLTLIBRARIES diff --git a/src/modules/Makefile_fileman_opinfo.mk b/src/modules/Makefile_fileman_opinfo.mk new file mode 100644 index 0000000000..de9e1ace14 --- /dev/null +++ b/src/modules/Makefile_fileman_opinfo.mk @@ -0,0 +1,17 @@ +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 + +src_modules_fileman_opinfo_module_la_LIBADD = $(MOD_LIBS) +src_modules_fileman_opinfo_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_fileman_opinfo_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_fileman_opinfo_module_la_SOURCES = src/modules/fileman_opinfo/e_mod_main.c + +PHONIES += fileman_opinfo install-fileman_opinfo +fileman_opinfo: $(fileman_opinfopkg_LTLIBRARIES) $(fileman_opinfo_DATA) +install-fileman_opinfo: install-fileman_opinfoDATA install-fileman_opinfopkgLTLIBRARIES diff --git a/src/modules/Makefile_gadman.am b/src/modules/Makefile_gadman.am deleted file mode 100644 index ecbea4eaab..0000000000 --- a/src/modules/Makefile_gadman.am +++ /dev/null @@ -1,17 +0,0 @@ -gadmandir = $(MDIR)/gadman -gadman_DATA = gadman/e-module-gadman.edj \ - gadman/module.desktop - -EXTRA_DIST += $(gadman_DATA) - -gadmanpkgdir = $(MDIR)/gadman/$(MODULE_ARCH) -gadmanpkg_LTLIBRARIES = gadman/module.la - -gadman_module_la_SOURCES = gadman/e_mod_main.c \ - gadman/e_mod_config.c \ - gadman/e_mod_gadman.c \ - gadman/e_mod_gadman.h - -.PHONY: gadman install-gadman -gadman: $(gadmanpkg_LTLIBRARIES) $(gadman_DATA) -install-gadman: install-gadmanDATA install-gadmanpkgLTLIBRARIES diff --git a/src/modules/Makefile_gadman.mk b/src/modules/Makefile_gadman.mk new file mode 100644 index 0000000000..1cae48382b --- /dev/null +++ b/src/modules/Makefile_gadman.mk @@ -0,0 +1,20 @@ +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 + +src_modules_gadman_module_la_LIBADD = $(MOD_LIBS) +src_modules_gadman_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_gadman_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_gadman_module_la_SOURCES = src/modules/gadman/e_mod_main.c \ + src/modules/gadman/e_mod_config.c \ + src/modules/gadman/e_mod_gadman.c \ + src/modules/gadman/e_mod_gadman.h + +PHONIES += gadman install-gadman +gadman: $(gadmanpkg_LTLIBRARIES) $(gadman_DATA) +install-gadman: install-gadmanDATA install-gadmanpkgLTLIBRARIES diff --git a/src/modules/Makefile_ibar.am b/src/modules/Makefile_ibar.am deleted file mode 100644 index c6ff5b4a87..0000000000 --- a/src/modules/Makefile_ibar.am +++ /dev/null @@ -1,16 +0,0 @@ -ibardir = $(MDIR)/ibar -ibar_DATA = ibar/e-module-ibar.edj \ - ibar/module.desktop - -EXTRA_DIST += $(ibar_DATA) - -ibarpkgdir = $(MDIR)/ibar/$(MODULE_ARCH) -ibarpkg_LTLIBRARIES = ibar/module.la - -ibar_module_la_SOURCES = ibar/e_mod_main.c \ - ibar/e_mod_main.h \ - ibar/e_mod_config.c - -.PHONY: ibar install-ibar -ibar: $(ibarpkg_LTLIBRARIES) $(ibar_DATA) -install-ibar: install-ibarDATA install-ibarpkgLTLIBRARIES diff --git a/src/modules/Makefile_ibar.mk b/src/modules/Makefile_ibar.mk new file mode 100644 index 0000000000..c7f54e80a8 --- /dev/null +++ b/src/modules/Makefile_ibar.mk @@ -0,0 +1,19 @@ +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 + +src_modules_ibar_module_la_LIBADD = $(MOD_LIBS) +src_modules_ibar_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_ibar_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_ibar_module_la_SOURCES = src/modules/ibar/e_mod_main.c \ + src/modules/ibar/e_mod_main.h \ + src/modules/ibar/e_mod_config.c + +PHONIES += ibar install-ibar +ibar: $(ibarpkg_LTLIBRARIES) $(ibar_DATA) +install-ibar: install-ibarDATA install-ibarpkgLTLIBRARIES diff --git a/src/modules/Makefile_ibox.am b/src/modules/Makefile_ibox.am deleted file mode 100644 index 0d11d7deb6..0000000000 --- a/src/modules/Makefile_ibox.am +++ /dev/null @@ -1,16 +0,0 @@ -iboxdir = $(MDIR)/ibox -ibox_DATA = ibox/e-module-ibox.edj \ - ibox/module.desktop - -EXTRA_DIST += $(ibox_DATA) - -iboxpkgdir = $(MDIR)/ibox/$(MODULE_ARCH) -iboxpkg_LTLIBRARIES = ibox/module.la - -ibox_module_la_SOURCES = ibox/e_mod_main.c \ - ibox/e_mod_main.h \ - ibox/e_mod_config.c - -.PHONY: ibox install-ibox -ibox: $(iboxpkg_LTLIBRARIES) $(ibox_DATA) -install-ibox: install-iboxDATA install-iboxpkgLTLIBRARIES diff --git a/src/modules/Makefile_ibox.mk b/src/modules/Makefile_ibox.mk new file mode 100644 index 0000000000..13a05c9045 --- /dev/null +++ b/src/modules/Makefile_ibox.mk @@ -0,0 +1,19 @@ +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 + +src_modules_ibox_module_la_LIBADD = $(MOD_LIBS) +src_modules_ibox_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_ibox_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_ibox_module_la_SOURCES = src/modules/ibox/e_mod_main.c \ + src/modules/ibox/e_mod_main.h \ + src/modules/ibox/e_mod_config.c + +PHONIES += ibox install-ibox +ibox: $(iboxpkg_LTLIBRARIES) $(ibox_DATA) +install-ibox: install-iboxDATA install-iboxpkgLTLIBRARIES diff --git a/src/modules/Makefile_illume-bluetooth.am b/src/modules/Makefile_illume-bluetooth.am deleted file mode 100644 index e825891579..0000000000 --- a/src/modules/Makefile_illume-bluetooth.am +++ /dev/null @@ -1,14 +0,0 @@ -illume_bluetoothdir = $(MDIR)/illume-bluetooth -illume_bluetooth_DATA = illume-bluetooth/e-module-illume-bluetooth.edj \ - illume-bluetooth/module.desktop - -EXTRA_DIST += $(illume_bluetooth_DATA) - -illume_bluetoothpkgdir = $(MDIR)/illume-bluetooth/$(MODULE_ARCH) -illume_bluetoothpkg_LTLIBRARIES = illume-bluetooth/module.la - -illume_bluetooth_module_la_SOURCES = illume-bluetooth/e_mod_main.c - -.PHONY: illume_bluetooth install-illume_bluetooth -illume_bluetooth: $(illume_bluetoothpkg_LTLIBRARIES) $(illume_bluetooth_DATA) -install-illume_bluetooth: install-illume_bluetoothDATA install-illume_bluetoothpkgLTLIBRARIES diff --git a/src/modules/Makefile_illume-bluetooth.mk b/src/modules/Makefile_illume-bluetooth.mk new file mode 100644 index 0000000000..293fd34f53 --- /dev/null +++ b/src/modules/Makefile_illume-bluetooth.mk @@ -0,0 +1,17 @@ +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 + +src_modules_illume_bluetooth_module_la_LIBADD = $(MOD_LIBS) +src_modules_illume_bluetooth_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_illume_bluetooth_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_illume_bluetooth_module_la_SOURCES = src/modules/illume-bluetooth/e_mod_main.c + +PHONIES += illume_bluetooth install-illume_bluetooth +illume_bluetooth: $(illume_bluetoothpkg_LTLIBRARIES) $(illume_bluetooth_DATA) +install-illume_bluetooth: install-illume_bluetoothDATA install-illume_bluetoothpkgLTLIBRARIES diff --git a/src/modules/Makefile_illume-home-toggle.am b/src/modules/Makefile_illume-home-toggle.am deleted file mode 100644 index f214a2f12b..0000000000 --- a/src/modules/Makefile_illume-home-toggle.am +++ /dev/null @@ -1,14 +0,0 @@ -illume_home_toggledir = $(MDIR)/illume-home-toggle -illume_home_toggle_DATA = illume-home-toggle/e-module-illume-home-toggle.edj \ - illume-home-toggle/module.desktop - -EXTRA_DIST += $(illume_home_toggle_DATA) - -illume_home_togglepkgdir = $(MDIR)/illume-home-toggle/$(MODULE_ARCH) -illume_home_togglepkg_LTLIBRARIES = illume-home-toggle/module.la - -illume_home_toggle_module_la_SOURCES = illume-home-toggle/e_mod_main.c - -.PHONY: 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 diff --git a/src/modules/Makefile_illume-home-toggle.mk b/src/modules/Makefile_illume-home-toggle.mk new file mode 100644 index 0000000000..49d2e7ca97 --- /dev/null +++ b/src/modules/Makefile_illume-home-toggle.mk @@ -0,0 +1,17 @@ +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 + +src_modules_illume_home_toggle_module_la_LIBADD = $(MOD_LIBS) +src_modules_illume_home_toggle_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_illume_home_toggle_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_illume_home_toggle_module_la_SOURCES = src/modules/illume-home-toggle/e_mod_main.c + +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 diff --git a/src/modules/Makefile_illume-home.am b/src/modules/Makefile_illume-home.am deleted file mode 100644 index db21280076..0000000000 --- a/src/modules/Makefile_illume-home.am +++ /dev/null @@ -1,19 +0,0 @@ -illume_homedir = $(MDIR)/illume-home -illume_home_DATA = illume-home/e-module-illume-home.edj \ - illume-home/module.desktop - -EXTRA_DIST += $(illume_home_DATA) - -illume_homepkgdir = $(MDIR)/illume-home/$(MODULE_ARCH) -illume_homepkg_LTLIBRARIES = illume-home/module.la - -illume_home_module_la_SOURCES = illume-home/e_mod_main.c \ - illume-home/e_mod_main.h \ - illume-home/e_mod_config.c \ - illume-home/e_mod_config.h \ - illume-home/e_busycover.c \ - illume-home/e_busycover.h - -.PHONY: illume_home install-illume_home -illume_home: $(illume_homepkg_LTLIBRARIES) $(illume_home_DATA) -install-illume_home: install-illume_homeDATA install-illume_homepkgLTLIBRARIES diff --git a/src/modules/Makefile_illume-home.mk b/src/modules/Makefile_illume-home.mk new file mode 100644 index 0000000000..d2ad0848b0 --- /dev/null +++ b/src/modules/Makefile_illume-home.mk @@ -0,0 +1,22 @@ +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 + +src_modules_illume_home_module_la_LIBADD = $(MOD_LIBS) +src_modules_illume_home_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_illume_home_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_illume_home_module_la_SOURCES = src/modules/illume-home/e_mod_main.c \ +src/modules/illume-home/e_mod_main.h \ +src/modules/illume-home/e_mod_config.c \ +src/modules/illume-home/e_mod_config.h \ +src/modules/illume-home/e_busycover.c \ +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 diff --git a/src/modules/Makefile_illume-indicator.am b/src/modules/Makefile_illume-indicator.am deleted file mode 100644 index 84c33e53ea..0000000000 --- a/src/modules/Makefile_illume-indicator.am +++ /dev/null @@ -1,26 +0,0 @@ -illume_indicatordir = $(MDIR)/illume-indicator -illume_indicator_DATA = illume-indicator/e-module-illume-indicator.edj \ - illume-indicator/module.desktop -EXTRA_DIST += illume-indicator/module.desktop.in \ - illume-indicator/e-module-illume-indicator.edj - -illume_indicatorpkgdir = $(MDIR)/illume-indicator/$(MODULE_ARCH) -illume_indicatorpkg_LTLIBRARIES = illume-indicator/module.la - -illume_indicator_module_la_SOURCES = illume-indicator/e_mod_main.c \ - illume-indicator/e_mod_main.h \ - illume-indicator/e_mod_config.c \ - illume-indicator/e_mod_config.h \ - illume-indicator/e_mod_ind_win.c \ - illume-indicator/e_mod_ind_win.h - -if HAVE_ENOTIFY -illume_indicator_module_la_SOURCES += illume-indicator/e_mod_notify.c \ - illume-indicator/e_mod_notify.h -endif - -illume_indicator_module_la_LIBADD = @ENOTIFY_LIBS@ - -.PHONY: illume_indicator install-illume_indicator -illume_indicator: $(illume_indicatorpkg_LTLIBRARIES) $(illume_indicator_DATA) -install-illume_indicator: install-illume_indicatorDATA install-illume_indicatorpkgLTLIBRARIES diff --git a/src/modules/Makefile_illume-indicator.mk b/src/modules/Makefile_illume-indicator.mk new file mode 100644 index 0000000000..66868c61f9 --- /dev/null +++ b/src/modules/Makefile_illume-indicator.mk @@ -0,0 +1,28 @@ +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) +illume_indicatorpkg_LTLIBRARIES = src/modules/illume-indicator/module.la + +src_modules_illume_indicator_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_illume_indicator_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_illume_indicator_module_la_SOURCES = src/modules/illume-indicator/e_mod_main.c \ + src/modules/illume-indicator/e_mod_main.h \ + src/modules/illume-indicator/e_mod_config.c \ + src/modules/illume-indicator/e_mod_config.h \ + src/modules/illume-indicator/e_mod_ind_win.c \ + src/modules/illume-indicator/e_mod_ind_win.h + +if HAVE_ENOTIFY +src_modules_illume_indicator_module_la_SOURCES += src/modules/illume-indicator/e_mod_notify.c \ + src/modules/illume-indicator/e_mod_notify.h +endif + +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 diff --git a/src/modules/Makefile_illume-kbd-toggle.am b/src/modules/Makefile_illume-kbd-toggle.am deleted file mode 100644 index 5b95c75ce7..0000000000 --- a/src/modules/Makefile_illume-kbd-toggle.am +++ /dev/null @@ -1,14 +0,0 @@ -illume_kbd_toggledir = $(MDIR)/illume-kbd-toggle -illume_kbd_toggle_DATA = illume-kbd-toggle/e-module-illume-kbd-toggle.edj \ - illume-kbd-toggle/module.desktop - -EXTRA_DIST += $(illume_kbd_toggle_DATA) - -illume_kbd_togglepkgdir = $(MDIR)/illume-kbd-toggle/$(MODULE_ARCH) -illume_kbd_togglepkg_LTLIBRARIES = illume-kbd-toggle/module.la - -illume_kbd_toggle_module_la_SOURCES = illume-kbd-toggle/e_mod_main.c - -.PHONY: 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 diff --git a/src/modules/Makefile_illume-kbd-toggle.mk b/src/modules/Makefile_illume-kbd-toggle.mk new file mode 100644 index 0000000000..07e94808e3 --- /dev/null +++ b/src/modules/Makefile_illume-kbd-toggle.mk @@ -0,0 +1,17 @@ +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 + +src_modules_illume_kbd_toggle_module_la_LIBADD = $(MOD_LIBS) +src_modules_illume_kbd_toggle_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_illume_kbd_toggle_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_illume_kbd_toggle_module_la_SOURCES = src/modules/illume-kbd-toggle/e_mod_main.c + +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 diff --git a/src/modules/Makefile_illume-keyboard.am b/src/modules/Makefile_illume-keyboard.am deleted file mode 100644 index eb8b06f995..0000000000 --- a/src/modules/Makefile_illume-keyboard.am +++ /dev/null @@ -1,56 +0,0 @@ -illume_keyboarddir = $(MDIR)/illume-keyboard -illume_keyboard_DATA = illume-keyboard/e-module-illume-keyboard.edj \ - illume-keyboard/module.desktop - -EXTRA_DIST += illume-keyboard/e-module-illume-keyboard.edj \ - illume-keyboard/module.desktop.in - - -# keyboards -illumekeyboardsdir = $(MDIR)/illume-keyboard/keyboards -illumekeyboards_DATA = illume-keyboard/keyboards/ignore_built_in_keyboards \ - illume-keyboard/keyboards/Default.kbd \ - illume-keyboard/keyboards/alpha.png \ - illume-keyboard/keyboards/Numbers.kbd \ - illume-keyboard/keyboards/numeric.png \ - illume-keyboard/keyboards/Terminal.kbd \ - illume-keyboard/keyboards/qwerty.png \ - illume-keyboard/keyboards/up.png \ - illume-keyboard/keyboards/down.png \ - illume-keyboard/keyboards/left.png \ - illume-keyboard/keyboards/right.png \ - illume-keyboard/keyboards/shift.png \ - illume-keyboard/keyboards/tab.png \ - illume-keyboard/keyboards/enter.png \ - illume-keyboard/keyboards/backspace.png - -EXTRA_DIST += $(illumekeyboards_DATA) - -# dicts -illumedictsdir = $(MDIR)/illume-keyboard/dicts -illumedicts_DATA = illume-keyboard/dicts/English_US.dic \ - illume-keyboard/dicts/English_US_Small.dic - -EXTRA_DIST += $(illumedicts_DATA) - - -illume_keyboardpkgdir = $(MDIR)/illume-keyboard/$(MODULE_ARCH) -illume_keyboardpkg_LTLIBRARIES = illume-keyboard/module.la - -illume_keyboard_module_la_SOURCES = illume-keyboard/e_mod_main.c \ - illume-keyboard/e_mod_main.h \ - illume-keyboard/e_kbd_int.c \ - illume-keyboard/e_kbd_int.h \ - illume-keyboard/e_kbd_dict.c \ - illume-keyboard/e_kbd_dict.h \ - illume-keyboard/e_kbd_buf.c \ - illume-keyboard/e_kbd_buf.h \ - illume-keyboard/e_kbd_send.c \ - illume-keyboard/e_kbd_send.h \ - illume-keyboard/e_mod_config.c \ - illume-keyboard/e_mod_config.h - -# TODO: incomplete -.PHONY: illume_keyboard install-illume_keyboard -illume_keyboard: $(illume_keyboardpkg_LTLIBRARIES) $(illume_keyboard_DATA) -install-illume_keyboard: install-illume_keyboardDATA install-illume_keyboardpkgLTLIBRARIES diff --git a/src/modules/Makefile_illume-keyboard.mk b/src/modules/Makefile_illume-keyboard.mk new file mode 100644 index 0000000000..c58bb329c7 --- /dev/null +++ b/src/modules/Makefile_illume-keyboard.mk @@ -0,0 +1,59 @@ +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 + + +# keyboards +illumekeyboardsdir = $(MDIR)/illume-keyboard/keyboards +illumekeyboards_DATA = src/modules/illume-keyboard/keyboards/ignore_built_in_keyboards \ + src/modules/illume-keyboard/keyboards/Default.kbd \ + src/modules/illume-keyboard/keyboards/alpha.png \ + src/modules/illume-keyboard/keyboards/Numbers.kbd \ + src/modules/illume-keyboard/keyboards/numeric.png \ + src/modules/illume-keyboard/keyboards/Terminal.kbd \ + src/modules/illume-keyboard/keyboards/qwerty.png \ + src/modules/illume-keyboard/keyboards/up.png \ + src/modules/illume-keyboard/keyboards/down.png \ + src/modules/illume-keyboard/keyboards/left.png \ + src/modules/illume-keyboard/keyboards/right.png \ + src/modules/illume-keyboard/keyboards/shift.png \ + src/modules/illume-keyboard/keyboards/tab.png \ + 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) +illume_keyboardpkg_LTLIBRARIES = src/modules/illume-keyboard/module.la + +src_modules_illume_keyboard_module_la_LIBADD = $(MOD_LIBS) +src_modules_illume_keyboard_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_illume_keyboard_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_illume_keyboard_module_la_SOURCES = src/modules/illume-keyboard/e_mod_main.c \ + src/modules/illume-keyboard/e_mod_main.h \ + src/modules/illume-keyboard/e_kbd_int.c \ + src/modules/illume-keyboard/e_kbd_int.h \ + src/modules/illume-keyboard/e_kbd_dict.c \ + src/modules/illume-keyboard/e_kbd_dict.h \ + src/modules/illume-keyboard/e_kbd_buf.c \ + src/modules/illume-keyboard/e_kbd_buf.h \ + src/modules/illume-keyboard/e_kbd_send.c \ + src/modules/illume-keyboard/e_kbd_send.h \ + src/modules/illume-keyboard/e_mod_config.c \ + src/modules/illume-keyboard/e_mod_config.h + +# TODO: incomplete +PHONIES += illume_keyboard install-illume_keyboard +illume_keyboard: $(illume_keyboardpkg_LTLIBRARIES) $(illume_keyboard_DATA) +install-illume_keyboard: install-illume_keyboardDATA install-illume_keyboardpkgLTLIBRARIES diff --git a/src/modules/Makefile_illume-mode-toggle.am b/src/modules/Makefile_illume-mode-toggle.am deleted file mode 100644 index 71498e0303..0000000000 --- a/src/modules/Makefile_illume-mode-toggle.am +++ /dev/null @@ -1,14 +0,0 @@ -illume_mode_toggledir = $(MDIR)/illume-mode-toggle -illume_mode_toggle_DATA = illume-mode-toggle/e-module-illume-mode-toggle.edj \ - illume-mode-toggle/module.desktop - -EXTRA_DIST += $(illume_mode_toggle_DATA) - -illume_mode_togglepkgdir = $(MDIR)/illume-mode-toggle/$(MODULE_ARCH) -illume_mode_togglepkg_LTLIBRARIES = illume-mode-toggle/module.la - -illume_mode_toggle_module_la_SOURCES = illume-mode-toggle/e_mod_main.c - -.PHONY: 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 diff --git a/src/modules/Makefile_illume-mode-toggle.mk b/src/modules/Makefile_illume-mode-toggle.mk new file mode 100644 index 0000000000..1db181d12f --- /dev/null +++ b/src/modules/Makefile_illume-mode-toggle.mk @@ -0,0 +1,17 @@ +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 + +src_modules_illume_mode_toggle_module_la_LIBADD = $(MOD_LIBS) +src_modules_illume_mode_toggle_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_illume_mode_toggle_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_illume_mode_toggle_module_la_SOURCES = src/modules/illume-mode-toggle/e_mod_main.c + +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 diff --git a/src/modules/Makefile_illume-softkey.am b/src/modules/Makefile_illume-softkey.am deleted file mode 100644 index bd6ee334dd..0000000000 --- a/src/modules/Makefile_illume-softkey.am +++ /dev/null @@ -1,21 +0,0 @@ -illume_softkeydir = $(MDIR)/illume-softkey -illume_softkey_DATA = illume-softkey/e-module-illume-softkey.edj \ - illume-softkey/module.desktop - -EXTRA_DIST += illume-softkey/e-module-illume-softkey.edj \ - illume-softkey/module.desktop.in - - -illume_softkeypkgdir = $(MDIR)/illume-softkey/$(MODULE_ARCH) -illume_softkeypkg_LTLIBRARIES = illume-softkey/module.la - -illume_softkey_module_la_SOURCES = illume-softkey/e_mod_main.c \ - illume-softkey/e_mod_main.h \ - illume-softkey/e_mod_sft_win.c \ - illume-softkey/e_mod_sft_win.h \ - illume-softkey/e_mod_config.c \ - illume-softkey/e_mod_config.h - -.PHONY: illume_softkey install-illume_softkey -illume_softkey: $(illume_softkeypkg_LTLIBRARIES) $(illume_softkey_DATA) -install-illume_softkey: install-illume_softkeyDATA install-illume_softkeypkgLTLIBRARIES diff --git a/src/modules/Makefile_illume-softkey.mk b/src/modules/Makefile_illume-softkey.mk new file mode 100644 index 0000000000..a40f960d70 --- /dev/null +++ b/src/modules/Makefile_illume-softkey.mk @@ -0,0 +1,24 @@ +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 + + +illume_softkeypkgdir = $(MDIR)/illume-softkey/$(MODULE_ARCH) +illume_softkeypkg_LTLIBRARIES = src/modules/illume-softkey/module.la + +src_modules_illume_softkey_module_la_LIBADD = $(MOD_LIBS) +src_modules_illume_softkey_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_illume_softkey_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_illume_softkey_module_la_SOURCES = src/modules/illume-softkey/e_mod_main.c \ + src/modules/illume-softkey/e_mod_main.h \ + src/modules/illume-softkey/e_mod_sft_win.c \ + src/modules/illume-softkey/e_mod_sft_win.h \ + src/modules/illume-softkey/e_mod_config.c \ + src/modules/illume-softkey/e_mod_config.h + +PHONIES += illume_softkey install-illume_softkey +illume_softkey: $(illume_softkeypkg_LTLIBRARIES) $(illume_softkey_DATA) +install-illume_softkey: install-illume_softkeyDATA install-illume_softkeypkgLTLIBRARIES diff --git a/src/modules/Makefile_illume2.am b/src/modules/Makefile_illume2.am deleted file mode 100644 index b565e8165c..0000000000 --- a/src/modules/Makefile_illume2.am +++ /dev/null @@ -1,58 +0,0 @@ -illume2dir = $(MDIR)/illume2 -illume2_DATA = illume2/e-module-illume2.edj \ - illume2/module.desktop - -EXTRA_DIST += illume2/e-module-illume2.edj \ - illume2/module.desktop.in - -# keyboards -illume2keyboardsdir = $(MDIR)/illume2/keyboards -illume2keyboards_DATA = illume2/keyboards/ignore_built_in_keyboards -EXTRA_DIST += $(illume2keyboards_DATA) - -# policies -## illume -illume2policyillumedir = $(MDIR)/illume2/policies -illume2policyillume_LTLIBRARIES = illume2/policies/illume/illume.la -ILLUME2POLICYCPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/src/modules/illume2 - -illume2_policies_illume_illume_la_CPPFLAGS = $(ILLUME2POLICYCPPFLAGS) -illume2_policies_illume_illume_la_SOURCES = illume2/policies/illume/policy.c \ - illume2/policies/illume/policy.h \ - illume2/policies/illume/illume.c \ - illume2/policies/illume/illume.h -illume2_policies_illume_illume_la_LIBTOOLFLAGS = --tag=disable-static - -## tablet -illume2policytabletdir = $(MDIR)/illume2/policies -illume2policytablet_LTLIBRARIES = illume2/policies/tablet/tablet.la - -illume2_policies_tablet_tablet_la_CPPFLAGS = $(ILLUME2POLICYCPPFLAGS) -illume2_policies_tablet_tablet_la_SOURCES = illume2/policies/tablet/policy.c \ - illume2/policies/tablet/policy.h \ - illume2/policies/tablet/tablet.c \ - illume2/policies/tablet/tablet.h -illume2_policies_tablet_tablet_la_LIBTOOLFLAGS = --tag=disable-static - -illume2pkgdir = $(MDIR)/illume2/$(MODULE_ARCH) -illume2pkg_LTLIBRARIES = illume2/module.la - -illume2_module_la_SOURCES = illume2/e_mod_main.c \ - illume2/e_mod_main.h \ - illume2/e_illume.h \ - illume2/e_illume.c \ - illume2/e_illume_private.h \ - illume2/e_mod_config_policy.c \ - illume2/e_mod_select_window.c \ - illume2/e_mod_config_windows.c \ - illume2/e_mod_config_animation.c \ - illume2/e_mod_quickpanel.c \ - illume2/e_mod_kbd_device.c \ - illume2/e_mod_kbd.c \ - illume2/e_mod_policy.c \ - illume2/e_mod_config.c - -# TODO: incomplete -.PHONY: illume2 install-illume2 -illume2: $(illume2pkg_LTLIBRARIES) $(illume2_DATA) -install-illume2: install-illume2DATA install-illume2pkgLTLIBRARIES diff --git a/src/modules/Makefile_illume2.mk b/src/modules/Makefile_illume2.mk new file mode 100644 index 0000000000..bac4dcf724 --- /dev/null +++ b/src/modules/Makefile_illume2.mk @@ -0,0 +1,65 @@ +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 +illume2policyillumedir = $(MDIR)/illume2/policies +illume2policyillume_LTLIBRARIES = src/modules/illume2/policies/illume/illume.la +ILLUME2POLICYCPPFLAGS = $(MOD_CPPFLAGS) -I$(top_srcdir)/src/modules/illume2 + +src_modules_illume2_policies_illume_illume_la_CPPFLAGS = $(ILLUME2POLICYCPPFLAGS) +src_modules_illume2_policies_illume_illume_la_LIBADD = $(MOD_LIBS) +src_modules_illume2_policies_illume_illume_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_illume2_policies_illume_illume_la_SOURCES = src/modules/illume2/policies/illume/policy.c \ + src/modules/illume2/policies/illume/policy.h \ + src/modules/illume2/policies/illume/illume.c \ + src/modules/illume2/policies/illume/illume.h +src_modules_illume2_policies_illume_illume_la_LIBTOOLFLAGS = --tag=disable-static + +## tablet +src_modules_illume2policytabletdir = $(MDIR)/illume2/policies +src_modules_illume2policytablet_LTLIBRARIES = src/modules/illume2/policies/tablet/tablet.la + +src_modules_illume2_policies_tablet_tablet_la_CPPFLAGS = $(ILLUME2POLICYCPPFLAGS) +src_modules_illume2_policies_tablet_tablet_la_LIBADD = $(MOD_LIBS) +src_modules_illume2_policies_tablet_tablet_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_illume2_policies_tablet_tablet_la_SOURCES = src/modules/illume2/policies/tablet/policy.c \ + src/modules/illume2/policies/tablet/policy.h \ + src/modules/illume2/policies/tablet/tablet.c \ + src/modules/illume2/policies/tablet/tablet.h +src_modules_illume2_policies_tablet_tablet_la_LIBTOOLFLAGS = --tag=disable-static + +src_modules_illume2pkgdir = $(MDIR)/illume2/$(MODULE_ARCH) +src_modules_illume2pkg_LTLIBRARIES = src/modules/illume2/module.la + +src_modules_illume2_module_la_LIBADD = $(MOD_LIBS) +src_modules_illume2_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_illume2_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_illume2_module_la_SOURCES = src/modules/illume2/e_mod_main.c \ + src/modules/illume2/e_mod_main.h \ + src/modules/illume2/e_illume.h \ + src/modules/illume2/e_illume.c \ + src/modules/illume2/e_illume_private.h \ + src/modules/illume2/e_mod_config_policy.c \ + src/modules/illume2/e_mod_select_window.c \ + src/modules/illume2/e_mod_config_windows.c \ + src/modules/illume2/e_mod_config_animation.c \ + src/modules/illume2/e_mod_quickpanel.c \ + src/modules/illume2/e_mod_kbd_device.c \ + src/modules/illume2/e_mod_kbd.c \ + src/modules/illume2/e_mod_policy.c \ + src/modules/illume2/e_mod_config.c + +# TODO: incomplete +PHONIES += illume2 install-illume2 +illume2: $(illume2pkg_LTLIBRARIES) $(illume2_DATA) +install-illume2: install-illume2DATA install-illume2pkgLTLIBRARIES diff --git a/src/modules/Makefile_mixer.am b/src/modules/Makefile_mixer.am deleted file mode 100644 index ba7451226b..0000000000 --- a/src/modules/Makefile_mixer.am +++ /dev/null @@ -1,43 +0,0 @@ -mixerdir = $(MDIR)/mixer -mixer_DATA = mixer/e-module-mixer.edj \ - mixer/module.desktop - -EXTRA_DIST += $(mixer_DATA) - -mixerpkgdir = $(MDIR)/mixer/$(MODULE_ARCH) -mixerpkg_LTLIBRARIES = mixer/module.la - -mixer_module_la_CFLAGS = $(AM_CFLAGS) @SOUND_CFLAGS@ - -mixer_module_la_SOURCES = mixer/e_mod_main.c \ - mixer/e_mod_main.h \ - mixer/e_mod_mixer.h \ - mixer/e_mod_mixer.c \ - mixer/app_mixer.c \ - mixer/conf_gadget.c \ - mixer/conf_module.c \ - mixer/msg.c \ - mixer/Pulse.h \ - mixer/pa.h \ - mixer/pa.c \ - mixer/serial.c \ - mixer/sink.c \ - mixer/sys_pulse.c \ - mixer/tag.c - -if HAVE_ALSA -mixer_module_la_SOURCES += mixer/sys_alsa.c -else -mixer_module_la_SOURCES += mixer/sys_dummy.c -endif - -mixer_module_la_LIBADD = @SOUND_LIBS@ - -if HAVE_ENOTIFY -mixer_module_la_CFLAGS += @ENOTIFY_CFLAGS@ -mixer_module_la_LIBADD += @ENOTIFY_LIBS@ -endif - -.PHONY: mixer install-mixer -mixer: $(mixerpkg_LTLIBRARIES) $(mixer_DATA) -install-mixer: install-mixerDATA install-mixerpkgLTLIBRARIES diff --git a/src/modules/Makefile_mixer.mk b/src/modules/Makefile_mixer.mk new file mode 100644 index 0000000000..7aa0bf52db --- /dev/null +++ b/src/modules/Makefile_mixer.mk @@ -0,0 +1,44 @@ +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 + +src_modules_mixer_module_la_CPPFLAGS = $(MOD_CPPFLAGS) @SOUND_CFLAGS@ + +src_modules_mixer_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_mixer_module_la_SOURCES = src/modules/mixer/e_mod_main.c \ + src/modules/mixer/e_mod_main.h \ + src/modules/mixer/e_mod_mixer.h \ + src/modules/mixer/e_mod_mixer.c \ + src/modules/mixer/app_mixer.c \ + src/modules/mixer/conf_gadget.c \ + src/modules/mixer/conf_module.c \ + src/modules/mixer/msg.c \ + src/modules/mixer/Pulse.h \ + src/modules/mixer/pa.h \ + src/modules/mixer/pa.c \ + src/modules/mixer/serial.c \ + src/modules/mixer/sink.c \ + src/modules/mixer/sys_pulse.c \ + src/modules/mixer/tag.c + +if HAVE_ALSA +src_modules_mixer_module_la_SOURCES += src/modules/mixer/sys_alsa.c +else +src_modules_mixer_module_la_SOURCES += src/modules/mixer/sys_dummy.c +endif + +src_modules_mixer_module_la_LIBADD = $(MOD_LIBS) @SOUND_LIBS@ + +if HAVE_ENOTIFY +src_modules_mixer_module_la_CPPFLAGS += @ENOTIFY_CFLAGS@ +src_modules_mixer_module_la_LIBADD += @ENOTIFY_LIBS@ +endif + +PHONIES += mixer install-mixer +mixer: $(mixerpkg_LTLIBRARIES) $(mixer_DATA) +install-mixer: install-mixerDATA install-mixerpkgLTLIBRARIES diff --git a/src/modules/Makefile_msgbus.am b/src/modules/Makefile_msgbus.am deleted file mode 100644 index d8da7e4046..0000000000 --- a/src/modules/Makefile_msgbus.am +++ /dev/null @@ -1,18 +0,0 @@ -msgbusdir = $(MDIR)/msgbus -msgbus_DATA = msgbus/e-module-msgbus.edj \ - msgbus/module.desktop - -EXTRA_DIST += $(msgbus_DATA) - -msgbuspkgdir = $(MDIR)/msgbus/$(MODULE_ARCH) -msgbuspkg_LTLIBRARIES = msgbus/module.la - -msgbus_module_la_SOURCES = msgbus/e_mod_main.h \ - msgbus/e_mod_main.c \ - msgbus/msgbus_audit.c \ - msgbus/msgbus_desktop.c \ - msgbus/msgbus_lang.c - -.PHONY: msgbus install-msgbus -msgbus: $(msgbuspkg_LTLIBRARIES) $(msgbus_DATA) -install-msgbus: install-msgbusDATA install-msgbuspkgLTLIBRARIES diff --git a/src/modules/Makefile_msgbus.mk b/src/modules/Makefile_msgbus.mk new file mode 100644 index 0000000000..c829fa30a8 --- /dev/null +++ b/src/modules/Makefile_msgbus.mk @@ -0,0 +1,22 @@ +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 + +src_modules_msgbus_module_la_LIBADD = $(MOD_LIBS) +src_modules_msgbus_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_msgbus_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_msgbus_module_la_SOURCES = \ +src/modules/msgbus/e_mod_main.h \ +src/modules/msgbus/e_mod_main.c \ +src/modules/msgbus/msgbus_audit.c \ +src/modules/msgbus/msgbus_desktop.c \ +src/modules/msgbus/msgbus_lang.c + +PHONIES += msgbus install-msgbus +msgbus: $(msgbuspkg_LTLIBRARIES) $(msgbus_DATA) +install-msgbus: install-msgbusDATA install-msgbuspkgLTLIBRARIES diff --git a/src/modules/Makefile_music_control.am b/src/modules/Makefile_music_control.am deleted file mode 100644 index 552b5bd6d1..0000000000 --- a/src/modules/Makefile_music_control.am +++ /dev/null @@ -1,21 +0,0 @@ -music_controldir = $(MDIR)/music-control -music_control_DATA = music-control/module.desktop \ - music-control/e-module-music-control.edj - -EXTRA_DIST += $(music_control_DATA) - -music_controlpkgdir = $(MDIR)/music-control/$(MODULE_ARCH) -music_controlpkg_LTLIBRARIES = music-control/module.la - -music_control_module_la_DEPENDENCIES = $(MDEPENDENCIES) -music_control_module_la_CFLAGS = $(AM_CFLAGS) -Wno-unused-parameter -music_control_module_la_LIBADD = @MUSIC_CONTROL_LIBS@ -music_control_module_la_SOURCES = music-control/e_mod_main.h \ - music-control/e_mod_main.c \ - music-control/private.h \ - music-control/ui.c \ - music-control/gen/eldbus_utils.h \ - music-control/gen/eldbus_media_player2_player.c \ - music-control/gen/eldbus_media_player2_player.h \ - music-control/gen/eldbus_mpris_media_player2.c \ - music-control/gen/eldbus_mpris_media_player2.h diff --git a/src/modules/Makefile_music_control.mk b/src/modules/Makefile_music_control.mk new file mode 100644 index 0000000000..b0a29d8fcb --- /dev/null +++ b/src/modules/Makefile_music_control.mk @@ -0,0 +1,27 @@ +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 + +src_modules_music_control_module_la_DEPENDENCIES = $(MDEPENDENCIES) +src_modules_music_control_module_la_CPPFLAGS = $(MOD_CPPFLAGS) -Wno-unused-parameter +src_modules_music_control_module_la_LIBADD = @MUSIC_CONTROL_LIBS@ $(MOD_LIBS) +src_modules_music_control_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_music_control_module_la_SOURCES = \ +src/modules/music-control/e_mod_main.h \ +src/modules/music-control/e_mod_main.c \ +src/modules/music-control/private.h \ +src/modules/music-control/ui.c \ +src/modules/music-control/gen/eldbus_utils.h \ +src/modules/music-control/gen/eldbus_media_player2_player.c \ +src/modules/music-control/gen/eldbus_media_player2_player.h \ +src/modules/music-control/gen/eldbus_mpris_media_player2.c \ +src/modules/music-control/gen/eldbus_mpris_media_player2.h + +PHONIES += music-control install-music-control +music-control: $(music_controlpkg_LTLIBRARIES) $(music_control_DATA) +install-music-control: install-music_controlDATA install-music_controlpkgLTLIBRARIES diff --git a/src/modules/Makefile_notification.am b/src/modules/Makefile_notification.am deleted file mode 100644 index 134a7251d8..0000000000 --- a/src/modules/Makefile_notification.am +++ /dev/null @@ -1,19 +0,0 @@ -notificationdir = $(MDIR)/notification -notification_DATA = notification/e-module-notification.edj \ - notification/module.desktop - -EXTRA_DIST += $(notification_DATA) - -notificationpkgdir = $(MDIR)/notification/$(MODULE_ARCH) -notificationpkg_LTLIBRARIES = notification/module.la - -notification_module_la_SOURCES = notification/e_mod_main.h \ - notification/e_mod_main.c \ - notification/e_mod_config.c \ - notification/e_mod_popup.c - -notification_module_la_LIBADD = @ENOTIFY_LIBS@ - -.PHONY: notification install-notification -notification: $(notificationpkg_LTLIBRARIES) $(notification_DATA) -install-notification: install-notificationDATA install-notificationpkgLTLIBRARIES diff --git a/src/modules/Makefile_notification.mk b/src/modules/Makefile_notification.mk new file mode 100644 index 0000000000..c5f2ba9350 --- /dev/null +++ b/src/modules/Makefile_notification.mk @@ -0,0 +1,21 @@ +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 + +src_modules_notification_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_notification_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_notification_module_la_SOURCES = src/modules/notification/e_mod_main.h \ + src/modules/notification/e_mod_main.c \ + src/modules/notification/e_mod_config.c \ + src/modules/notification/e_mod_popup.c + +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 diff --git a/src/modules/Makefile_pager.am b/src/modules/Makefile_pager.am deleted file mode 100644 index 9938ff0b84..0000000000 --- a/src/modules/Makefile_pager.am +++ /dev/null @@ -1,16 +0,0 @@ -pagerdir = $(MDIR)/pager -pager_DATA = pager/e-module-pager.edj \ - pager/module.desktop - -EXTRA_DIST += $(pager_DATA) - -pagerpkgdir = $(MDIR)/pager/$(MODULE_ARCH) -pagerpkg_LTLIBRARIES = pager/module.la - -pager_module_la_SOURCES = pager/e_mod_main.h \ - pager/e_mod_main.c \ - pager/e_mod_config.c - -.PHONY: pager install-pager -pager: $(pagerpkg_LTLIBRARIES) $(pager_DATA) -install-pager: install-pagerDATA install-pagerpkgLTLIBRARIES diff --git a/src/modules/Makefile_pager.mk b/src/modules/Makefile_pager.mk new file mode 100644 index 0000000000..d7f75c1d69 --- /dev/null +++ b/src/modules/Makefile_pager.mk @@ -0,0 +1,19 @@ +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 + +src_modules_pager_module_la_LIBADD = $(MOD_LIBS) +src_modules_pager_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_pager_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_pager_module_la_SOURCES = src/modules/pager/e_mod_main.h \ + src/modules/pager/e_mod_main.c \ + src/modules/pager/e_mod_config.c + +PHONIES += pager install-pager +pager: $(pagerpkg_LTLIBRARIES) $(pager_DATA) +install-pager: install-pagerDATA install-pagerpkgLTLIBRARIES diff --git a/src/modules/Makefile_physics.mk b/src/modules/Makefile_physics.mk new file mode 100644 index 0000000000..5814dacfe7 --- /dev/null +++ b/src/modules/Makefile_physics.mk @@ -0,0 +1,26 @@ +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@ + +physicspkgdir = $(MDIR)/physics/$(MODULE_ARCH) +physicspkg_LTLIBRARIES = src/modules/physics/module.la + +src_modules_physics_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_physics_module_la_SOURCES = src/modules/physics/e_mod_main.c \ + src/modules/physics/e_mod_main.h \ + src/modules/physics/e_mod_config.c \ + src/modules/physics/e_mod_physics_cfdata.c \ + src/modules/physics/e_mod_physics_cfdata.h \ + src/modules/physics/e_mod_physics.c \ + src/modules/physics/e_mod_physics.h + +src_modules_physics_module_la_LIBADD = $(MOD_LIBS) @EPHYSICS_LIBS@ + +PHONIES += physics install-physics +physics: $(physicspkg_LTLIBRARIES) $(physics_DATA) +install-physics: install-physicsDATA install-physicspkgLTLIBRARIES diff --git a/src/modules/Makefile_quickaccess.am b/src/modules/Makefile_quickaccess.am deleted file mode 100644 index 6b1f7325b8..0000000000 --- a/src/modules/Makefile_quickaccess.am +++ /dev/null @@ -1,19 +0,0 @@ -quickaccessdir = $(MDIR)/quickaccess -quickaccess_DATA = quickaccess/e-module-quickaccess.edj \ - quickaccess/module.desktop - -EXTRA_DIST += $(quickaccess_DATA) - -quickaccesspkgdir = $(MDIR)/quickaccess/$(MODULE_ARCH) -quickaccesspkg_LTLIBRARIES = quickaccess/module.la - -quickaccess_module_la_SOURCES = quickaccess/e_mod_main.c \ - quickaccess/e_mod_main.h \ - quickaccess/e_mod_config.c \ - quickaccess/e_mod_quickaccess.c \ - quickaccess/e_quickaccess_bindings.c \ - quickaccess/e_quickaccess_db.c - -.PHONY: quickaccess install-quickaccess -quickaccess: $(quickaccesspkg_LTLIBRARIES) $(quickaccess_DATA) -install-quickaccess: install-quickaccessDATA install-quickaccesspkgLTLIBRARIES diff --git a/src/modules/Makefile_quickaccess.mk b/src/modules/Makefile_quickaccess.mk new file mode 100644 index 0000000000..4ed17f848f --- /dev/null +++ b/src/modules/Makefile_quickaccess.mk @@ -0,0 +1,22 @@ +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 + +src_modules_quickaccess_module_la_LIBADD = $(MOD_LIBS) +src_modules_quickaccess_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_quickaccess_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_quickaccess_module_la_SOURCES = src/modules/quickaccess/e_mod_main.c \ +src/modules/quickaccess/e_mod_main.h \ +src/modules/quickaccess/e_mod_config.c \ +src/modules/quickaccess/e_mod_quickaccess.c \ +src/modules/quickaccess/e_quickaccess_bindings.c \ +src/modules/quickaccess/e_quickaccess_db.c + +PHONIES += quickaccess install-quickaccess +quickaccess: $(quickaccesspkg_LTLIBRARIES) $(quickaccess_DATA) +install-quickaccess: install-quickaccessDATA install-quickaccesspkgLTLIBRARIES diff --git a/src/modules/Makefile_shot.am b/src/modules/Makefile_shot.am deleted file mode 100644 index 3ca467daff..0000000000 --- a/src/modules/Makefile_shot.am +++ /dev/null @@ -1,14 +0,0 @@ -shotdir = $(MDIR)/shot -shot_DATA = shot/e-module-shot.edj \ - shot/module.desktop - -EXTRA_DIST += $(shot_DATA) - -shotpkgdir = $(MDIR)/shot/$(MODULE_ARCH) -shotpkg_LTLIBRARIES = shot/module.la - -shot_module_la_SOURCES = shot/e_mod_main.c - -.PHONY: shot install-shot -shot: $(shotpkg_LTLIBRARIES) $(shot_DATA) -install-shot: install-shotDATA install-shotpkgLTLIBRARIES diff --git a/src/modules/Makefile_shot.mk b/src/modules/Makefile_shot.mk new file mode 100644 index 0000000000..be8c1b29cb --- /dev/null +++ b/src/modules/Makefile_shot.mk @@ -0,0 +1,17 @@ +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 + +src_modules_shot_module_la_LIBADD = $(MOD_LIBS) +src_modules_shot_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_shot_module_la_LDFLAGS = $(MOD_LDFLAGS) +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 diff --git a/src/modules/Makefile_start.am b/src/modules/Makefile_start.am deleted file mode 100644 index f63726b1d7..0000000000 --- a/src/modules/Makefile_start.am +++ /dev/null @@ -1,14 +0,0 @@ -startdir = $(MDIR)/start -start_DATA = start/e-module-start.edj \ - start/module.desktop - -EXTRA_DIST += $(start_DATA) - -startpkgdir = $(MDIR)/start/$(MODULE_ARCH) -startpkg_LTLIBRARIES = start/module.la - -start_module_la_SOURCES = start/e_mod_main.c - -.PHONY: start install-start -start: $(startpkg_LTLIBRARIES) $(start_DATA) -install-start: install-startDATA install-startpkgLTLIBRARIES diff --git a/src/modules/Makefile_start.mk b/src/modules/Makefile_start.mk new file mode 100644 index 0000000000..067850d077 --- /dev/null +++ b/src/modules/Makefile_start.mk @@ -0,0 +1,17 @@ +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 + +src_modules_start_module_la_LIBADD = $(MOD_LIBS) +src_modules_start_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_start_module_la_LDFLAGS = $(MOD_LDFLAGS) +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 diff --git a/src/modules/Makefile_syscon.am b/src/modules/Makefile_syscon.am deleted file mode 100644 index 411a217e45..0000000000 --- a/src/modules/Makefile_syscon.am +++ /dev/null @@ -1,18 +0,0 @@ -syscondir = $(MDIR)/syscon -syscon_DATA = syscon/e-module-syscon.edj \ - syscon/module.desktop - -EXTRA_DIST += $(syscon_DATA) - -sysconpkgdir = $(MDIR)/syscon/$(MODULE_ARCH) -sysconpkg_LTLIBRARIES = syscon/module.la - -syscon_module_la_SOURCES = syscon/e_mod_main.c \ - syscon/e_mod_main.h \ - syscon/e_int_config_syscon.c \ - syscon/e_syscon.c \ - syscon/e_syscon_gadget.c - -.PHONY: syscon install-syscon -syscon: $(sysconpkg_LTLIBRARIES) $(syscon_DATA) -install-syscon: install-sysconDATA install-sysconpkgLTLIBRARIES diff --git a/src/modules/Makefile_syscon.mk b/src/modules/Makefile_syscon.mk new file mode 100644 index 0000000000..2f3f8e5e07 --- /dev/null +++ b/src/modules/Makefile_syscon.mk @@ -0,0 +1,21 @@ +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 + +src_modules_syscon_module_la_LIBADD = $(MOD_LIBS) +src_modules_syscon_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_syscon_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_syscon_module_la_SOURCES = src/modules/syscon/e_mod_main.c \ + src/modules/syscon/e_mod_main.h \ + src/modules/syscon/e_int_config_syscon.c \ + src/modules/syscon/e_syscon.c \ + src/modules/syscon/e_syscon_gadget.c + +PHONIES += syscon install-syscon +syscon: $(sysconpkg_LTLIBRARIES) $(syscon_DATA) +install-syscon: install-sysconDATA install-sysconpkgLTLIBRARIES diff --git a/src/modules/Makefile_systray.am b/src/modules/Makefile_systray.am deleted file mode 100644 index dfcbed2524..0000000000 --- a/src/modules/Makefile_systray.am +++ /dev/null @@ -1,20 +0,0 @@ -systraydir = $(MDIR)/systray -systray_DATA = systray/e-module-systray.edj \ - systray/module.desktop - -EXTRA_DIST += $(systray_DATA) - -systraypkgdir = $(MDIR)/systray/$(MODULE_ARCH) -systraypkg_LTLIBRARIES = systray/module.la - -systray_module_la_SOURCES = systray/e_mod_main.h \ - systray/e_mod_main.c \ - systray/e_mod_xembed.c \ - systray/e_mod_notifier_host_private.h \ - systray/e_mod_notifier_host.c \ - systray/e_mod_notifier_host_dbus.c \ - systray/e_mod_notifier_watcher.c - -.PHONY: systray install-systray -systray: $(systraypkg_LTLIBRARIES) $(systray_DATA) -install-systray: install-systrayDATA install-systraypkgLTLIBRARIES diff --git a/src/modules/Makefile_systray.mk b/src/modules/Makefile_systray.mk new file mode 100644 index 0000000000..bd07ccad70 --- /dev/null +++ b/src/modules/Makefile_systray.mk @@ -0,0 +1,23 @@ +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 + +src_modules_systray_module_la_LIBADD = $(MOD_LIBS) +src_modules_systray_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_systray_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_systray_module_la_SOURCES = src/modules/systray/e_mod_main.h \ + src/modules/systray/e_mod_main.c \ + src/modules/systray/e_mod_xembed.c \ + src/modules/systray/e_mod_notifier_host_private.h \ + src/modules/systray/e_mod_notifier_host.c \ + src/modules/systray/e_mod_notifier_host_dbus.c \ + src/modules/systray/e_mod_notifier_watcher.c + +PHONIES += systray install-systray +systray: $(systraypkg_LTLIBRARIES) $(systray_DATA) +install-systray: install-systrayDATA install-systraypkgLTLIBRARIES diff --git a/src/modules/Makefile_tasks.am b/src/modules/Makefile_tasks.am deleted file mode 100644 index 4bf4a5c28e..0000000000 --- a/src/modules/Makefile_tasks.am +++ /dev/null @@ -1,16 +0,0 @@ -tasksdir = $(MDIR)/tasks -tasks_DATA = tasks/e-module-tasks.edj \ - tasks/module.desktop - -EXTRA_DIST += $(tasks_DATA) - -taskspkgdir = $(MDIR)/tasks/$(MODULE_ARCH) -taskspkg_LTLIBRARIES = tasks/module.la - -tasks_module_la_SOURCES = tasks/e_mod_main.c \ - tasks/e_mod_main.h \ - tasks/e_mod_config.c - -.PHONY: tasks install-tasks -tasks: $(taskspkg_LTLIBRARIES) $(tasks_DATA) -install-tasks: install-tasksDATA install-taskspkgLTLIBRARIES diff --git a/src/modules/Makefile_tasks.mk b/src/modules/Makefile_tasks.mk new file mode 100644 index 0000000000..937796e1a3 --- /dev/null +++ b/src/modules/Makefile_tasks.mk @@ -0,0 +1,19 @@ +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 + +src_modules_tasks_module_la_LIBADD = $(MOD_LIBS) +src_modules_tasks_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_tasks_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_tasks_module_la_SOURCES = src/modules/tasks/e_mod_main.c \ + src/modules/tasks/e_mod_main.h \ + src/modules/tasks/e_mod_config.c + +PHONIES += tasks install-tasks +tasks: $(taskspkg_LTLIBRARIES) $(tasks_DATA) +install-tasks: install-tasksDATA install-taskspkgLTLIBRARIES diff --git a/src/modules/Makefile_teamwork.am b/src/modules/Makefile_teamwork.am deleted file mode 100644 index 6ecc8434fa..0000000000 --- a/src/modules/Makefile_teamwork.am +++ /dev/null @@ -1,22 +0,0 @@ -teamworkdir = $(MDIR)/teamwork -teamwork_DATA = teamwork/e-module-teamwork.edj \ - teamwork/module.desktop - -EXTRA_DIST += $(teamwork_DATA) - -teamworkpkgdir = $(MDIR)/teamwork/$(MODULE_ARCH) -teamworkpkg_LTLIBRARIES = teamwork/module.la - -teamwork_module_la_CPPFLAGS = $(AM_CPPFLAGS) -teamwork_module_la_LIBADD = $(LIBS) - -teamwork_module_la_SOURCES = teamwork/e_mod_main.c \ - teamwork/e_mod_config.c \ - teamwork/e_mod_main.h \ - teamwork/e_mod_tw.c \ - teamwork/sha1.c \ - teamwork/sha1.h - -.PHONY: teamwork install-teamwork -teamwork: $(teamworkpkg_LTLIBRARIES) $(teamwork_DATA) -install-teamwork: install-teamworkDATA install-teamworkpkgLTLIBRARIES diff --git a/src/modules/Makefile_teamwork.mk b/src/modules/Makefile_teamwork.mk new file mode 100644 index 0000000000..0a2d4ab0eb --- /dev/null +++ b/src/modules/Makefile_teamwork.mk @@ -0,0 +1,23 @@ +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 + +src_modules_teamwork_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_teamwork_module_la_LIBADD = $(MOD_LIBS) + +src_modules_teamwork_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_teamwork_module_la_SOURCES = src/modules/teamwork/e_mod_main.c \ +src/modules/teamwork/e_mod_config.c \ +src/modules/teamwork/e_mod_main.h \ +src/modules/teamwork/e_mod_tw.c \ +src/modules/teamwork/sha1.c \ +src/modules/teamwork/sha1.h + +PHONIES += teamwork install-teamwork +teamwork: $(teamworkpkg_LTLIBRARIES) $(teamwork_DATA) +install-teamwork: install-teamworkDATA install-teamworkpkgLTLIBRARIES diff --git a/src/modules/Makefile_temperature.am b/src/modules/Makefile_temperature.am deleted file mode 100644 index 4100747c60..0000000000 --- a/src/modules/Makefile_temperature.am +++ /dev/null @@ -1,27 +0,0 @@ -temperaturedir = $(MDIR)/temperature -temperature_DATA = temperature/e-module-temperature.edj \ - temperature/module.desktop - -EXTRA_DIST += $(temperature_DATA) - -temperaturepkgdir = $(MDIR)/temperature/$(MODULE_ARCH) -temperaturepkg_LTLIBRARIES = temperature/module.la - -temperature_module_la_SOURCES = temperature/e_mod_main.c \ - temperature/e_mod_main.h \ - temperature/e_mod_config.c \ - temperature/e_mod_tempget.c - -if HAVE_EEZE -temperature_module_la_SOURCES += temperature/e_mod_udev.c -endif - -tempgetdir = $(temperaturepkgdir) -tempget_PROGRAMS = temperature/tempget - -temperature_tempget_SOURCES = temperature/tempget.c -temperature_tempget_LDADD = @TEMPERATURE_LIBS@ - -.PHONY: temperature install-temperature -temperature: $(temperaturepkg_LTLIBRARIES) $(temperature_DATA) $(tempget_PROGRAMS) -install-temperature: install-temperatureDATA install-temperaturepkgLTLIBRARIES install-tempgetPROGRAMS diff --git a/src/modules/Makefile_temperature.mk b/src/modules/Makefile_temperature.mk new file mode 100644 index 0000000000..110135f374 --- /dev/null +++ b/src/modules/Makefile_temperature.mk @@ -0,0 +1,32 @@ +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 + + +src_modules_temperature_module_la_LIBADD = $(MOD_LIBS) +src_modules_temperature_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_temperature_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_temperature_module_la_SOURCES = src/modules/temperature/e_mod_main.c \ + src/modules/temperature/e_mod_main.h \ + src/modules/temperature/e_mod_config.c \ + src/modules/temperature/e_mod_tempget.c + +if HAVE_EEZE +src_modules_temperature_module_la_SOURCES += src/modules/temperature/e_mod_udev.c +endif + +src_modules_temperature_tempgetdir = $(temperaturepkgdir) +src_modules_temperature_tempget_PROGRAMS = src/modules/temperature/tempget + +src_modules_temperature_tempget_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_temperature_tempget_SOURCES = src/modules/temperature/tempget.c +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 diff --git a/src/modules/Makefile_tiling.am b/src/modules/Makefile_tiling.am deleted file mode 100644 index 52bcab07ed..0000000000 --- a/src/modules/Makefile_tiling.am +++ /dev/null @@ -1,33 +0,0 @@ -tilingdir = $(MDIR)/tiling -tiling_DATA = tiling/e-module-tiling.edj \ - tiling/module.desktop -CLEANFILES += tiling/e-module-tiling.edj - -EXTRA_DIST += $(tiling_DATA) \ - tiling/e-module-tiling.edc \ - tiling/module.desktop.in \ - tiling/images/module_icon.png \ - tiling/images/arrow_e.png \ - tiling/images/arrow_ne.png \ - tiling/images/arrow_n.png \ - tiling/images/arrow_nw.png \ - tiling/images/arrow_se.png \ - tiling/images/arrow_s.png \ - tiling/images/arrow_sw.png \ - tiling/images/arrow_w.png - -tilingpkgdir = $(MDIR)/tiling/$(MODULE_ARCH) -tilingpkg_LTLIBRARIES = tiling/module.la - -TILING_EDJE_FLAGS = $(EDJE_FLAGS) -id $(srcdir)/tiling/images - -tiling/%.edj: tiling/%.edc Makefile - $(EDJE_CC) $(TILING_EDJE_FLAGS) $< $@ - -tiling_module_la_SOURCES = tiling/e_mod_tiling.c \ - tiling/e_mod_tiling.h \ - tiling/e_mod_config.c - -.PHONY: tiling install-tiling -tiling: $(tilingpkg_LTLIBRARIES) $(tiling_DATA) -install-tiling: install-tilingDATA install-tilingpkgLTLIBRARIES diff --git a/src/modules/Makefile_tiling.mk b/src/modules/Makefile_tiling.mk new file mode 100644 index 0000000000..69434825a5 --- /dev/null +++ b/src/modules/Makefile_tiling.mk @@ -0,0 +1,36 @@ +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 \ + src/modules/tiling/images/arrow_e.png \ + src/modules/tiling/images/arrow_ne.png \ + src/modules/tiling/images/arrow_n.png \ + src/modules/tiling/images/arrow_nw.png \ + src/modules/tiling/images/arrow_se.png \ + src/modules/tiling/images/arrow_s.png \ + src/modules/tiling/images/arrow_sw.png \ + src/modules/tiling/images/arrow_w.png + +tilingpkgdir = $(MDIR)/tiling/$(MODULE_ARCH) +tilingpkg_LTLIBRARIES = src/modules/tiling/module.la + +TILING_EDJE_FLAGS = $(EDJE_FLAGS) -id $(top_srcdir)/src/modules/tiling/images + +src/modules/tiling/%.edj: src/modules/tiling/%.edc Makefile + $(EDJE_CC) $(TILING_EDJE_FLAGS) $< $@ + +src_modules_tiling_module_la_LIBADD = $(MOD_LIBS) +src_modules_tiling_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_tiling_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_tiling_module_la_SOURCES = src/modules/tiling/e_mod_tiling.c \ + src/modules/tiling/e_mod_tiling.h \ + src/modules/tiling/e_mod_config.c + +PHONIES += tiling install-tiling +tiling: $(tilingpkg_LTLIBRARIES) $(tiling_DATA) +install-tiling: install-tilingDATA install-tilingpkgLTLIBRARIES diff --git a/src/modules/Makefile_winlist.am b/src/modules/Makefile_winlist.am deleted file mode 100644 index 4b702dffb6..0000000000 --- a/src/modules/Makefile_winlist.am +++ /dev/null @@ -1,18 +0,0 @@ -winlistdir = $(MDIR)/winlist -winlist_DATA = winlist/e-module-winlist.edj \ - winlist/module.desktop - -EXTRA_DIST += $(winlist_DATA) - -winlistpkgdir = $(MDIR)/winlist/$(MODULE_ARCH) -winlistpkg_LTLIBRARIES = winlist/module.la - -winlist_module_la_SOURCES = winlist/e_mod_main.h \ - winlist/e_mod_main.c \ - winlist/e_int_config_winlist.c \ - winlist/e_winlist.h \ - winlist/e_winlist.c - -.PHONY: winlist install-winlist -winlist: $(winlistpkg_LTLIBRARIES) $(winlist_DATA) -install-winlist: install-winlistDATA install-winlistpkgLTLIBRARIES diff --git a/src/modules/Makefile_winlist.mk b/src/modules/Makefile_winlist.mk new file mode 100644 index 0000000000..f05de7c118 --- /dev/null +++ b/src/modules/Makefile_winlist.mk @@ -0,0 +1,21 @@ +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 + +src_modules_winlist_module_la_LIBADD = $(MOD_LIBS) +src_modules_winlist_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_winlist_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_winlist_module_la_SOURCES = src/modules/winlist/e_mod_main.h \ + src/modules/winlist/e_mod_main.c \ + src/modules/winlist/e_int_config_winlist.c \ + src/modules/winlist/e_winlist.h \ + src/modules/winlist/e_winlist.c + +PHONIES += winlist install-winlist +winlist: $(winlistpkg_LTLIBRARIES) $(winlist_DATA) +install-winlist: install-winlistDATA install-winlistpkgLTLIBRARIES diff --git a/src/modules/Makefile_wizard.am b/src/modules/Makefile_wizard.am deleted file mode 100644 index 32da4eb38b..0000000000 --- a/src/modules/Makefile_wizard.am +++ /dev/null @@ -1,90 +0,0 @@ -wizarddir = $(MDIR)/wizard -wizard_DATA = wizard/data/def-ibar.txt - -wizard_desktopdir = $(MDIR)/wizard/desktop -wizard_desktop_DATA = wizard/data/desktop/home.desktop \ - wizard/data/desktop/root.desktop \ - wizard/data/desktop/tmp.desktop - -EXTRA_DIST += $(wizard_DATA) $(wizard_desktop_DATA) - -### dont install these - this way e wont list the module for people to -#wizard_DATA = wizard/e-module-wizard.edj \ -# wizard/module.desktop - -wizardpkgdir = $(MDIR)/wizard/$(MODULE_ARCH) -wizardpkg_LTLIBRARIES = wizard/module.la \ - wizard/page_000.la \ - wizard/page_010.la \ - wizard/page_011.la \ - wizard/page_020.la \ - wizard/page_030.la \ - wizard/page_040.la \ - wizard/page_050.la \ - wizard/page_060.la \ - wizard/page_070.la \ - wizard/page_080.la \ - wizard/page_090.la \ - wizard/page_100.la \ - wizard/page_110.la \ - wizard/page_120.la \ - wizard/page_130.la \ - wizard/page_140.la \ - wizard/page_150.la \ - wizard/page_160.la \ - wizard/page_170.la \ - wizard/page_180.la \ - wizard/page_200.la - -wizard_module_la_SOURCES = wizard/e_mod_main.c \ - wizard/e_wizard.c \ - wizard/e_wizard.h - -wizard_page_000_la_SOURCES = wizard/page_000.c - -wizard_page_010_la_SOURCES = wizard/page_010.c - -wizard_page_011_la_SOURCES = wizard/page_011.c - -wizard_page_020_la_SOURCES = wizard/page_020.c - -wizard_page_030_la_SOURCES = wizard/page_030.c - -wizard_page_040_la_SOURCES = wizard/page_040.c - -wizard_page_050_la_SOURCES = wizard/page_050.c - -wizard_page_060_la_SOURCES = wizard/page_060.c - -wizard_page_070_la_SOURCES = wizard/page_070.c - -wizard_page_080_la_SOURCES = wizard/page_080.c - -wizard_page_090_la_SOURCES = wizard/page_090.c - -wizard_page_100_la_SOURCES = wizard/page_100.c - -wizard_page_110_la_SOURCES = wizard/page_110.c -if USE_MODULE_CONNMAN -wizard_page_110_la_LIBADD = @ECONNMAN_LIBS@ -endif - -wizard_page_120_la_SOURCES = wizard/page_120.c - -wizard_page_130_la_SOURCES = wizard/page_130.c - -wizard_page_140_la_SOURCES = wizard/page_140.c - -wizard_page_150_la_SOURCES = wizard/page_150.c - -wizard_page_160_la_SOURCES = wizard/page_160.c - -wizard_page_170_la_SOURCES = wizard/page_170.c - -wizard_page_180_la_SOURCES = wizard/page_180.c - -wizard_page_200_la_SOURCES = wizard/page_200.c - -.PHONY: wizard install-wizard -wizard: $(wizardpkg_LTLIBRARIES) $(wizard_DATA) -install-wizard: install-wizardDATA install-wizardpkgLTLIBRARIES diff --git a/src/modules/Makefile_wizard.mk b/src/modules/Makefile_wizard.mk new file mode 100644 index 0000000000..94a48347ce --- /dev/null +++ b/src/modules/Makefile_wizard.mk @@ -0,0 +1,156 @@ +wizarddir = $(MDIR)/wizard +wizard_DATA = src/modules/wizard/data/def-ibar.txt + +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 + +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 \ +# src/modules/wizard/module.desktop + +wizardpkgdir = $(MDIR)/wizard/$(MODULE_ARCH) +wizardpkg_LTLIBRARIES = src/modules/wizard/module.la \ + src/modules/wizard/page_000.la \ + src/modules/wizard/page_010.la \ + src/modules/wizard/page_011.la \ + src/modules/wizard/page_020.la \ + src/modules/wizard/page_030.la \ + src/modules/wizard/page_040.la \ + src/modules/wizard/page_050.la \ + src/modules/wizard/page_060.la \ + src/modules/wizard/page_070.la \ + src/modules/wizard/page_080.la \ + src/modules/wizard/page_090.la \ + src/modules/wizard/page_100.la \ + src/modules/wizard/page_110.la \ + src/modules/wizard/page_120.la \ + src/modules/wizard/page_130.la \ + src/modules/wizard/page_140.la \ + src/modules/wizard/page_150.la \ + src/modules/wizard/page_160.la \ + src/modules/wizard/page_170.la \ + src/modules/wizard/page_180.la \ + src/modules/wizard/page_200.la + +src_modules_wizard_module_la_LIBADD = $(MOD_LIBS) +src_modules_wizard_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_wizard_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_wizard_module_la_SOURCES = src/modules/wizard/e_mod_main.c \ + src/modules/wizard/e_wizard.c \ + src/modules/wizard/e_wizard.h + +src_modules_wizard_page_000_la_LIBADD = $(MOD_LIBS) +src_modules_wizard_page_000_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_wizard_page_000_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_wizard_page_000_la_SOURCES = src/modules/wizard/page_000.c + +src_modules_wizard_page_010_la_LIBADD = $(MOD_LIBS) +src_modules_wizard_page_010_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_wizard_page_010_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_wizard_page_010_la_SOURCES = src/modules/wizard/page_010.c + +src_modules_wizard_page_011_la_LIBADD = $(MOD_LIBS) +src_modules_wizard_page_011_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_wizard_page_011_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_wizard_page_011_la_SOURCES = src/modules/wizard/page_011.c + +src_modules_wizard_page_020_la_LIBADD = $(MOD_LIBS) +src_modules_wizard_page_020_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_wizard_page_020_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_wizard_page_020_la_SOURCES = src/modules/wizard/page_020.c + +src_modules_wizard_page_030_la_LIBADD = $(MOD_LIBS) +src_modules_wizard_page_030_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_wizard_page_030_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_wizard_page_030_la_SOURCES = src/modules/wizard/page_030.c + +src_modules_wizard_page_040_la_LIBADD = $(MOD_LIBS) +src_modules_wizard_page_040_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_wizard_page_040_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_wizard_page_040_la_SOURCES = src/modules/wizard/page_040.c + +src_modules_wizard_page_050_la_LIBADD = $(MOD_LIBS) +src_modules_wizard_page_050_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_wizard_page_050_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_wizard_page_050_la_SOURCES = src/modules/wizard/page_050.c + +src_modules_wizard_page_060_la_LIBADD = $(MOD_LIBS) +src_modules_wizard_page_060_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_wizard_page_060_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_wizard_page_060_la_SOURCES = src/modules/wizard/page_060.c + +src_modules_wizard_page_070_la_LIBADD = $(MOD_LIBS) +src_modules_wizard_page_070_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_wizard_page_070_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_wizard_page_070_la_SOURCES = src/modules/wizard/page_070.c + +src_modules_wizard_page_080_la_LIBADD = $(MOD_LIBS) +src_modules_wizard_page_080_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_wizard_page_080_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_wizard_page_080_la_SOURCES = src/modules/wizard/page_080.c + +src_modules_wizard_page_090_la_LIBADD = $(MOD_LIBS) +src_modules_wizard_page_090_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_wizard_page_090_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_wizard_page_090_la_SOURCES = src/modules/wizard/page_090.c + +src_modules_wizard_page_100_la_LIBADD = $(MOD_LIBS) +src_modules_wizard_page_100_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_wizard_page_100_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_wizard_page_100_la_SOURCES = src/modules/wizard/page_100.c + +src_modules_wizard_page_110_la_LIBADD = $(MOD_LIBS) +src_modules_wizard_page_110_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_wizard_page_110_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_wizard_page_110_la_SOURCES = src/modules/wizard/page_110.c +if USE_MODULE_CONNMAN +src_modules_wizard_page_110_la_LIBADD += @ECONNMAN_LIBS@ +endif + +src_modules_wizard_page_120_la_LIBADD = $(MOD_LIBS) +src_modules_wizard_page_120_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_wizard_page_120_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_wizard_page_120_la_SOURCES = src/modules/wizard/page_120.c + +src_modules_wizard_page_130_la_LIBADD = $(MOD_LIBS) +src_modules_wizard_page_130_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_wizard_page_130_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_wizard_page_130_la_SOURCES = src/modules/wizard/page_130.c + +src_modules_wizard_page_140_la_LIBADD = $(MOD_LIBS) +src_modules_wizard_page_140_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_wizard_page_140_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_wizard_page_140_la_SOURCES = src/modules/wizard/page_140.c + +src_modules_wizard_page_150_la_LIBADD = $(MOD_LIBS) +src_modules_wizard_page_150_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_wizard_page_150_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_wizard_page_150_la_SOURCES = src/modules/wizard/page_150.c + +src_modules_wizard_page_160_la_LIBADD = $(MOD_LIBS) +src_modules_wizard_page_160_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_wizard_page_160_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_wizard_page_160_la_SOURCES = src/modules/wizard/page_160.c + +src_modules_wizard_page_170_la_LIBADD = $(MOD_LIBS) +src_modules_wizard_page_170_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_wizard_page_170_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_wizard_page_170_la_SOURCES = src/modules/wizard/page_170.c + +src_modules_wizard_page_180_la_LIBADD = $(MOD_LIBS) +src_modules_wizard_page_180_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_wizard_page_180_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_wizard_page_180_la_SOURCES = src/modules/wizard/page_180.c + +src_modules_wizard_page_200_la_LIBADD = $(MOD_LIBS) +src_modules_wizard_page_200_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_wizard_page_200_la_LDFLAGS = $(MOD_LDFLAGS) +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 diff --git a/src/modules/Makefile_wl_desktop_shell.am b/src/modules/Makefile_wl_desktop_shell.am deleted file mode 100644 index a18a85b37e..0000000000 --- a/src/modules/Makefile_wl_desktop_shell.am +++ /dev/null @@ -1,25 +0,0 @@ -wl_desktop_shelldir = $(MDIR)/wl_desktop_shell -wl_desktop_shell_DATA = wl_desktop_shell/e-module-wl_desktop_shell.edj \ - wl_desktop_shell/module.desktop - -EXTRA_DIST += wl_desktop_shell/e-module-wl_desktop_shell.edj \ - wl_desktop_shell/module.desktop.in \ - wl_desktop_shell/e-desktop-shell.xml \ - wl_desktop_shell/e_desktop_shell_protocol.h \ - wl_desktop_shell/e_desktop_shell_protocol.c - -wl_desktop_shellpkgdir = $(MDIR)/wl_desktop_shell/$(MODULE_ARCH) -wl_desktop_shellpkg_LTLIBRARIES = wl_desktop_shell/module.la - -wl_desktop_shell_module_la_DEPENDENCIES = $(MDEPENDENCIES) -wl_desktop_shell_module_la_CFLAGS = $(AM_CFLAGS) @WL_DESKTOP_SHELL_CFLAGS@ @WAYLAND_CFLAGS@ -wl_desktop_shell_module_la_LIBADD = $(LIBS) @WL_DESKTOP_SHELL_LIBS@ @WAYLAND_LIBS@ -# wl_desktop_shell_module_la_LDFLAGS = $(AM_LDFLAGS) @WL_DESKTOP_SHELL_LDFLAGS@ @WAYLAND_LDFLAGS@ -wl_desktop_shell_module_la_SOURCES = wl_desktop_shell/e_mod_main.c \ - wl_desktop_shell/e_mod_main.h \ - wl_desktop_shell/e_desktop_shell_protocol.c - wl_desktop_shell/e_desktop_shell_protocol.h -# TODO: incomplete -#.PHONY: 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 diff --git a/src/modules/Makefile_wl_desktop_shell.mk b/src/modules/Makefile_wl_desktop_shell.mk new file mode 100644 index 0000000000..6e25bd8cff --- /dev/null +++ b/src/modules/Makefile_wl_desktop_shell.mk @@ -0,0 +1,26 @@ +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 \ + src/modules/wl_desktop_shell/e_desktop_shell_protocol.c + +wl_desktop_shellpkgdir = $(MDIR)/wl_desktop_shell/$(MODULE_ARCH) +wl_desktop_shellpkg_LTLIBRARIES = src/modules/wl_desktop_shell/module.la + +src_modules_wl_desktop_shell_module_la_DEPENDENCIES = $(MDEPENDENCIES) +src_modules_wl_desktop_shell_module_la_CPPFLAGS = $(MOD_CPPFLAGS) @WL_DESKTOP_SHELL_CFLAGS@ @WAYLAND_CFLAGS@ +src_modules_wl_desktop_shell_module_la_LIBADD = $(LIBS) @WL_DESKTOP_SHELL_LIBS@ @WAYLAND_LIBS@ +src_modules_wl_desktop_shell_module_la_LDFLAGS = $(MOD_LDFLAGS) + +src_modules_wl_desktop_shell_module_la_SOURCES = src/modules/wl_desktop_shell/e_mod_main.c \ + src/modules/wl_desktop_shell/e_mod_main.h \ + src/modules/wl_desktop_shell/e_desktop_shell_protocol.c + src/modules/wl_desktop_shell/e_desktop_shell_protocol.h + +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 diff --git a/src/modules/Makefile_wl_screenshot.am b/src/modules/Makefile_wl_screenshot.am deleted file mode 100644 index b0d7d415d4..0000000000 --- a/src/modules/Makefile_wl_screenshot.am +++ /dev/null @@ -1,23 +0,0 @@ -wl_screenshotdir = $(MDIR)/wl_screenshot -wl_screenshot_DATA = wl_screenshot/e-module-wl_screenshot.edj \ - wl_screenshot/module.desktop - -EXTRA_DIST += wl_screenshot/e-module-wl_screenshot.edj \ - wl_screenshot/module.desktop.in \ - wl_screenshot/e_screenshooter_client_protocol.h \ - wl_screenshot/e_screenshooter_client_protocol.c - -wl_screenshotpkgdir = $(MDIR)/wl_screenshot/$(MODULE_ARCH) -wl_screenshotpkg_LTLIBRARIES = wl_screenshot/module.la - -wl_screenshot_module_la_DEPENDENCIES = $(MDEPENDENCIES) -wl_screenshot_module_la_CFLAGS = $(AM_CFLAGS) @WL_SCREENSHOT_CFLAGS@ @WAYLAND_CFLAGS@ -wl_screenshot_module_la_LIBADD = $(LIBS) @WL_SCREENSHOT_LIBS@ @WAYLAND_LIBS@ -# wl_screenshot_module_la_LDFLAGS = $(AM_LDFLAGS) @WL_SCREENSHOT_LDFLAGS@ @WAYLAND_LDFLAGS@ -wl_screenshot_module_la_SOURCES = wl_screenshot/e_mod_main.c \ - wl_screenshot/e_screenshooter_client_protocol.h \ - wl_screenshot/e_screenshooter_client_protocol.c -# TODO: incomplete -#.PHONY: wl_screenshot install-wl_screenshot -#wl_screenshot: $(wl_screenshotpkg_LTLIBRARIES) $(wl_screenshot_DATA) -#install-wl_screenshot: install-wl_screenshotDATA install-wl_screenshotpkgLTLIBRARIES diff --git a/src/modules/Makefile_wl_screenshot.mk b/src/modules/Makefile_wl_screenshot.mk new file mode 100644 index 0000000000..cc6e19c7c6 --- /dev/null +++ b/src/modules/Makefile_wl_screenshot.mk @@ -0,0 +1,24 @@ +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 + +wl_screenshotpkgdir = $(MDIR)/wl_screenshot/$(MODULE_ARCH) +wl_screenshotpkg_LTLIBRARIES = src/modules/wl_screenshot/module.la + +wl_screenshot_module_la_DEPENDENCIES = $(MDEPENDENCIES) +wl_screenshot_module_la_CPPFLAGS = $(MOD_CPPFLAGS) @WL_SCREENSHOT_CFLAGS@ @WAYLAND_CFLAGS@ +wl_screenshot_module_la_LIBADD = $(MOD_LIBS) @WL_SCREENSHOT_LIBS@ @WAYLAND_LIBS@ +wl_screenshot_module_la_LDFLAGS = $(MOD_LDFLAGS) # @WL_SCREENSHOT_LDFLAGS@ @WAYLAND_LDFLAGS@ +wl_screenshot_module_la_SOURCES = src/modules/wl_screenshot/e_mod_main.c \ + src/modules/wl_screenshot/e_mod_main.h \ + src/modules/wl_screenshot/e_screenshooter_client_protocol.h \ + src/modules/wl_screenshot/e_screenshooter_client_protocol.c + +PHONIES: wl_screenshot install-wl_screenshot +wl_screenshot: $(wl_screenshotpkg_LTLIBRARIES) $(wl_screenshot_DATA) +install-wl_screenshot: install-wl_screenshotDATA install-wl_screenshotpkgLTLIBRARIES diff --git a/src/modules/Makefile_xkbswitch.am b/src/modules/Makefile_xkbswitch.am deleted file mode 100644 index 094438a95f..0000000000 --- a/src/modules/Makefile_xkbswitch.am +++ /dev/null @@ -1,18 +0,0 @@ -xkbswitchdir = $(MDIR)/xkbswitch -xkbswitch_DATA = xkbswitch/e-module-xkbswitch.edj \ - xkbswitch/module.desktop - -EXTRA_DIST += $(xkbswitch_DATA) - -xkbswitchpkgdir = $(MDIR)/xkbswitch/$(MODULE_ARCH) -xkbswitchpkg_LTLIBRARIES = xkbswitch/module.la - -xkbswitch_module_la_SOURCES = xkbswitch/e_mod_main.c \ - xkbswitch/e_mod_main.h \ - xkbswitch/e_mod_config.c \ - xkbswitch/e_mod_parse.c \ - xkbswitch/e_mod_parse.h - -.PHONY: xkbswitch install-xkbswitch -xkbswitch: $(xkbswitchpkg_LTLIBRARIES) $(xkbswitch_DATA) -install-xkbswitch: install-xkbswitchDATA install-xkbswitchpkgLTLIBRARIES diff --git a/src/modules/Makefile_xkbswitch.mk b/src/modules/Makefile_xkbswitch.mk new file mode 100644 index 0000000000..f7cdb2046b --- /dev/null +++ b/src/modules/Makefile_xkbswitch.mk @@ -0,0 +1,21 @@ +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 + +src_modules_xkbswitch_module_la_LIBADD = $(MOD_LIBS) +src_modules_xkbswitch_module_la_CPPFLAGS = $(MOD_CPPFLAGS) +src_modules_xkbswitch_module_la_LDFLAGS = $(MOD_LDFLAGS) +src_modules_xkbswitch_module_la_SOURCES = src/modules/xkbswitch/e_mod_main.c \ + src/modules/xkbswitch/e_mod_main.h \ + src/modules/xkbswitch/e_mod_config.c \ + src/modules/xkbswitch/e_mod_parse.c \ + src/modules/xkbswitch/e_mod_parse.h + +PHONIES += xkbswitch install-xkbswitch +xkbswitch: $(xkbswitchpkg_LTLIBRARIES) $(xkbswitch_DATA) +install-xkbswitch: install-xkbswitchDATA install-xkbswitchpkgLTLIBRARIES |