new icon, and fix makefile.am indent

This commit is contained in:
Daniel Kolesa 2014-02-19 17:05:30 +00:00
parent 53c2921e8c
commit 1d9e2d5a8e
5 changed files with 16 additions and 17 deletions

View File

@ -1,8 +1,8 @@
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess config.h.in \ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess config.h.in \
config.sub configure depcomp install-sh ltmain.sh \ config.sub configure depcomp install-sh ltmain.sh \
missing module.desktop config.rpath mkinstalldirs missing module.desktop config.rpath mkinstalldirs
SUBDIRS = src SUBDIRS = src
@ -18,15 +18,15 @@ filesdir = $(datadir)
files_DATA = module.desktop e-module-wlan.edj files_DATA = module.desktop e-module-wlan.edj
EXTRA_DIST = module.desktop.in \ EXTRA_DIST = module.desktop.in \
e_modules-wlan.spec.in \ e_modules-wlan.spec.in \
e-module-wlan.edc \ e-module-wlan.edc \
$(wildcard images/*.png) $(wildcard images/*.png)
%.edj: %.edc %.edj: %.edc
$(EDJE_CC) $(EDJE_FLAGS) $< $@ $(EDJE_CC) $(EDJE_FLAGS) $< $@
clean-local: clean-local:
rm -rf e-module-wlan.edj module.desktop e_modules-wlan.spec *~ rm -rf e-module-wlan.edj module.desktop e_modules-wlan.spec *~
uninstall: uninstall:
rm -rf $(DESTDIR)$(datadir) rm -rf $(DESTDIR)$(datadir)

View File

@ -1,6 +1,5 @@
images { images {
image: "module_icon.png" COMP; image: "module_icon.png" COMP;
image: "wlan.png" COMP;
image: "qual_00.png" COMP; image: "qual_00.png" COMP;
image: "qual_01.png" COMP; image: "qual_01.png" COMP;
image: "qual_02.png" COMP; image: "qual_02.png" COMP;
@ -91,7 +90,7 @@ collections {
rel1.offset : 0 0; rel1.offset : 0 0;
rel2.relative : 1.0 1.0; rel2.relative : 1.0 1.0;
rel2.offset : -1 -1; rel2.offset : -1 -1;
image.normal : "wlan.png"; image.normal : "module_icon.png";
} }
} }
part { part {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

View File

@ -1,20 +1,20 @@
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in
INCLUDES = -I. \ INCLUDES = -I. \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(includedir) \ -I$(includedir) \
@E_CFLAGS@ @E_CFLAGS@
pkgdir = $(datadir)/$(MODULE_ARCH) pkgdir = $(datadir)/$(MODULE_ARCH)
pkg_LTLIBRARIES = module.la pkg_LTLIBRARIES = module.la
module_la_SOURCES = e_mod_main.c \ module_la_SOURCES = e_mod_main.c \
e_mod_main.h \ e_mod_main.h \
e_mod_config.c \ e_mod_config.c \
e_mod_config.h e_mod_config.h
module_la_LIBADD = @E_LIBS@ module_la_LIBADD = @E_LIBS@
module_la_LDFLAGS = -module -avoid-version module_la_LDFLAGS = -module -avoid-version
module_la_DEPENDENCIES = $(top_builddir)/config.h module_la_DEPENDENCIES = $(top_builddir)/config.h
clean-local: clean-local:
rm -rf *~ rm -rf *~