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
This commit is contained in:
Gustavo Sverzut Barbieri
parent
e8d06999cb
commit
852653c0a9
|
|
@ -23,8 +23,10 @@ AM_CPPFLAGS = \
|
|||
EXTRA_PROGRAMS = \
|
||||
ecore_animator_example \
|
||||
ecore_client_bench \
|
||||
ecore_con_client_example \
|
||||
ecore_con_client_simple_example \
|
||||
ecore_con_lookup_example \
|
||||
ecore_con_server_example \
|
||||
ecore_con_server_http_example \
|
||||
ecore_con_server_simple_example \
|
||||
ecore_con_url_cookies_example \
|
||||
|
|
@ -42,8 +44,12 @@ ecore_event_example_02 \
|
|||
ecore_exe_example \
|
||||
ecore_exe_example_child \
|
||||
ecore_fd_handler_example \
|
||||
ecore_fd_handler_gnutls_example \
|
||||
ecore_file_download_example \
|
||||
ecore_idler_example \
|
||||
ecore_imf_example \
|
||||
ecore_job_example \
|
||||
ecore_pipe_gstreamer_example \
|
||||
ecore_pipe_simple_example \
|
||||
ecore_poller_example \
|
||||
ecore_server_bench \
|
||||
|
|
@ -92,12 +98,18 @@ ecore_animator_example_LDADD = $(ECORE_EVAS_COMMON_LDADD)
|
|||
ecore_client_bench_SOURCES = ecore_client_bench.c
|
||||
ecore_client_bench_LDADD = $(ECORE_CON_COMMON_LDADD)
|
||||
|
||||
ecore_con_client_example_SOURCES = ecore_con_client_example.c
|
||||
ecore_con_client_example_LDADD = $(ECORE_CON_COMMON_LDADD)
|
||||
|
||||
ecore_con_client_simple_example_SOURCES = ecore_con_client_simple_example.c
|
||||
ecore_con_client_simple_example_LDADD = $(ECORE_CON_COMMON_LDADD)
|
||||
|
||||
ecore_con_lookup_example_SOURCES = ecore_con_lookup_example.c
|
||||
ecore_con_lookup_example_LDADD = $(ECORE_CON_COMMON_LDADD)
|
||||
|
||||
ecore_con_server_example_SOURCES = ecore_con_server_example.c
|
||||
ecore_con_server_example_LDADD = $(ECORE_CON_COMMON_LDADD)
|
||||
|
||||
ecore_con_server_http_example_SOURCES = ecore_con_server_http_example.c
|
||||
ecore_con_server_http_example_LDADD = $(ECORE_CON_COMMON_LDADD)
|
||||
|
||||
|
|
@ -149,12 +161,24 @@ ecore_exe_example_child_LDADD = $(ECORE_COMMON_LDADD)
|
|||
ecore_fd_handler_example_SOURCES = ecore_fd_handler_example.c
|
||||
ecore_fd_handler_example_LDADD = $(ECORE_COMMON_LDADD)
|
||||
|
||||
ecore_fd_handler_gnutls_example_SOURCES = ecore_fd_handler_gnutls_example.c
|
||||
ecore_fd_handler_gnutls_example_LDADD = $(ECORE_COMMON_LDADD)
|
||||
|
||||
ecore_file_download_example_SOURCES = ecore_file_download_example.c
|
||||
ecore_file_download_example_LDADD = $(ECORE_COMMON_LDADD)
|
||||
|
||||
ecore_idler_example_SOURCES = ecore_idler_example.c
|
||||
ecore_idler_example_LDADD = $(ECORE_COMMON_LDADD)
|
||||
|
||||
ecore_imf_example_SOURCES = ecore_imf_example.c
|
||||
ecore_imf_example_LDADD = $(ECORE_COMMON_LDADD)
|
||||
|
||||
ecore_job_example_SOURCES = ecore_job_example.c
|
||||
ecore_job_example_LDADD = $(ECORE_COMMON_LDADD)
|
||||
|
||||
ecore_pipe_gstreamer_example_SOURCES = ecore_pipe_gstreamer_example.c
|
||||
ecore_pipe_gstreamer_example_LDADD = $(ECORE_COMMON_LDADD)
|
||||
|
||||
ecore_pipe_simple_example_SOURCES = ecore_pipe_simple_example.c
|
||||
ecore_pipe_simple_example_LDADD = $(ECORE_COMMON_LDADD)
|
||||
|
||||
|
|
@ -174,44 +198,48 @@ ecore_timer_example_SOURCES = ecore_timer_example.c
|
|||
ecore_timer_example_LDADD = $(ECORE_COMMON_LDADD)
|
||||
|
||||
SRCS = \
|
||||
ecore_animator_example \
|
||||
ecore_client_bench \
|
||||
ecore_con_client_simple_example \
|
||||
ecore_con_lookup_example \
|
||||
ecore_con_server_http_example \
|
||||
ecore_con_server_simple_example \
|
||||
ecore_con_url_cookies_example \
|
||||
ecore_con_url_download_example \
|
||||
ecore_con_url_headers_example \
|
||||
ecore_evas_basics_example \
|
||||
ecore_evas_buffer_example_01 \
|
||||
ecore_evas_buffer_example_02 \
|
||||
ecore_evas_callbacks \
|
||||
ecore_evas_ews_example \
|
||||
ecore_evas_object_example \
|
||||
ecore_evas_window_sizes_example \
|
||||
ecore_event_example_01 \
|
||||
ecore_event_example_02 \
|
||||
ecore_exe_example \
|
||||
ecore_exe_example_child \
|
||||
ecore_fd_handler_example \
|
||||
ecore_idler_example \
|
||||
ecore_job_example \
|
||||
ecore_pipe_simple_example \
|
||||
ecore_poller_example \
|
||||
ecore_server_bench \
|
||||
ecore_thread_example \
|
||||
ecore_time_functions_example \
|
||||
ecore_timer_example
|
||||
ecore_animator_example.c \
|
||||
ecore_audio_custom.c \
|
||||
ecore_audio_playback.c \
|
||||
ecore_audio_to_ogg.c \
|
||||
ecore_client_bench.c \
|
||||
ecore_con_client_example.c \
|
||||
ecore_con_client_simple_example.c \
|
||||
ecore_con_lookup_example.c \
|
||||
ecore_con_server_example.c \
|
||||
ecore_con_server_http_example.c \
|
||||
ecore_con_server_simple_example.c \
|
||||
ecore_con_url_cookies_example.c \
|
||||
ecore_con_url_download_example.c \
|
||||
ecore_con_url_headers_example.c \
|
||||
ecore_evas_basics_example.c \
|
||||
ecore_evas_buffer_example_01.c \
|
||||
ecore_evas_buffer_example_02.c \
|
||||
ecore_evas_callbacks.c \
|
||||
ecore_evas_ews_example.c \
|
||||
ecore_evas_object_example.c \
|
||||
ecore_evas_window_sizes_example.c \
|
||||
ecore_event_example_01.c \
|
||||
ecore_event_example_02.c \
|
||||
ecore_exe_example.c \
|
||||
ecore_exe_example_child.c \
|
||||
ecore_fd_handler_example.c \
|
||||
ecore_fd_handler_gnutls_example.c \
|
||||
ecore_file_download_example.c \
|
||||
ecore_idler_example.c \
|
||||
ecore_imf_example.c \
|
||||
ecore_job_example.c \
|
||||
ecore_pipe_gstreamer_example.c \
|
||||
ecore_pipe_simple_example.c \
|
||||
ecore_poller_example.c \
|
||||
ecore_server_bench.c \
|
||||
ecore_thread_example.c \
|
||||
ecore_time_functions_example.c \
|
||||
ecore_timer_example.c
|
||||
|
||||
if HAVE_ECORE_AUDIO
|
||||
SRCS += \
|
||||
ecore_audio_custom \
|
||||
ecore_audio_playback \
|
||||
ecore_audio_to_ogg
|
||||
endif
|
||||
DATA_FILES = red.png
|
||||
|
||||
EXTRA_DIST = red.png
|
||||
EXTRA_DIST = $(DATA_FILES)
|
||||
|
||||
examples: $(EXTRA_PROGRAMS)
|
||||
|
||||
|
|
@ -220,11 +248,9 @@ clean-local:
|
|||
|
||||
install-examples:
|
||||
mkdir -p $(datadir)/ecore/examples
|
||||
$(install_sh_DATA) -c $(SRCS) $(datadir)/ecore/examples
|
||||
$(install_sh_DATA) -c red.png $(datadir)/ecore/examples
|
||||
$(install_sh_DATA) -c $(SRCS) $(DATA_FILES) $(datadir)/ecore/examples
|
||||
|
||||
uninstall-local:
|
||||
rm -f $(datadir)/ecore/examples/red.png
|
||||
for f in $(SRCS) ; do \
|
||||
for f in $(SRCS) $(DATA_FILES); do \
|
||||
rm -f $(datadir)/ecore/examples/$$f ; \
|
||||
done
|
||||
|
|
|
|||
|
|
@ -54,19 +54,25 @@ table.edc \
|
|||
text.edc \
|
||||
toggle_using_filter.edc
|
||||
|
||||
if ENABLE_MULTISENSE
|
||||
EDCS += multisense.edc
|
||||
endif
|
||||
DIST_EDCS = $(EDCS)
|
||||
|
||||
if HAVE_EPHYSICS
|
||||
EDCS += \
|
||||
MULTISENSE_EDCS = multisense.edc
|
||||
if ENABLE_MULTISENSE
|
||||
EDCS += $(MULTISENSE_EDCS)
|
||||
endif
|
||||
DIST_EDCS += $(MULTISENSE_EDCS)
|
||||
|
||||
PHYSICS_EDCS = \
|
||||
physics_3d.edc \
|
||||
physics_actions.edc \
|
||||
physics_backcull.edc \
|
||||
physics_basic.edc \
|
||||
physics_complex.edc \
|
||||
physics_soft_bodies.edc
|
||||
if HAVE_EPHYSICS
|
||||
EDCS += $(PHYSICS_EDCS)
|
||||
endif
|
||||
DIST_EDCS += $(PHYSICS_EDCS)
|
||||
|
||||
.edc.edj:
|
||||
$(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) $(SND_DIR) $< $(builddir)/$(@F)
|
||||
|
|
@ -103,7 +109,7 @@ signals2.c \
|
|||
edje-swallow2.c \
|
||||
edje-multisense.c
|
||||
|
||||
EXTRA_DIST = $(EDCS) $(DATA_FILES)
|
||||
EXTRA_DIST = $(DIST_EDCS) $(DATA_FILES)
|
||||
|
||||
AM_CPPFLAGS = \
|
||||
-I. \
|
||||
|
|
@ -146,6 +152,7 @@ codegen_example_generated.c \
|
|||
codegen_example_generated.h
|
||||
|
||||
EXTRA_PROGRAMS = \
|
||||
edje_example \
|
||||
edje-animations \
|
||||
edje-basic \
|
||||
edje-box \
|
||||
|
|
@ -194,9 +201,9 @@ clean-local:
|
|||
|
||||
install-examples:
|
||||
mkdir -p $(datadir)/edje/examples
|
||||
$(install_sh_DATA) -c $(SRCS) $(EDCS) $(DATA_FILES) $(datadir)/edje/examples
|
||||
$(install_sh_DATA) -c $(SRCS) $(DIST_EDCS) $(DATA_FILES) $(datadir)/edje/examples
|
||||
|
||||
uninstall-local:
|
||||
for f in $(SRCS) $(EDCS) $(DATA_FILES); do \
|
||||
for f in $(SRCS) $(DIST_EDCS) $(DATA_FILES); do \
|
||||
rm -f $(datadir)/edje/examples/$$f ; \
|
||||
done
|
||||
|
|
|
|||
|
|
@ -47,10 +47,12 @@ test_slider.c \
|
|||
test_velocity.c
|
||||
|
||||
EXTRA_PROGRAMS =
|
||||
|
||||
# NOTE: neither ephysics_test or ephysics_logo won't be built as they needs Elementary
|
||||
# TODO: convert these to bare ecore_evas, at least a reduced set to have compile-able examples
|
||||
|
||||
# TODO: when EXTRA_PROGRAMS is populated, remove SRCS from here
|
||||
EXTRA_DIST = $(SRCS)
|
||||
|
||||
# ephysics_test_SOURCES = \
|
||||
# ephysics_test.h \
|
||||
# test_bouncing_ball.c \
|
||||
|
|
|
|||
151
evas/Makefile.am
151
evas/Makefile.am
|
|
@ -1,5 +1,14 @@
|
|||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
EDJE_CC = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/edje/edje_cc
|
||||
EDJE_CC_FLAGS_VERBOSE_0 =
|
||||
EDJE_CC_FLAGS_VERBOSE_1 = -v
|
||||
EDJE_CC_FLAGS = $(EDJE_CC_FLAGS_VERBOSE_$(V)) -id $(srcdir) -fd $(srcdir)
|
||||
|
||||
AM_V_EDJ = $(am__v_EDJ_$(V))
|
||||
am__v_EDJ_ = $(am__v_EDJ_$(AM_DEFAULT_VERBOSITY))
|
||||
am__v_EDJ_0 = @echo " EDJ " $@;
|
||||
|
||||
AM_CPPFLAGS = \
|
||||
-I$(top_srcdir)/src/lib/eina \
|
||||
-I$(top_srcdir)/src/lib/eo \
|
||||
|
|
@ -9,18 +18,15 @@ AM_CPPFLAGS = \
|
|||
-I$(top_builddir)/src/lib/evas \
|
||||
@EVAS_CFLAGS@
|
||||
|
||||
#put here all EDCs one needs to the tests
|
||||
EDCS = aspect.edc
|
||||
|
||||
EXTRA_PROGRAMS =
|
||||
|
||||
if BUILD_ENGINE_BUFFER
|
||||
AM_CPPFLAGS += -I$(top_srcdir)/src/modules/evas/engines/buffer
|
||||
|
||||
EXTRA_PROGRAMS += evas_buffer_simple
|
||||
evas_buffer_simple_SOURCES = evas-buffer-simple.c
|
||||
evas_buffer_simple_LDADD = $(top_builddir)/src/lib/evas/libevas.la @EVAS_LDFLAGS@
|
||||
endif
|
||||
|
||||
EXTRA_PROGRAMS += evas_init_shutdown
|
||||
evas_init_shutdown_SOURCES = evas-init-shutdown.c
|
||||
|
|
@ -51,6 +57,48 @@ $(top_builddir)/src/lib/ecore_evas/libecore_evas.la \
|
|||
$(top_builddir)/src/lib/evas/libevas.la \
|
||||
@EVAS_LDFLAGS@
|
||||
|
||||
# EDJE_COMMON_* is similar to src/examples/edje/Makefile.am
|
||||
EDJE_COMMON_CPPFLAGS = \
|
||||
-I$(top_srcdir)/src/lib/eina \
|
||||
-I$(top_builddir)/src/lib/eina \
|
||||
-I$(top_srcdir)/src/lib/eo \
|
||||
-I$(top_builddir)/src/lib/eo \
|
||||
-I$(top_srcdir)/src/lib/eet \
|
||||
-I$(top_builddir)/src/lib/eet \
|
||||
-I$(top_srcdir)/src/lib/evas \
|
||||
-I$(top_builddir)/src/lib/evas \
|
||||
-I$(top_srcdir)/src/lib/ecore \
|
||||
-I$(top_builddir)/src/lib/ecore \
|
||||
-I$(top_srcdir)/src/lib/ecore_evas \
|
||||
-I$(top_builddir)/src/lib/ecore_evas \
|
||||
-I$(top_srcdir)/src/lib/ecore_file \
|
||||
-I$(top_builddir)/src/lib/ecore_file \
|
||||
-I$(top_srcdir)/src/lib/ecore_input \
|
||||
-I$(top_builddir)/src/lib/ecore_input \
|
||||
-I$(top_srcdir)/src/lib/ecore_imf \
|
||||
-I$(top_builddir)/src/lib/ecore_imf \
|
||||
-I$(top_srcdir)/src/lib/embryo \
|
||||
-I$(top_builddir)/src/lib/embryo \
|
||||
-I$(top_srcdir)/src/lib/edje \
|
||||
-I$(top_srcdir)/src/lib/edje/include \
|
||||
-DPACKAGE_EXAMPLES_DIR=\".\" \
|
||||
@EVAS_CFLAGS@
|
||||
|
||||
EDJE_COMMON_LDADD = \
|
||||
$(top_builddir)/src/lib/eina/libeina.la \
|
||||
$(top_builddir)/src/lib/eo/libeo.la \
|
||||
$(top_builddir)/src/lib/eet/libeet.la \
|
||||
$(top_builddir)/src/lib/evas/libevas.la \
|
||||
$(top_builddir)/src/lib/ecore/libecore.la \
|
||||
$(top_builddir)/src/lib/ecore_evas/libecore_evas.la \
|
||||
$(top_builddir)/src/lib/ecore_file/libecore_file.la \
|
||||
$(top_builddir)/src/lib/ecore_input/libecore_input.la \
|
||||
$(top_builddir)/src/lib/ecore_imf/libecore_imf.la \
|
||||
$(top_builddir)/src/lib/ecore_imf/libecore_imf_evas.la \
|
||||
$(top_builddir)/src/lib/embryo/libembryo.la \
|
||||
$(top_builddir)/src/lib/edje/libedje.la \
|
||||
@EVAS_LDFLAGS@
|
||||
|
||||
EXTRA_PROGRAMS += evas_images
|
||||
evas_images_SOURCES = evas-images.c
|
||||
evas_images_LDADD = $(ECORE_EVAS_COMMON_LDADD)
|
||||
|
|
@ -111,71 +159,64 @@ evas_box_SOURCES = evas-box.c
|
|||
evas_box_LDADD = $(ECORE_EVAS_COMMON_LDADD)
|
||||
evas_box_CPPFLAGS = $(ECORE_EVAS_COMMON_CPPFLAGS)
|
||||
|
||||
#the ones using ecore_evas and edje follow
|
||||
#AM_CPPFLAGS += @EDJE_CFLAGS@
|
||||
EXTRA_PROGRAMS += evas_map_utils
|
||||
evas_map_utils_SOURCES = evas-map-utils.c
|
||||
evas_map_utils_LDADD = $(ECORE_EVAS_COMMON_LDADD)
|
||||
evas_map_utils_CPPFLAGS = $(ECORE_EVAS_COMMON_CPPFLAGS)
|
||||
|
||||
#EXTRA_PROGRAMS += evas_aspect_hints
|
||||
#evas_aspect_hints_DEPS = $(srcdir)/aspect.edc
|
||||
#evas_aspect_hints_SOURCES = evas-aspect-hints.c
|
||||
#evas_aspect_hints_LDADD = $(top_builddir)/src/lib/evas/libevas.la @ECORE_EVAS_LIBS@ @EDJE_LIBS@
|
||||
EXTRA_PROGRAMS += evas_table
|
||||
evas_table_SOURCES = evas-table.c
|
||||
evas_table_LDADD = $(ECORE_EVAS_COMMON_LDADD)
|
||||
evas_table_CPPFLAGS = $(ECORE_EVAS_COMMON_CPPFLAGS)
|
||||
|
||||
#EXTRA_PROGRAMS += evas_map_utils
|
||||
#evas_map_utils_SOURCES = evas-map-utils.c
|
||||
#evas_map_utils_LDADD = $(top_builddir)/src/lib/evas/libevas.la @ECORE_EVAS_LIBS@
|
||||
.edc.edj:
|
||||
$(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) $< $(builddir)/$(@F)
|
||||
|
||||
#aspect.edj: ${evas_aspect_hints_DEPS}
|
||||
EXTRA_PROGRAMS += evas_aspect_hints
|
||||
evas_aspect_hints_DEPS = $(srcdir)/aspect.edc
|
||||
evas_aspect_hints_SOURCES = evas-aspect-hints.c
|
||||
evas_aspect_hints_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
|
||||
evas_aspect_hints_LDADD = $(EDJE_COMMON_LDADD)
|
||||
|
||||
#.edc.edj:
|
||||
# $(edje_cc) -v -id $(srcdir) $< $(builddir)/$(@F)
|
||||
EDJS = $(EDCS:%.edc=%.edj)
|
||||
|
||||
#EDJS = $(EDCS:%.edc=%.edj)
|
||||
|
||||
#SRCS = $(EDJS)
|
||||
|
||||
#SRCS += $(EDCS)
|
||||
SRCS = $(EDCS)
|
||||
|
||||
SRCS += \
|
||||
enlightenment.png \
|
||||
red.png \
|
||||
im1.png \
|
||||
cube1.png
|
||||
|
||||
SRCS += \
|
||||
SRCS = \
|
||||
evas-aspect-hints.c \
|
||||
evas-box.c \
|
||||
evas-buffer-simple.c \
|
||||
evas-init-shutdown.c \
|
||||
evas-events.c \
|
||||
evas-hints.c \
|
||||
evas-images.c \
|
||||
evas-images2.c \
|
||||
evas-images3.c \
|
||||
evas-object-manipulation.c \
|
||||
evas-object-manipulation-eo.c \
|
||||
evas-events.c \
|
||||
evas-aspect-hints.c \
|
||||
evas-hints.c \
|
||||
evas-stacking.c \
|
||||
evas-init-shutdown.c \
|
||||
evas-map-utils.c \
|
||||
evas-text.c \
|
||||
evas-smart-object.c \
|
||||
evas-object-manipulation-eo.c \
|
||||
evas-object-manipulation.c \
|
||||
evas-smart-interface.c \
|
||||
evas-box.c
|
||||
evas-smart-object.c \
|
||||
evas-stacking.c \
|
||||
evas-table.c \
|
||||
evas-text.c
|
||||
|
||||
examples: $(EXTRA_PROGRAMS)
|
||||
|
||||
clean-local:
|
||||
rm -f $(EXTRA_PROGRAMS)
|
||||
|
||||
install-examples:
|
||||
mkdir -p $(datadir)/evas/examples
|
||||
$(install_sh_DATA) -c $(SRCS) $(datadir)/evas/examples
|
||||
|
||||
uninstall-local:
|
||||
for f in $(SRCS) ; do \
|
||||
rm -f $(datadir)/evas/examples/$$f ; \
|
||||
done
|
||||
|
||||
EXTRA_DIST = \
|
||||
$(EDCS) \
|
||||
DATA_FILES = \
|
||||
enlightenment.png \
|
||||
red.png \
|
||||
im1.png \
|
||||
cube1.png
|
||||
|
||||
examples: $(EXTRA_PROGRAMS) $(EDJS)
|
||||
|
||||
clean-local:
|
||||
rm -f $(EXTRA_PROGRAMS) $(EDJS)
|
||||
|
||||
install-examples:
|
||||
mkdir -p $(datadir)/evas/examples
|
||||
$(install_sh_DATA) -c $(SRCS) $(EDCS) $(DATA_FILES) $(datadir)/evas/examples
|
||||
|
||||
uninstall-local:
|
||||
for f in $(SRCS) $(EDCS) $(DATA_FILES); do \
|
||||
rm -f $(datadir)/evas/examples/$$f ; \
|
||||
done
|
||||
|
||||
EXTRA_DIST = $(EDCS) $(DATA_FILES)
|
||||
|
|
|
|||
Loading…
Reference in New Issue