rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=75c1596f68b4ffaddefd2a39156e3cd05e8e6ee0

commit 75c1596f68b4ffaddefd2a39156e3cd05e8e6ee0
Author: Vyacheslav Reutskiy <v.reuts...@samsung.com>
Date:   Thu Feb 11 08:03:51 2016 +0200

    makefile: update makefiles for generate correct tarballs
    
    Change-Id: Ia5c47c89abc3201e0cea1ec799e087ac21b35716
---
 Makefile.am         | 20 ++++++++++++++++----
 data/Makefile.am    | 46 ++++++++++++++++++++++++++++++----------------
 src/bin/Makefile.am | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 96 insertions(+), 20 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 0019562..d5730f4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,26 @@
-MAINTAINERCLEANFILES = Makefile.in
+AM_DISTCHECK_CONFIGURE_FLAGS = --with-tests=regular
 
-ACLOCAL_AMFLAGS = -I m4
 if CHECK_FOUND
 SUBDIRS = src data doc . tests/edj_build tests po
 else
 SUBDIRS = src data doc . po
 endif
 
+ACLOCAL_AMFLAGS = -I m4
+
+MAINTAINERCLEANFILES = Makefile.in \
+       $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz \
+       $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2
+
+EXTRA_DIST = \
+       README \
+       AUTHORS \
+       COPYING \
+       m4/eflete.m4 \
+       m4/eflete_binary.m4 \
+       m4/ewe.m4 \
+       m4/ewe_binary.m4
+
 .PHONY: doc update-po report report_debug coverage
 if HAVE_DOXYGEN
 doc:
@@ -42,5 +56,3 @@ update-po:
 
 coverage:
        $(MAKE) $(AM_MAKEFLAGS) -C tests coverage
-
-EXTRA_DIST = config.rpath
diff --git a/data/Makefile.am b/data/Makefile.am
index 82534db..7d80a03 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -33,8 +33,9 @@ alayouts_DATA = eflete.edj
 
 aimagesdir = $(datadir)/eflete/images
 aimages_DATA = \
