elementary: and now compile all left over data.

2 files changed, 30 insertions, 103 deletions

diff --git a/data/elementary/objects/Makefile.am b/data/elementary/objects/Makefile.am
index 86593ca8a8..be9769ecfe 100644
--- a/data/elementary/objects/Makefile.am
+++ b/data/elementary/objects/Makefile.am
@@ -1,98 +1,25 @@
-AUTOMAKE_OPTIONS     = 1.4 foreign
-MAINTAINERCLEANFILES = Makefile.in
-
-include ../../Makefile_Elm_Helpers.am
-
-EDJE_CC_FLAGS += -id $(top_srcdir)/data/objects -fd $(top_srcdir)/data/objects
-
-filesdir = $(datadir)/elementary/objects
-
-files_DATA = test.edj test_external.edj multip.edj cursors.edj combobox_multiple.edj font_preview.edj postit_ent.edj multibuttonentry.edj test_prefs.edj test_prefs.epb test_focus_style.edj
-
-EXTRA_DIST = \
-test.edc \
-test_external.edc \
-test_prefs.edc \
-test_prefs.epc \
-multip.edc \
-cursors.edc \
-combobox_multiple.edc \
-font_preview.edc \
-postit_ent.edc \
-multibuttonentry.edc \
-test_focus_style.edc \
-over.png \
-under.png \
-sky.jpg \
-clo.png \
-cross.png \
-border.png \
-border2.png \
-border3.png \
-border4.png \
-border5.png \
-border6.png
-
-test.edj: Makefile $(EXTRA_DIST)
-        $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \
-        $(top_srcdir)/data/objects/test.edc \
-        $(top_builddir)/data/objects/test.edj
-
-test_external.edj: Makefile $(EXTRA_DIST)
-        $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \
-        $(top_srcdir)/data/objects/test_external.edc \
-        $(top_builddir)/data/objects/test_external.edj
-
-multip.edj: Makefile $(EXTRA_DIST)
-        $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \
-        $(top_srcdir)/data/objects/multip.edc \
-        $(top_builddir)/data/objects/multip.edj
-
-colorpreview.edj: Makefile $(EXTRA_DIST)
-        $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \
-        $(top_srcdir)/data/objects/colorpreview.edc \
-        $(top_builddir)/data/objects/colorpreview.edj
-
-cursors.edj: Makefile $(EXTRA_DIST)
-        $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \
-        $(top_srcdir)/data/objects/cursors.edc \
-        $(top_builddir)/data/objects/cursors.edj
-
-combobox_multiple.edj: Makefile combobox_multiple.edc
-        $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \
-        $(top_srcdir)/data/objects/combobox_multiple.edc \
-        $(top_builddir)/data/objects/combobox_multiple.edj
-
-font_preview.edj: Makefile $(EXTRA_DIST)
-        $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \
-        $(top_srcdir)/data/objects/font_preview.edc \
-        $(top_builddir)/data/objects/font_preview.edj
-
-postit_ent.edj: Makefile $(EXTRA_DIST)
-        $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \
-        $(top_srcdir)/data/objects/postit_ent.edc \
-        $(top_builddir)/data/objects/postit_ent.edj
-multibuttonentry.edj: Makefile $(EXTRA_DIST)
-        $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \
-        $(top_srcdir)/data/objects/multibuttonentry.edc \
-        $(top_builddir)/data/objects/multibuttonentry.edj
-
-test_prefs.edj: Makefile test_prefs.edc
-        $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \
-        $(top_srcdir)/data/objects/test_prefs.edc \
-        $(top_builddir)/data/objects/test_prefs.edj
-
-test_prefs.epb: Makefile test_prefs.epc
-        $(AM_V_EPB)$(ELM_PREFS_CC) $(ELM_PREFS_FLAGS) \
-        $(top_srcdir)/data/objects/test_prefs.epc \
-        $(top_builddir)/data/objects/test_prefs.epb
-
-test_focus_style.edj: Makefile test_focus_style.edc
-        $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \
-        -id $(top_srcdir)/data/themes/img \
-        $(top_srcdir)/data/objects/test_focus_style.edc \
-        $(top_builddir)/data/objects/test_focus_style.edj
-
-clean-local:
-        rm -f *.edj
-        rm -f test_prefs.epb
+EDJE_CC_FLAGS += -id $(top_srcdir)/data/elementary/objects -fd $(top_srcdir)/data/elementary/objects
+
+EXTRA_DIST += \
+elementary/objects/test.edc \
+elementary/objects/test_external.edc \
+elementary/objects/test_prefs.edc \
+elementary/objects/test_prefs.epc \
+elementary/objects/multip.edc \
+elementary/objects/cursors.edc \
+elementary/objects/combobox_multiple.edc \
+elementary/objects/font_preview.edc \
+elementary/objects/postit_ent.edc \
+elementary/objects/multibuttonentry.edc \
+elementary/objects/test_focus_style.edc \
+elementary/objects/over.png \
+elementary/objects/under.png \
+elementary/objects/sky.jpg \
+elementary/objects/clo.png \
+elementary/objects/cross.png \
+elementary/objects/border.png \
+elementary/objects/border2.png \
+elementary/objects/border3.png \
+elementary/objects/border4.png \
+elementary/objects/border5.png \
+elementary/objects/border6.png
diff --git a/data/elementary/objects/test_focus_style.edc b/data/elementary/objects/test_focus_style.edc
index ac184c4ca6..4359b8046d 100644
--- a/data/elementary/objects/test_focus_style.edc
+++ b/data/elementary/objects/test_focus_style.edc
@@ -434,19 +434,19 @@ collections {
       }
    } //group ends
 
-#include "../../data/themes/macros.edc"
-#include "../../data/themes/fonts.edc"
-#include "../../data/themes/colorclasses.edc"
+#include "../../../data/elementary/themes/macros.edc"
+#include "../../../data/elementary/themes/fonts.edc"
+#include "../../../data/elementary/themes/colorclasses.edc"
 
 // to customize check default style
-#include "../../data/themes/edc/elm/check.edc"
+#include "../../../data/elementary/themes/edc/elm/check.edc"
    group { name: "elm/check/base/focus_text";
       data.item: "focus_part" "elm.text";
       inherit: "elm/check/base/default";
    }
 
 // to customize button default style
-#include "../../data/themes/edc/elm/button.edc"
+#include "../../../data/elementary/themes/edc/elm/button.edc"
    group { name: "elm/button/base/focus_icon";
       data.item: "focus_part" "elm.swallow.content";
       inherit: "elm/button/base/default";