summaryrefslogtreecommitdiff
path: root/src/examples/edje/Makefile.am
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-04 20:55:12 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-04 20:55:12 +0000
commit2b29626d8d5aa47119759d0ef1d0876674f06254 (patch)
tree13622da45e0f86f8fde5bc8d50e953e958495691 /src/examples/edje/Makefile.am
parent7abf31c88264c2a7692ce61c7985bc49e979163e (diff)
efl: fix make dist.
Carefully compared 'svn export' and 'make dist' results and couple of files were missing. Changes: * Makefile.am: removed all .pc from EXTRA_DIST, we shouldn't distribute them here as they will contain ./configure data such as install location. * src/Makefile.am: moved all if-endif to files, otherwise EXTRA_DIST won't work properly. We must EXTRA_DIST outside of the if-endif block. * static_libs/liblinebreak: removed couple of unused files. SVN revision: 82241
Diffstat (limited to 'src/examples/edje/Makefile.am')
-rw-r--r--src/examples/edje/Makefile.am19
1 files changed, 13 insertions, 6 deletions
diff --git a/src/examples/edje/Makefile.am b/src/examples/edje/Makefile.am
index 2b9d04a380..a07080114e 100644
--- a/src/examples/edje/Makefile.am
+++ b/src/examples/edje/Makefile.am
@@ -54,19 +54,25 @@ table.edc \
54text.edc \ 54text.edc \
55toggle_using_filter.edc 55toggle_using_filter.edc
56 56
57DIST_EDCS = $(EDCS)
58
59MULTISENSE_EDCS = multisense.edc
57if ENABLE_MULTISENSE 60if ENABLE_MULTISENSE
58EDCS += multisense.edc 61EDCS += $(MULTISENSE_EDCS)
59endif 62endif
63DIST_EDCS += $(MULTISENSE_EDCS)
60 64
61if HAVE_EPHYSICS 65PHYSICS_EDCS = \
62EDCS += \
63physics_3d.edc \ 66physics_3d.edc \
64physics_actions.edc \ 67physics_actions.edc \
65physics_backcull.edc \ 68physics_backcull.edc \
66physics_basic.edc \ 69physics_basic.edc \
67physics_complex.edc \ 70physics_complex.edc \
68physics_soft_bodies.edc 71physics_soft_bodies.edc
72if HAVE_EPHYSICS
73EDCS += $(PHYSICS_EDCS)
69endif 74endif
75DIST_EDCS += $(PHYSICS_EDCS)
70 76
71.edc.edj: 77.edc.edj:
72 $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) $(SND_DIR) $< $(builddir)/$(@F) 78 $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) $(SND_DIR) $< $(builddir)/$(@F)
@@ -103,7 +109,7 @@ signals2.c \
103edje-swallow2.c \ 109edje-swallow2.c \
104edje-multisense.c 110edje-multisense.c
105 111
106EXTRA_DIST = $(EDCS) $(DATA_FILES) 112EXTRA_DIST = $(DIST_EDCS) $(DATA_FILES)
107 113
108AM_CPPFLAGS = \ 114AM_CPPFLAGS = \
109-I. \ 115-I. \
@@ -146,6 +152,7 @@ codegen_example_generated.c \
146codegen_example_generated.h 152codegen_example_generated.h
147 153
148EXTRA_PROGRAMS = \ 154EXTRA_PROGRAMS = \
155edje_example \
149edje-animations \ 156edje-animations \
150edje-basic \ 157edje-basic \
151edje-box \ 158edje-box \
@@ -194,9 +201,9 @@ clean-local:
194 201
195install-examples: 202install-examples:
196 mkdir -p $(datadir)/edje/examples 203 mkdir -p $(datadir)/edje/examples
197 $(install_sh_DATA) -c $(SRCS) $(EDCS) $(DATA_FILES) $(datadir)/edje/examples 204 $(install_sh_DATA) -c $(SRCS) $(DIST_EDCS) $(DATA_FILES) $(datadir)/edje/examples
198 205
199uninstall-local: 206uninstall-local:
200 for f in $(SRCS) $(EDCS) $(DATA_FILES); do \ 207 for f in $(SRCS) $(DIST_EDCS) $(DATA_FILES); do \
201 rm -f $(datadir)/edje/examples/$$f ; \ 208 rm -f $(datadir)/edje/examples/$$f ; \
202 done 209 done