summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2018-07-13 15:41:15 -0400
committerMike Blumenkrantz <zmike@samsung.com>2018-07-13 15:41:15 -0400
commit5849debc97ae6675614d668db8d64c2892ee882a (patch)
tree129a91beb745906657f51edd852fc2a70dbf6051
parent83a0e7440c54d7382535391b39407a41d8e2cf89 (diff)
build: fix distcheck when elua is disabled in main tree
Summary: elua example files were not being distributed correctly as a result of improper use of build conditionals Depends on D6582 Reviewers: devilhorns, ManMower Reviewed By: ManMower Subscribers: #committers, cedric Tags: #efl_build Differential Revision: https://phab.enlightenment.org/D6583
-rw-r--r--src/Makefile.am7
-rw-r--r--src/Makefile_Elua.am46
-rw-r--r--src/examples/elua/Makefile.am12
3 files changed, 32 insertions, 33 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 9e28ab4a61..a988467d84 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -132,11 +132,8 @@ examples/ethumb_client \
132examples/eina_cxx \ 132examples/eina_cxx \
133examples/eolian_cxx \ 133examples/eolian_cxx \
134examples/efl_mono \ 134examples/efl_mono \
135examples/elementary 135examples/elementary \
136 136examples/elua
137if HAVE_ELUA
138EXAMPLES_SUBDIRS += examples/elua
139endif
140 137
141if ALWAYS_BUILD_EXAMPLES 138if ALWAYS_BUILD_EXAMPLES
142SUBDIRS += . $(EXAMPLES_SUBDIRS) 139SUBDIRS += . $(EXAMPLES_SUBDIRS)
diff --git a/src/Makefile_Elua.am b/src/Makefile_Elua.am
index bd1da51f90..bc2513f903 100644
--- a/src/Makefile_Elua.am
+++ b/src/Makefile_Elua.am
@@ -54,41 +54,33 @@ ELUA_APPS_DIR = $(abs_top_srcdir)/src/scripts/elua/apps
54### Helper for other modules using Elua 54### Helper for other modules using Elua
55include Makefile_Elua_Helper.am 55include Makefile_Elua_Helper.am
56 56
57eluaappsdir = $(datadir)/elua/apps 57endif
58 58eluaapps_files = \
59eluaapps_DATA = \
60 scripts/elua/apps/lualian.lua \ 59 scripts/elua/apps/lualian.lua \
61 scripts/elua/apps/gendoc.lua \ 60 scripts/elua/apps/gendoc.lua \
62 scripts/elua/apps/gendoc.sh \ 61 scripts/elua/apps/gendoc.sh \
63 scripts/elua/apps/README-docgen.md 62 scripts/elua/apps/README-docgen.md
64 63
65EXTRA_DIST2 += $(eluaapps_DATA) 64EXTRA_DIST2 += $(eluaapps_files)
66 65
67eluadocgendir = $(datadir)/elua/apps/docgen 66eluadocgen_files = \
68
69eluadocgen_DATA = \
70 scripts/elua/apps/docgen/doctree.lua \ 67 scripts/elua/apps/docgen/doctree.lua \
71 scripts/elua/apps/docgen/keyref.lua \ 68 scripts/elua/apps/docgen/keyref.lua \
72 scripts/elua/apps/docgen/stats.lua \ 69 scripts/elua/apps/docgen/stats.lua \
73 scripts/elua/apps/docgen/util.lua \ 70 scripts/elua/apps/docgen/util.lua \
74 scripts/elua/apps/docgen/writer.lua 71 scripts/elua/apps/docgen/writer.lua
75 72
76EXTRA_DIST2 += $(eluadocgen_DATA) 73EXTRA_DIST2 += $(eluadocgen_files)
77 74eluamodules_files = \
78eluamodulesdir = $(datadir)/elua/modules
79
80eluamodules_DATA = \
81 scripts/elua/modules/benchmark.lua \ 75 scripts/elua/modules/benchmark.lua \
82 scripts/elua/modules/getopt.lua \ 76 scripts/elua/modules/getopt.lua \
83 scripts/elua/modules/lualian.lua \ 77 scripts/elua/modules/lualian.lua \
84 bindings/luajit/eo.lua \ 78 bindings/luajit/eo.lua \
85 bindings/luajit/eolian.lua 79 bindings/luajit/eolian.lua
86 80
87EXTRA_DIST2 += $(eluamodules_DATA) 81EXTRA_DIST2 += $(eluamodules_files)
88 82
89eluaeinadir = $(eluamodulesdir)/eina 83eluaeina_files = \
90
91eluaeina_DATA = \
92 bindings/luajit/eina/accessor.lua \ 84 bindings/luajit/eina/accessor.lua \
93 bindings/luajit/eina/counter.lua \ 85 bindings/luajit/eina/counter.lua \
94 bindings/luajit/eina/file.lua \ 86 bindings/luajit/eina/file.lua \
@@ -100,18 +92,27 @@ eluaeina_DATA = \
100 bindings/luajit/eina/tiler.lua \ 92 bindings/luajit/eina/tiler.lua \
101 bindings/luajit/eina/xattr.lua 93 bindings/luajit/eina/xattr.lua
102 94
103EXTRA_DIST2 += $(eluaeina_DATA) 95EXTRA_DIST2 += $(eluaeina_files)
104 96
105eluacoredir = $(datadir)/elua/core 97eluacore_files = \
106
107eluacore_DATA = \
108 scripts/elua/core/gettext.lua \ 98 scripts/elua/core/gettext.lua \
109 scripts/elua/core/module.lua \ 99 scripts/elua/core/module.lua \
110 scripts/elua/core/serializer.lua \ 100 scripts/elua/core/serializer.lua \
111 scripts/elua/core/util.lua 101 scripts/elua/core/util.lua
112 102
113EXTRA_DIST2 += $(eluacore_DATA) 103EXTRA_DIST2 += $(eluacore_files)
114 104
105if HAVE_ELUA
106eluaappsdir = $(datadir)/elua/apps
107eluaapps_DATA = $(eluaapps_files)
108eluamodulesdir = $(datadir)/elua/modules
109eluamodules_DATA = $(eluamodules_files)
110eluadocgendir = $(datadir)/elua/apps/docgen
111eluadocgen_DATA = $(eluadocgen_files)
112eluaeinadir = $(eluamodulesdir)/eina
113eluaeina_DATA = $(eluaeina_files)
114eluacoredir = $(datadir)/elua/core
115eluacore_DATA = $(eluacore_files)
115if EFL_ENABLE_TESTS 116if EFL_ENABLE_TESTS
116 117
117check_PROGRAMS += tests/elua/elua_suite 118check_PROGRAMS += tests/elua/elua_suite
@@ -145,6 +146,5 @@ tests_elua_elua_suite_DEPENDENCIES = @USE_ELUA_INTERNAL_LIBS@
145 146
146endif 147endif
147 148
148EXTRA_DIST2 += tests/elua/data/apps/test.lua
149
150endif 149endif
150EXTRA_DIST2 += tests/elua/data/apps/test.lua
diff --git a/src/examples/elua/Makefile.am b/src/examples/elua/Makefile.am
index 54b01fff92..031afc3bb3 100644
--- a/src/examples/elua/Makefile.am
+++ b/src/examples/elua/Makefile.am
@@ -5,10 +5,6 @@ MAINTAINERCLEANFILES = Makefile.in
5DATA_FILES = 5DATA_FILES =
6EXTRA_DIST = $(DATA_FILES) 6EXTRA_DIST = $(DATA_FILES)
7 7
8examples: ;
9
10clean-local: ;
11
12install-examples: 8install-examples:
13 $(MKDIR_P) $(DESTDIR)$(datadir)/elua/examples 9 $(MKDIR_P) $(DESTDIR)$(datadir)/elua/examples
14# cd $(srcdir) && $(install_sh_DATA) -c $(DATA_FILES) $(DESTDIR)$(datadir)/elua/examples 10# cd $(srcdir) && $(install_sh_DATA) -c $(DATA_FILES) $(DESTDIR)$(datadir)/elua/examples
@@ -17,5 +13,11 @@ install-examples:
17# for f in $(DATA_FILES); do \ 13# for f in $(DATA_FILES); do \
18# rm -f $(DESTDIR)$(datadir)/elua/examples/$$f ; \ 14# rm -f $(DESTDIR)$(datadir)/elua/examples/$$f ; \
19# done 15# done
20 16else
17install-examples:
21endif 18endif
19
20examples: ;
21
22clean-local: ;
23