-   ${srcdir}/images/*.png \
-   ${srcdir}/images/toolbar_icons/*.png
+       ${srcdir}/images/*.png \
+       ${srcdir}/images/eflete.svg \
+       ${srcdir}/images/toolbar_icons/*.png
 
 aresourcesdir = $(datadir)/eflete/
 
@@ -50,45 +51,58 @@ colors_DATA = color.eet
 ewedir = $(datadir)/ewe/themes
 ewe_DATA = ewe.edj
 
-ewe.edj: Makefile \
+ewe_deps = \
        $(top_srcdir)/data/*.edc \
        $(top_srcdir)/data/themes/ewe/*.edc \
        $(top_srcdir)/data/themes/ewe/widgets/*.edc \
        $(top_srcdir)/data/themes/ewe/widgets/images/*.png \
        $(top_srcdir)/data/themes/ewe/fonts/*.ttf
-       $(AM_V_EDJ)$(EDJE_CC) \
-       -fd $(top_srcdir)/data/themes/ewe/fonts \
-       -id $(top_srcdir)/data/themes/ewe/widgets/images \
-       $(top_srcdir)/data/themes/ewe/default.edc \
-       $(top_builddir)/data/ewe.edj
 
-eflete.edj: Makefile \
+eflete_deps = \
        $(top_srcdir)/data/*.edc \
        $(top_srcdir)/data/layouts/*.edc \
        $(top_srcdir)/data/layouts/edje/*.edc \
+       $(top_srcdir)/data/fonts/*.ttf \
        $(top_srcdir)/data/layouts/images/*.png
-       $(AM_V_EDJ)$(EDJE_CC) \
-               $(EDJE_FLAGS) \
-       $(top_srcdir)/data/layouts/eflete.edc \
-       $(top_builddir)/data/eflete.edj
 
-eflete_elm.edj: Makefile \
+eflete_elm_deps = \
        $(top_srcdir)/data/*.edc \
        $(top_srcdir)/data/themes/default/*.edc \
        $(top_srcdir)/data/themes/default/widgets/*.edc \
        $(top_srcdir)/data/themes/default/widgets/layouts/*.edc \
        $(top_srcdir)/data/themes/default/images/*.png \
+       $(top_srcdir)/data/fonts/*.ttf \
        $(top_srcdir)/data/themes/default/images/splash/*.png
+
+color_eet_deps = \
+       $(top_srcdir)/data/color/color.src
+
+ewe.edj: Makefile $(ewe_deps)
+       $(AM_V_EDJ)$(EDJE_CC) \
+       -fd $(top_srcdir)/data/themes/ewe/fonts \
+       -id $(top_srcdir)/data/themes/ewe/widgets/images \
+       $(top_srcdir)/data/themes/ewe/default.edc \
+       $(top_builddir)/data/ewe.edj
+
+eflete.edj: Makefile $(eflete_deps)
+       $(AM_V_EDJ)$(EDJE_CC) \
+               $(EDJE_FLAGS) \
+       $(top_srcdir)/data/layouts/eflete.edc \
+       $(top_builddir)/data/eflete.edj
+
+eflete_elm.edj: Makefile $(eflete_elm_deps)
        $(AM_V_EDJ)$(EDJE_CC) \
                $(EDJE_FLAGS_DEFAULT) \
        $(top_srcdir)/data/themes/default/default.edc \
        $(top_builddir)/data/eflete_elm.edj
 
-color.eet: Makefile \
-       $(top_srcdir)/data/color/color.src
+color.eet: Makefile $(color_eet_deps)
        $(AM_V_EET)$(EET_EET) -e \
        $(top_builddir)/data/color.eet color \
        $(top_srcdir)/data/color/color.src 1
 
 clean-local:
        rm -f *.edj *.eet
+
+EXTRA_DIST = $(aimages_DATA) $(ewe_deps) $(eflete_deps) $(eflete_elm_deps) \
+       $(color_eet_deps) $(template_edc_DATA) $(template_img_DATA) 
$(template_snd_DATA)
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 8bf0f9e..cb97a02 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -4,6 +4,56 @@ LOCALE_DIR = @LOCALE_DIR@
 
 bin_PROGRAMS = eflete
 
+includesub_HEADERS = \
+       eflete.h \
+       alloc/alloc.h \
+       common/common_macro.h \
+       common/signals.h \
+       common/string_common.h \
+       common/validator.h \
+       common/widget_macro.h \
+       common/win32.h \
+       config/config.h \
+       editor/banned_edje_edit_api.h \
+       editor/change.h \
+       editor/default.h \
+       editor/diff.h \
+       editor/editor.h \
+       editor/editor_macro.h \
+       editor/history.h \
+       external/enventor_module.h \
+       external/syntax_color.h \
+       logger/logger.h \
+       project_manager/group_manager.h \
+       project_manager/project_manager.h \
+       ui/cursor.h \
+       ui/demo_group.h \
+       ui/group_navigator.h \
+       ui/history_ui.h \
+       ui/main_window.h \
+       ui/project_common.h \
+       ui/project_navigator.h \
+       ui/property.h \
+       ui/property_macros.h \
+       ui/property_private.h \
+       ui/tabs.h \
+       ui/tabs_private.h \
+       ui/container/container.h \
+       ui/dialogs/about_window.h \
+       ui/dialogs/colorsel.h \
+       ui/live_view/demo.h \
+       ui/live_view/live_widget.h \
+       ui/live_view/live_widgets.h \
+       ui/live_view/elementary/live_elementary_widgets.h \
+       ui/modal_window/modal_window.h \
+       ui/preference/preference.h \
+       ui/shortcuts/shortcuts.h \
+       ui/workspace/groupedit.h \
+       ui/workspace/groupedit_private.h \
+       ui/workspace/highlight.h\
+       ui/workspace/workspace.h
+includesubdir = $(pkgincludedir)-@VMAJ@
+
 noinst_LIBRARIES = libete.a
 libete_a_SOURCES = \
 ../../src/bin/eflete.c \

-- 


Reply via email to