1 files changed, 40 insertions, 64 deletions

diff --git a/libraries/edje/src/examples/Makefile.am b/libraries/edje/src/examples/Makefile.am
index 20e2c81..579f148 100644
--- a/libraries/edje/src/examples/Makefile.am
+++ b/libraries/edje/src/examples/Makefile.am
@@ -1,12 +1,15 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-pkglibdir = $(datadir)/$(PACKAGE)/examples
+examplesdir = $(datadir)/$(PACKAGE)/examples
+
 if ENABLE_MULTISENSE
 MULTISENSE_EDC_FILE = multisense.edc
 SND_DIR = -sd $(srcdir)
 endif
+
 #put here all EDCs one needs to the examples
-EDCS = basic.edc \
+EDCS = \
+        basic.edc \
         swallow.edc \
         text.edc \
         table.edc \
@@ -20,26 +23,48 @@ EDCS = basic.edc \
         sigtest.edc \
         $(MULTISENSE_EDC_FILE)
 
+.edc.edj:
+        $(edje_cc) -v -fd $(srcdir) -id $(srcdir) $(SND_DIR) $< $(builddir)/$(@F)
+
+EDJS = $(EDCS:%.edc=%.edj)
+
 filesdir = $(datadir)/$(PACKAGE)/examples
-files_DATA =
+files_DATA = \
+        $(EDCS) \
+        bubble.png \
+        red.png \
+        test.png \
+        Vera.ttf \
+        edje-basic.c \
+        edje-swallow.c \
+        edje-text.c \
+        edje-table.c \
+        edje-box.c \
+        edje-box2.c \
+        edje-drag.c \
+        edje-signals-messages.c \
+        edje-color-class.c \
+        edje-perspective.c \
+        edje-animations.c \
+        sigtest.c
+
+EXTRA_DIST = $(files_DATA)
 
 if BUILD_EXAMPLES
 
 AM_CPPFLAGS = \
--I. \
--I$(top_srcdir)/src/lib \
--I$(top_srcdir)/src/lib/include \
--DPACKAGE_BIN_DIR=\"$(bindir)\" \
--DPACKAGE_LIB_DIR=\"$(libdir)\" \
--DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
--DPACKAGE_EXAMPLES_DIR=\"$(datadir)/$(PACKAGE)/examples\"
-
-pkglib_PROGRAMS =
+        -I. \
+        -I$(top_srcdir)/src/lib \
+        -I$(top_srcdir)/src/lib/include \
+        -DPACKAGE_BIN_DIR=\"$(bindir)\" \
+        -DPACKAGE_LIB_DIR=\"$(libdir)\" \
+        -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
+        -DPACKAGE_EXAMPLES_DIR=\"$(datadir)/$(PACKAGE)/examples\" \
+        @EDJE_CFLAGS@
 
-#the ones using ecore_evas follow
-AM_CPPFLAGS += @EDJE_CFLAGS@
+files_DATA += $(EDJS)
 
-pkglib_PROGRAMS += \
+examples_PROGRAMS = \
         edje-basic \
         edje-swallow \
         edje-text \
@@ -55,53 +80,4 @@ pkglib_PROGRAMS += \
 
 LDADD = $(top_builddir)/src/lib/libedje.la @EDJE_LIBS@
 
-.edc.edj:
-        $(edje_cc) -v -id $(srcdir) $(SND_DIR) $< $(builddir)/$(@F)
-
-EDJS = $(EDCS:%.edc=%.edj)
-
-files_DATA += $(EDJS)
-
-endif # if BUILD_EXAMPLES
-
-if INSTALL_EXAMPLES
-
-#put here additional data when installing examples
-files_DATA += \
-        $(srcdir)/bubble.png \
-        $(srcdir)/red.png \
-        $(srcdir)/test.png \
-        $(srcdir)/Vera.ttf
-
-files_DATA += \
-        $(EDCS) \
-        $(srcdir)/edje-basic.c \
-        $(srcdir)/edje-swallow.c \
-        $(srcdir)/edje-text.c \
-        $(srcdir)/edje-table.c \
-        $(srcdir)/edje-box.c \
-        $(srcdir)/edje-box2.c \
-        $(srcdir)/edje-drag.c \
-        $(srcdir)/edje-signals-messages.c \
-        $(srcdir)/edje-color-class.c \
-        $(srcdir)/edje-perspective.c \
-        $(srcdir)/edje-animations.c \
-        $(srcdir)/sigtest.c
 endif
-
-EXTRA_DIST = $(EDCS) \
-        $(srcdir)/bubble.png \
-        $(srcdir)/red.png \
-        $(srcdir)/test.png \
-        $(srcdir)/edje-basic.c \
-        $(srcdir)/edje-swallow.c \
-        $(srcdir)/edje-text.c \
-        $(srcdir)/edje-table.c \
-        $(srcdir)/edje-box.c \
-        $(srcdir)/edje-box2.c \
-        $(srcdir)/edje-drag.c \
-        $(srcdir)/edje-signals-messages.c \
-        $(srcdir)/edje-color-class.c \
-        $(srcdir)/edje-perspective.c \
-        $(srcdir)/edje-animations.c \
-        $(srcdir)/sigtest.c