diff options
| -rw-r--r-- | config/default/Makefile.am | 2 | ||||
| -rw-r--r-- | config/illume/Makefile.am | 2 | ||||
| -rw-r--r-- | config/minimalist/Makefile.am | 2 | ||||
| -rw-r--r-- | config/netbook/Makefile.am | 2 | ||||
| -rw-r--r-- | config/scaleable/Makefile.am | 2 | ||||
| -rw-r--r-- | config/standard/Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/modules/illume/Makefile.am | 27 | ||||
| -rw-r--r-- | src/modules/illume/dicts/Makefile.am | 9 | ||||
| -rw-r--r-- | src/modules/illume/keyboards/Makefile.am | 22 |
10 files changed, 48 insertions, 24 deletions
diff --git a/config/default/Makefile.am b/config/default/Makefile.am index 10fe1c23f7..f28a8dad04 100644 --- a/config/default/Makefile.am +++ b/config/default/Makefile.am @@ -3,6 +3,8 @@ MAINTAINERCLEANFILES = Makefile.in EET_EET = @eet_eet@ EXTRA_DIST = \ + profile.desktop \ + icon.png \ e.src filesdir = $(datadir)/enlightenment/data/config/default diff --git a/config/illume/Makefile.am b/config/illume/Makefile.am index 0cbf1e041d..b6e9a61628 100644 --- a/config/illume/Makefile.am +++ b/config/illume/Makefile.am @@ -3,6 +3,8 @@ MAINTAINERCLEANFILES = Makefile.in EET_EET = @eet_eet@ EXTRA_DIST = \ + profile.desktop \ + icon.png \ e.src \ module.battery.src \ module.dropshadow.src \ diff --git a/config/minimalist/Makefile.am b/config/minimalist/Makefile.am index 97cba53095..d453d5d247 100644 --- a/config/minimalist/Makefile.am +++ b/config/minimalist/Makefile.am @@ -3,6 +3,8 @@ MAINTAINERCLEANFILES = Makefile.in EET_EET = @eet_eet@ EXTRA_DIST = \ + profile.desktop \ + icon.png \ e.src \ module.battery.src \ module.cpufreq.src \ diff --git a/config/netbook/Makefile.am b/config/netbook/Makefile.am index 35d9d57943..4ed2fe4372 100644 --- a/config/netbook/Makefile.am +++ b/config/netbook/Makefile.am @@ -3,6 +3,8 @@ MAINTAINERCLEANFILES = Makefile.in EET_EET = @eet_eet@ EXTRA_DIST = \ + profile.desktop \ + icon.png \ e.src \ module.battery.src \ module.cpufreq.src \ diff --git a/config/scaleable/Makefile.am b/config/scaleable/Makefile.am index 3293452f57..0952d2b442 100644 --- a/config/scaleable/Makefile.am +++ b/config/scaleable/Makefile.am @@ -3,6 +3,8 @@ MAINTAINERCLEANFILES = Makefile.in EET_EET = @eet_eet@ EXTRA_DIST = \ + profile.desktop \ + icon.png \ e.src \ module.battery.src \ module.cpufreq.src \ diff --git a/config/standard/Makefile.am b/config/standard/Makefile.am index d4ff26e250..0e6b0d0d4b 100644 --- a/config/standard/Makefile.am +++ b/config/standard/Makefile.am @@ -3,6 +3,8 @@ MAINTAINERCLEANFILES = Makefile.in EET_EET = @eet_eet@ EXTRA_DIST = \ + profile.desktop \ + icon.png \ e.src \ module.battery.src \ module.cpufreq.src \ diff --git a/configure.ac b/configure.ac index ae0ed5908d..87c91613f2 100644 --- a/configure.ac +++ b/configure.ac @@ -441,6 +441,8 @@ src/modules/connman/Makefile src/modules/connman/module.desktop src/modules/illume/Makefile src/modules/illume/module.desktop +src/modules/illume/keyboards/Makefile +src/modules/illume/dicts/Makefile src/preload/Makefile data/Makefile data/images/Makefile diff --git a/src/modules/illume/Makefile.am b/src/modules/illume/Makefile.am index 251e7105d8..c46995a446 100644 --- a/src/modules/illume/Makefile.am +++ b/src/modules/illume/Makefile.am @@ -1,12 +1,14 @@ MAINTAINERCLEANFILES = Makefile.in MODULE = illume +SUBDIRS = keyboards dicts + # data files for the module filesdir = $(libdir)/enlightenment/modules/$(MODULE) files_DATA = \ e-module-$(MODULE).edj module.desktop -EXTRA_DIST = $(files_DATA) +EXTRA_DIST = $(files_DATA) $(kbds_DATA) $(dicts_DATA) # the module .so file INCLUDES = -I. \ @@ -73,28 +75,5 @@ wifiget_PROGRAMS = wifiget wifiget_SOURCES = wifiget.c wifiget_LDFLAGS = -kbdsdir = $(datadir)/keyboards -kbds_DATA = \ - keyboards/ignore_built_in_keyboards \ - keyboards/Default.kbd \ - keyboards/alpha.png \ - keyboards/Numbers.kbd \ - keyboards/numeric.png \ - keyboards/Terminal.kbd \ - keyboards/qwerty.png \ - keyboards/up.png \ - keyboards/down.png \ - keyboards/left.png \ - keyboards/right.png \ - keyboards/shift.png \ - keyboards/tab.png \ - keyboards/enter.png \ - keyboards/backspace.png - -dictsdir = $(datadir)/dicts -dicts_DATA = \ - dicts/English_(US).dic \ - dicts/English_(US)_Small.dic - uninstall: rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE) diff --git a/src/modules/illume/dicts/Makefile.am b/src/modules/illume/dicts/Makefile.am new file mode 100644 index 0000000000..c040330547 --- /dev/null +++ b/src/modules/illume/dicts/Makefile.am @@ -0,0 +1,9 @@ +MAINTAINERCLEANFILES = Makefile.in +MODULE = illume + +filesdir = $(libdir)/enlightenment/modules/$(MODULE)/dicts +files_DATA = \ + English_(US).dic \ + English_(US)_Small.dic + +EXTRA_DIST = $(files_DATA) diff --git a/src/modules/illume/keyboards/Makefile.am b/src/modules/illume/keyboards/Makefile.am new file mode 100644 index 0000000000..add619616b --- /dev/null +++ b/src/modules/illume/keyboards/Makefile.am @@ -0,0 +1,22 @@ +MAINTAINERCLEANFILES = Makefile.in +MODULE = illume + +filesdir = $(libdir)/enlightenment/modules/$(MODULE)/keyboards +files_DATA = \ + ignore_built_in_keyboards \ + Default.kbd \ + alpha.png \ + Numbers.kbd \ + numeric.png \ + Terminal.kbd \ + qwerty.png \ + up.png \ + down.png \ + left.png \ + right.png \ + shift.png \ + tab.png \ + enter.png \ + backspace.png + +EXTRA_DIST = $(files_DATA) |